From af4b93104f60c8061b3887cce627730f29e983ac Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 17 五月 2025 14:42:46 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/third/erp/entity/ItemTB.java              |    2 
 src/main/java/com/zy/third/erp/entity/InDetTB.java             |   43 ++-
 src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java |    2 
 src/main/java/com/zy/third/lk/entity/OutHedTBBak.java          |   35 +-
 src/main/java/com/zy/third/erp/entity/OutDetTB.java            |   50 ++--
 src/main/java/com/zy/third/erp/entity/OutHedTB.java            |   32 +-
 src/main/java/com/zy/third/lk/entity/InDetTB.java              |   45 ++--
 src/main/java/com/zy/third/erp/task/ERPItemScheduler.java      |    6 
 src/main/java/com/zy/common/service/erp/ErpSqlServer.java      |   27 +
 src/main/java/com/zy/third/lk/task/LKInTBScheduler.java        |   94 ++++----
 src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java  |   12 
 src/main/java/com/zy/third/lk/entity/OutHedTB.java             |   35 +-
 src/main/java/com/zy/third/lk/entity/InDetTBBak.java           |   47 ++--
 src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java  |    2 
 src/main/java/com/zy/third/lk/entity/InHedTB.java              |   35 +-
 src/main/java/com/zy/third/lk/entity/OutDetTBBak.java          |   50 ++--
 src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java   |   12 
 src/main/java/com/zy/third/lk/entity/OutDetTB.java             |   50 ++--
 src/main/java/com/zy/third/erp/entity/InHedTB.java             |   31 +-
 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java     |    4 
 src/main/java/com/zy/third/lk/entity/InHedTBBak.java           |   35 +-
 src/main/resources/application.yml                             |    2 
 src/main/java/asr_show_diff.sql                                |    2 
 23 files changed, 343 insertions(+), 310 deletions(-)

diff --git a/src/main/java/asr_show_diff.sql b/src/main/java/asr_show_diff.sql
index 4282ce4..714621a 100644
--- a/src/main/java/asr_show_diff.sql
+++ b/src/main/java/asr_show_diff.sql
@@ -41,7 +41,7 @@
 		itembatch AS batch,
 		itemSpc specs
 	FROM
-		( SELECT * FROM OPENROWSET ( 'SQLOLEDB', '192.168.1.147,1800'; 'XGMLK'; 'xunda0413', XDLinkLK.dbo.vwErpLKStorage ) WHERE LKName = '涓壃浜屾湡' ) a
+		( SELECT * FROM OPENROWSET ( 'SQLOLEDB', '192.168.1.147,1800'; 'XGMLK'; 'xunda0413', XDLinkLK.dbo.vwErpLKStorage ) WHERE LKName = '楂橀湒绔嬪簱' ) a
 	GROUP BY
 		itemid,
 		itemcode,
diff --git a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
index 3469eec..ccc6207 100644
--- a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -245,31 +245,42 @@
 
     private List<Map<String, Object>> executeQuery(String sql) {
         Connection conn = null;
+        PreparedStatement pstm = null;
+        ResultSet rs = null;
         try {
             conn = getConn();
             pstm = conn.prepareStatement(sql);
-
             pstm.setQueryTimeout(QUERY_TIMEOUT_SECONDS);
-
             rs = pstm.executeQuery();
-//            List<Map<String, Object>> maps = convertList(rs);
+
+            // 鉁� 鍏堟妸 rs 杞崲瀹屽啀鍏抽棴杩炴帴
             return convertList(rs);
+
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         } finally {
-            release();
-            if (conn != null) {
-                try {
+            // 鉂椾笉鑳芥彁鍓嶈皟鐢� release()锛屾敼涓烘墜鍔ㄩ噴鏀惧悇瀵硅薄
+            try {
+                if (rs != null) {
+                    rs.close();
+                    rs = null;
+                }
+                if (pstm != null) {
+                    pstm.close();
+                    pstm = null;
+                }
+                if (conn != null) {
                     conn.close();
                     conn = null;
-                } catch (SQLException e) {
-                    e.printStackTrace();
                 }
+            } catch (SQLException e) {
+                e.printStackTrace();
             }
         }
     }
 
+
     public Number executeQueryCount(String sql, String column) {
         Number value = 0;
         Connection conn = null;
diff --git a/src/main/java/com/zy/third/erp/entity/InDetTB.java b/src/main/java/com/zy/third/erp/entity/InDetTB.java
index 16ef6fa..6e547b0 100644
--- a/src/main/java/com/zy/third/erp/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InDetTB.java
@@ -25,55 +25,56 @@
 
 
     @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     /**
      * erp琛屽敮涓�鐮�
      */
     @ApiModelProperty(value = "erp琛屽敮涓�鐮�")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String ItemId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
     @ApiModelProperty(value = "")
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String WareName;
 
     @ApiModelProperty(value = "")
@@ -90,7 +91,7 @@
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
     @ApiModelProperty(value = "")
@@ -100,29 +101,29 @@
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
 
diff --git a/src/main/java/com/zy/third/erp/entity/InHedTB.java b/src/main/java/com/zy/third/erp/entity/InHedTB.java
index 88f75dd..8a6abca 100644
--- a/src/main/java/com/zy/third/erp/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InHedTB.java
@@ -18,11 +18,12 @@
 
 
     @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableId(value = "BillNo", type = IdType.INPUT)
-    @TableField("BillNo")
+    @TableId(value = "bill_no", type = IdType.INPUT)
+    @TableField("bill_no")
     private String BillNo;
 
     /**
@@ -33,55 +34,55 @@
      * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
      */
 //    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField("BillDate")
+    @TableField("bill_date")
     private Date BillDate;
 
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂↖D
      */
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
      */
-    @TableField("ObjectName")
+    @TableField("object_name")
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String Temp3;
 
 
     @ApiModelProperty(value = "")
 //    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date MakeDate;
 
     @ApiModelProperty(value = "")
@@ -91,7 +92,7 @@
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
 
 
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTB.java b/src/main/java/com/zy/third/erp/entity/ItemTB.java
index fab4790..57fcb1e 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -21,7 +21,7 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
diff --git a/src/main/java/com/zy/third/erp/entity/OutDetTB.java b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
index d53c9a3..7ece66f 100644
--- a/src/main/java/com/zy/third/erp/entity/OutDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
@@ -23,66 +23,70 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     @ApiModelProperty(value = "")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String ItemId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String proType;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
+    @TableField("temp1")
     private String temp1;
 
     @ApiModelProperty(value = "")
+    @TableField("temp2")
     private String temp2;
 
     @ApiModelProperty(value = "")
+    @TableField("temp3")
     private String temp3;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
 //    @ApiModelProperty(value= "")
@@ -91,7 +95,7 @@
 //    private Date delDate;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
@@ -99,30 +103,30 @@
     private String LKName;
 
 
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
 
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
     public String getMakedate$() {
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTB.java b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
index bf935e3..bb5e611 100644
--- a/src/main/java/com/zy/third/erp/entity/OutHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
@@ -21,16 +21,16 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableId(value = "BillNo", type = IdType.INPUT)
-    @TableField("BillNo")
+    @TableId(value = "bill_no", type = IdType.INPUT)
+    @TableField("bill_no")
     private String BillNo;
 
 
-    @TableField("BillDate")
+    @TableField("bill_date")
 //    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date BillDate;
 
@@ -42,59 +42,59 @@
      * CheckLossOut:鐩樼泩鍑哄簱鍗�
      */
     @ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     /**
      * 閮ㄩ棬ID
      */
     @ApiModelProperty(value = "閮ㄩ棬ID")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     /**
      * 閮ㄩ棬鍚嶇О
      */
     @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
-    @TableField("ObjectName")
+    @TableField("object_name")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_id")
     private String wareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String Temp3;
 
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date MakeDate;
 
     @ApiModelProperty(value = "")
     @TableField("LKName")
     private String LKName;
 
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
 
 }
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index 6f33115..6dc1a2a 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -30,7 +30,7 @@
     //@Scheduled(cron = "${erp.refreshtime}")
     public void InCancelScheduler() {
         if (!erpEnabled) return;
-        String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
+        String sqlInCancelTB = "select * from erp_InCancelTB where LKName='楂橀湒绔嬪簱'";
         List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
         for (InCancelTB in : ins) {
             com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
index af4ce97..8802c0e 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -40,7 +40,7 @@
         //log.info("InHedTBScheduler寮�濮嬩簡"
         // 7);
         if (!erpEnabled) return;
-        String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'";
+        String sqlInHed = "select * from erp_InHedTB where LKName='楂橀湒绔嬪簱'";
         List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
         if (!inHeds.isEmpty()) {
             for (InHedTB inHed : inHeds) {
@@ -48,7 +48,7 @@
                     //continue;
                 }
                 HashMap<String, String> condition = new HashMap<>();
-                condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+                condition.put("bill_no", "'" + inHed.getBillNo() + "'");
                 List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
                 HashMap<String, Object> hedAndDet = new HashMap<>();
                 hedAndDet.put("hed", inHed);
@@ -63,7 +63,7 @@
                 } catch (Exception e) {
                     log.info(e.getMessage());
                     //e.printStackTrace();
-                    String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
+                    String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE bill_no = '" + inHed.getBillNo() + "'";
                         erpSqlServer.update(sql);
                 }
             }
@@ -76,12 +76,12 @@
         InHedTB hed = (InHedTB) hedAndDet.get("hed");
         ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
         HashMap<String, String> condition = new HashMap<>();
-        condition.put("BillNo", "'" + hed.getBillNo() + "'");
+        condition.put("bill_no", "'" + hed.getBillNo() + "'");
         erpSqlServer.delete(InHedTB.class, condition);
         for (InDetTB det : dets) {
             HashMap<String, String> condition2 = new HashMap<>();
-            condition2.put("BillNo", "'" + det.getBillNo() + "'");
-            condition2.put("iNo", String.valueOf(det.getINO()));
+            condition2.put("bill_no", "'" + det.getBillNo() + "'");
+            condition2.put("i_no", String.valueOf(det.getINO()));
             erpSqlServer.delete(InDetTB.class, condition2);
         }
 
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index f72f17d..95deee3 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -118,7 +118,7 @@
             orderDetl.setOrderNo(outDetTB.getBillNo());
             orderDetl.setOutOrderNo(outDetTB.getOrderNo());
             orderDetl.setAutoId(outDetTB.getAutoId());
-            orderDetl.setLuHao(outDetTB.getLuHao());
+//            orderDetl.setLuHao(outDetTB.getLuHao());
             orderDetl.setSpecs(outDetTB.getSPgNO());
             orderDetl.setPacking(outDetTB.getPacking());
             orderDetl.setWareId(outDetTB.getWareId());
@@ -220,7 +220,7 @@
             orderDetl.setOrderNo(outDetTB.getBillNo());
             orderDetl.setOutOrderNo(outDetTB.getOrderNo());
             orderDetl.setAutoId(outDetTB.getAutoId());
-            orderDetl.setLuHao(outDetTB.getLuHao());
+//            orderDetl.setLuHao(outDetTB.getLuHao());
             orderDetl.setSpecs(outDetTB.getSPgNO());
             orderDetl.setPacking(outDetTB.getPacking());
             orderDetl.setWareId(outDetTB.getWareId());
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index f5dd32b..7106d57 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -31,9 +31,9 @@
     @Transactional(rollbackFor = Throwable.class)
     @Scheduled(cron = "${erp.refreshtime}")
     public void ItemScheduler() {
-        //log.info("ItemScheduler寮�濮嬩簡");
+//        log.info("ItemScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlItemTB = "select TOP 1000 * from erp_ItemTB where LKName='涓壃浜屾湡'";
+        String sqlItemTB = "select TOP 1000 * from erp_ItemTB where LKName='楂橀湒绔嬪簱'";
         List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
         if (itemTBS != null && itemTBS.size() > 0) {
             for (ItemTB itemTB : itemTBS) {
@@ -59,6 +59,6 @@
      */
     //灏嗘暟鎹粠涓昏〃绉诲姩鍒癰ak琛ㄩ噷
     private void moveToBak(ItemTB itemTB) {
-        erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃浜屾湡' and ItemId = '" + itemTB.getItemId() + "'");
+        erpSqlServer.update("delete from erp_ItemTB where LKName='楂橀湒绔嬪簱' and Item_id = '" + itemTB.getItemId() + "'");
     }
 }
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
index 29e4e5a..3a42393 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -32,7 +32,7 @@
     public void InCancelScheduler() {
         //log.info("InCancelScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='涓壃浜屾湡'";
+        String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='楂橀湒绔嬪簱'";
         List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);
         for (OutCancelTB in : ins) {
             com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index e36b912..abe3b38 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -41,7 +41,7 @@
     public void OutHedTBScheduler() {
         //log.info("OutHedTBScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
+        String sqlInHed = "select * from erp_OutHedTB where LKName='楂橀湒绔嬪簱'";
         List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
         if (!inHeds.isEmpty()) {
             for (OutHedTB inHed : inHeds) {
@@ -49,7 +49,7 @@
                     //continue;
                 }
                 HashMap<String, String> condition = new HashMap<>();
-                condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+                condition.put("bill_no", "'" + inHed.getBillNo() + "'");
                 List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
                 HashMap<String, Object> hedAndDet = new HashMap<>();
                 hedAndDet.put("hed", inHed);
@@ -76,7 +76,7 @@
     public void OutHedTBScheduler(String orderNo) {
         //log.info("OutHedTBScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
-        String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡' and BillNo = '" + orderNo + "'";
+        String sqlInHed = "select * from erp_OutHedTB where LKName='楂橀湒绔嬪簱' and BillNo = '" + orderNo + "'";
         List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
         if (!inHeds.isEmpty()) {
             for (OutHedTB inHed : inHeds) {
@@ -109,12 +109,12 @@
         OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
         ArrayList<OutDetTB> dets = (ArrayList<OutDetTB>) hedAndDet.get("det");
         HashMap<String, String> condition = new HashMap<>();
-        condition.put("BillNo", "'" + hed.getBillNo() + "'");
+        condition.put("bill_no", "'" + hed.getBillNo() + "'");
         erpSqlServer.delete(OutHedTB.class, condition);
         for (OutDetTB det : dets) {
             HashMap<String, String> condition2 = new HashMap<>();
-            condition2.put("BillNo", "'" + det.getBillNo() + "'");
-            condition2.put("iNo", String.valueOf(det.getINO()));
+            condition2.put("bill_no", "'" + det.getBillNo() + "'");
+            condition2.put("i_no", String.valueOf(det.getINO()));
             erpSqlServer.delete(OutDetTB.class, condition2);
         }
 
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTB.java b/src/main/java/com/zy/third/lk/entity/InDetTB.java
index bf3484b..ff4a7b8 100644
--- a/src/main/java/com/zy/third/lk/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InDetTB.java
@@ -40,44 +40,45 @@
     private static final long serialVersionUID = 1L;
 
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     @ApiModelProperty(value = "")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String ItemId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
 
@@ -85,10 +86,10 @@
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
@@ -102,36 +103,36 @@
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
 
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
 
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTBBak.java b/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
index e569989..0c4f16f 100644
--- a/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
@@ -35,53 +35,54 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer autoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     @ApiModelProperty(value = "")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String itemid;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
     @ApiModelProperty(value = "")
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
@@ -96,39 +97,39 @@
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
-    @TableField("DelDate")
+    @TableField("del_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date DelDate;
 
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
     public String getMakedate$() {
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTB.java b/src/main/java/com/zy/third/lk/entity/InHedTB.java
index e239035..9209c5c 100644
--- a/src/main/java/com/zy/third/lk/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InHedTB.java
@@ -34,15 +34,16 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableId(value = "BillNo", type = IdType.INPUT)
-    @TableField("BillNo")
+    @TableId(value = "bill_no", type = IdType.INPUT)
+    @TableField("bill_no")
     private String BillNo;
 
-    @TableField("BillDate")
+    @TableField("bill_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date billDate;
 
@@ -54,59 +55,59 @@
      * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
      */
     @ApiModelProperty(value = "StockIn:閲囪喘鍏ュ簱 ")
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂↖D
      */
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
      */
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
-    @TableField("ObjectName")
+    @TableField("object_name")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String Remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String WareId;
 
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String Temp3;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
-    @TableField("bPass")
+    @TableField("b_pass")
     private Boolean bPass;
 
-    @TableField("bStartIn")
+    @TableField("b_start_in")
     private Boolean bStartIn;
 
 
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTBBak.java b/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
index 69bb639..4ed08ba 100644
--- a/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
@@ -30,14 +30,15 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer autoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
-    @TableField("BillDate")
+    @TableField("bill_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date billDate;
 
@@ -49,62 +50,62 @@
      * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
      */
     @ApiModelProperty(value = "StockIn:閲囪喘鍏ュ簱 ")
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂↖D
      */
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     /**
      * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
      */
     @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
-    @TableField("ObjectName")
+    @TableField("object_name")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String temp3;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
-    @TableField("DelDate")
+    @TableField("del_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date delDate;
 
 
-    @TableField("bPass")
+    @TableField("b_pass")
     private Boolean bPass;
 
-    @TableField("bStartIn")
+    @TableField("b_start_in")
     private Boolean bStartIn;
 
     public String getMakedate$() {
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTB.java b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
index 4d34e05..25855e1 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
@@ -26,100 +26,104 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     @ApiModelProperty(value = "")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String itemid;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
     @ApiModelProperty(value = "")
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String WareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String WareName;
 
     @ApiModelProperty(value = "")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
+    @TableField("temp3")
     private String Temp3;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("DelDate")
+    @TableField("del_date")
     private Date delDate;
 
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
 
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
index b392334..bb9a272 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
@@ -22,99 +22,103 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
     @ApiModelProperty(value = "")
-    @TableField("iNo")
+    @TableField("i_no")
     private Integer iNO;
 
     @ApiModelProperty(value = "")
-    @TableField("DetId")
+    @TableField("det_id")
     private Integer detId;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemId")
+    @TableField("item_id")
     private String itemid;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemCode")
+    @TableField("item_code")
     private String ItemCode;
 
     @ApiModelProperty(value = "")
-    @TableField("ItemBatch")
+    @TableField("item_batch")
     private String ItemBatch;
 
     @ApiModelProperty(value = "")
-    @TableField("proType")
+    @TableField("pro_type")
     private String protype;
 
     @ApiModelProperty(value = "")
-    @TableField("OrderNo")
+    @TableField("order_no")
     private String OrderNo;
 
     @ApiModelProperty(value = "")
-    @TableField("MainNum")
+    @TableField("main_num")
     private Double MainNum;
 
     @ApiModelProperty(value = "")
     @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String WareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String WareName;
 
     @ApiModelProperty(value = "")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
+    @TableField("temp3")
     private String Temp3;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
-    @TableField("DelDate")
+    @TableField("del_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date delDate;
 
     /**
      *
      */
-    @TableField("FactArea")
+    @TableField("fact_area")
     private String FactArea;
     /**
      * 渚涘簲鍟哱瀹㈡埛ID
      */
-    @TableField("Packing")
+    @TableField("packing")
     private String Packing;
     /**
      * 棰滆壊
      */
-    @TableField("sColor")
+    @TableField("s_color")
     private String sColor;
 
-    /**
-     * 鐐夊彿\瀹㈡埛鍥惧彿
-     */
-    @TableField("LuHao")
-    private String LuHao;
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("LuHao")
+//    private String LuHao;
 
     /**
      * 宸ュ崟鍙�
      */
-    @TableField("sPgNO")
+    @TableField("s_pg_no")
     private String sPgNO;
 
     public String getMakedate$() {
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTB.java b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
index f9a352a..e3c170d 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTB.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
@@ -26,15 +26,16 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableId(value = "BillNo", type = IdType.INPUT)
-    @TableField("BillNo")
+    @TableId(value = "bill_no", type = IdType.INPUT)
+    @TableField("bill_no")
     private String BillNo;
 
-    @TableField("BillDate")
+    @TableField("bill_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date billDate;
 
@@ -46,53 +47,53 @@
      * CheckLossOut:鐩樼泩鍑哄簱鍗�
      */
     @ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     @ApiModelProperty(value = "")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     @ApiModelProperty(value = "")
-    @TableField("ObjectName")
+    @TableField("object_name")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String wareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String wareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String temp3;
 
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
 
-    @TableField("bPass")
+    @TableField("b_pass")
     private Boolean bPass;
 
-    @TableField("bStartIn")
+    @TableField("b_start_in")
     private Boolean bStartIn;
 
 
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
index d677a97..0f99c65 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
@@ -20,14 +20,15 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "AutoId", type = IdType.AUTO)
+    @TableId(value = "auto_id", type = IdType.AUTO)
+    @TableField("auto_id")
     private Integer AutoId;
 
     @ApiModelProperty(value = "")
-    @TableField("BillNo")
+    @TableField("bill_no")
     private String BillNo;
 
-    @TableField("BillDate")
+    @TableField("bill_date")
     private Date billDate;
 
     /**
@@ -38,55 +39,55 @@
      * CheckLossOut:鐩樼泩鍑哄簱鍗�
      */
     @ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
-    @TableField("IoKindID")
+    @TableField("io_kind_id")
     private String IoKindID;
 
-    @TableField("IoKindName")
+    @TableField("io_kind_name")
     private String ioKindName;
 
     @ApiModelProperty(value = "")
-    @TableField("ObjectId")
+    @TableField("object_id")
     private String ObjectId;
 
     @ApiModelProperty(value = "")
-    @TableField("ObjectName")
+    @TableField("object_name")
     private String ObjectName;
 
     @ApiModelProperty(value = "")
-    @TableField("Remark")
+    @TableField("remark")
     private String Remark;
 
-    @TableField("WareId")
+    @TableField("ware_id")
     private String WareId;
 
-    @TableField("WareName")
+    @TableField("ware_name")
     private String WareName;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp1")
+    @TableField("temp1")
     private String Temp1;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp2")
+    @TableField("temp2")
     private String Temp2;
 
     @ApiModelProperty(value = "")
-    @TableField("Temp3")
+    @TableField("temp3")
     private String Temp3;
 
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("MakeDate")
+    @TableField("make_date")
     private Date makedate;
 
-    @TableField("DelDate")
+    @TableField("del_date")
     private Date delDate;
 
-    @TableField("bPass")
+    @TableField("b_pass")
     private Boolean bPass;
 
-    @TableField("bStartIn")
+    @TableField("b_start_in")
     private Boolean bStartIn;
 
 
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 3fe2ef9..302e045 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -93,9 +93,9 @@
      */
     @Transactional(rollbackFor = Throwable.class)
     public boolean insertInDet(OrderDetl orderDetl) {
-        String sqlInDetTb = "select * from lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+        String sqlInDetTb = "select * from lk_InDetTB where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'";
         List<InDetTB> inDets = erpSqlServer.select(sqlInDetTb, InDetTB.class);
-        String sqlInDetTbBak = "select * from lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+        String sqlInDetTbBak = "select * from lk_InDetTB_Bak where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'";
         List<InDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTBBak.class);
         if (!inDets.isEmpty() || !inDetBaks.isEmpty()) {
             log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
@@ -122,9 +122,9 @@
      */
     @Transactional(rollbackFor = Throwable.class)
     public boolean insertInHed(Order order) {
-        String sqlInHedTb = "select * from lk_InHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+        String sqlInHedTb = "select * from lk_InHedTB where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'";
         List<InHedTB> outHeds = erpSqlServer.select(sqlInHedTb, InHedTB.class);
-        String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+        String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'";
         List<InHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, InHedTBBak.class);
         if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) {
             log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
@@ -132,20 +132,20 @@
         }
         DocType docType = docTypeService.selectById(order.getDocType());
         HashMap<String, Object> content = new HashMap<>();
-        content.put("BillNo", "'" + order.getOrderNo() + "'");
-        content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
-        if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
-        if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
-        if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
-        if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+        content.put("bill_no", "'" + order.getOrderNo() + "'");
+        content.put("bill_date", "'" + DateUtils.convert(new Date()) + "'");
+        if (!Cools.isEmpty(docType.getDocCode())) content.put("io_kind_id", "'" + docType.getDocCode() + "'");
+        if (!Cools.isEmpty(docType.getDocName())) content.put("io_kind_name", "'" + docType.getDocName() + "'");
+        if (!Cools.isEmpty(order.getWareId())) content.put("ware_id", "'" + order.getWareId() + "'");
+        if (!Cools.isEmpty(order.getWareName())) content.put("ware_name", "'" + order.getWareName() + "'");
         if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
         if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
         if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
-        if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
-        if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
-        if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
-        content.put("LKName", "'涓壃浜屾湡'");
-        content.put("bPass", "1");
+        if (!Cools.isEmpty(order.getCstmr())) content.put("object_id", "'" + order.getCstmr() + "'");
+        if (!Cools.isEmpty(order.getCstmrName())) content.put("object_name", "'" + order.getCstmrName() + "'");
+        if (!Cools.isEmpty(order.getMemo())) content.put("remark", "'" + order.getMemo() + "'");
+        content.put("LKName", "'楂橀湒绔嬪簱'");
+        content.put("b_pass", "1");
         int insert = erpSqlServer.insert(InHedTB.class, content);
         if (insert == 1) {
             log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
@@ -164,9 +164,9 @@
      */
     @Transactional(rollbackFor = Throwable.class)
     public boolean insertOutDet(OrderDetl orderDetl) {
-        String sqlInDetTb = "select * from lk_OutDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+        String sqlInDetTb = "select * from lk_OutDetTB where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'";
         List<OutDetTB> inDets = erpSqlServer.select(sqlInDetTb, OutDetTB.class);
-        String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+        String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'";
         List<OutDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, OutDetTBBak.class);
         if (!inDets.isEmpty() || !inDetBaks.isEmpty()) {
             log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
@@ -193,9 +193,9 @@
      */
     @Transactional(rollbackFor = Throwable.class)
     public boolean insertOutHed(Order order) {
-        String sqlInHedTb = "select * from lk_OutHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+        String sqlInHedTb = "select * from lk_OutHedTB where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'";
         List<OutHedTB> outHeds = erpSqlServer.select(sqlInHedTb, OutHedTB.class);
-        String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+        String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'";
         List<OutHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, OutHedTBBak.class);
         if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) {
             log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
@@ -203,20 +203,21 @@
         }
         DocType docType = docTypeService.selectById(order.getDocType());
         HashMap<String, Object> content = new HashMap<>();
-        content.put("BillNo", "'" + order.getOrderNo() + "'");
-        content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
-        if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
-        if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
-        if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
-        if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+        content.put("bill_no", "'" + order.getOrderNo() + "'");
+        content.put("bill_no", "'" + DateUtils.convert(new Date()) + "'");
+        if (!Cools.isEmpty(docType.getDocCode())) content.put("io_kind_id", "'" + docType.getDocCode() + "'");
+        if (!Cools.isEmpty(docType.getDocName())) content.put("io_kind_name", "'" + docType.getDocName() + "'");
+        if (!Cools.isEmpty(order.getWareId())) content.put("ware_id", "'" + order.getWareId() + "'");
+        if (!Cools.isEmpty(order.getWareName())) content.put("ware_name", "'" + order.getWareName() + "'");
+        if (!Cools.isEmpty(order.getUpdateTime())) content.put("make_date", "'" + order.getUpdateTime() + "'");
         if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
         if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
         if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
-        if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
-        if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
-        if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
-        content.put("LKName", "'涓壃浜屾湡'");
-        content.put("bPass", "1");
+        if (!Cools.isEmpty(order.getCstmr())) content.put("object_id", "'" + order.getCstmr() + "'");
+        if (!Cools.isEmpty(order.getCstmrName())) content.put("object_name", "'" + order.getCstmrName() + "'");
+        if (!Cools.isEmpty(order.getMemo())) content.put("remark", "'" + order.getMemo() + "'");
+        content.put("LKName", "'楂橀湒绔嬪簱'");
+        content.put("b_pass", "1");
         int insert = erpSqlServer.insert(OutHedTB.class, content);
         if (insert == 1) {
             log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
@@ -229,32 +230,33 @@
 
     private Map<String, Object> getMap(OrderDetl orderDetl) {
         Map<String, Object> content = new HashMap<>();
-        if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
-        if (!Cools.isEmpty(orderDetl.getINo())) content.put("iNo", "'" + orderDetl.getINo() + "'");
-        if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("detId", orderDetl.getThreeCode());
-        if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemId", "'" + orderDetl.getMatnr() + "'");
-        if (!Cools.isEmpty(orderDetl.getModel())) content.put("ItemCode", "'" + orderDetl.getModel() + "'");
-        if (!Cools.isEmpty(orderDetl.getBatch())) content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
-        if (!Cools.isEmpty(orderDetl.getProType())) content.put("proType", "'" + orderDetl.getProType() + "'");
+        if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("bill_no", "'" + orderDetl.getOrderNo() + "'");
+        if (!Cools.isEmpty(orderDetl.getINo())) content.put("i_no", "'" + orderDetl.getINo() + "'");
+        if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("det_id", orderDetl.getThreeCode());
+        if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("item_id", "'" + orderDetl.getMatnr() + "'");
+        if (!Cools.isEmpty(orderDetl.getModel())) content.put("item_code", "'" + orderDetl.getModel() + "'");
+        if (!Cools.isEmpty(orderDetl.getBatch())) content.put("item_batch", "'" + orderDetl.getBatch() + "'");
+        if (!Cools.isEmpty(orderDetl.getProType())) content.put("pro_type", "'" + orderDetl.getProType() + "'");
+        if (!Cools.isEmpty(orderDetl.getUpdateTime())) content.put("make_date", "'" + orderDetl.getUpdateTime() + "'");
         if (!Cools.isEmpty(orderDetl.getMemo())) content.put("remark", "'" + orderDetl.getMemo() + "'");
-        if (!Cools.isEmpty(orderDetl.getOutOrderNo())) content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
+        if (!Cools.isEmpty(orderDetl.getOutOrderNo())) content.put("order_no", "'" + orderDetl.getOutOrderNo() + "'");
         if (!Cools.isEmpty(orderDetl.getQty())) {
             if (orderDetl.getQty() > orderDetl.getAnfme() && orderDetl.getQty() > orderDetl.getWorkQty()) {
                 log.info("淇閿欒鏁伴噺锛歿}", JSON.toJSON(orderDetl));
-                content.put("MainNum", orderDetl.getWorkQty());
+                content.put("main_num", orderDetl.getWorkQty());
             } else {
-                content.put("MainNum", orderDetl.getQty());
+                content.put("main_num", orderDetl.getQty());
             }
         }
-        if (!Cools.isEmpty(orderDetl.getWareId())) content.put("WareId", "'" + orderDetl.getWareId() + "'");
-        if (!Cools.isEmpty(orderDetl.getWareName())) content.put("WareName", "'" + orderDetl.getWareName() + "'");
-        if (!Cools.isEmpty(orderDetl.getPacking())) content.put("Packing", "'" + orderDetl.getPacking() + "'");
-        if (!Cools.isEmpty(orderDetl.getLuHao())) content.put("LuHao", "'" + orderDetl.getLuHao() + "'");
-        if (!Cools.isEmpty(orderDetl.getSPgNO())) content.put("sPgNO", "'" + orderDetl.getSPgNO() + "'");
+        if (!Cools.isEmpty(orderDetl.getWareId())) content.put("ware_id", "'" + orderDetl.getWareId() + "'");
+        if (!Cools.isEmpty(orderDetl.getWareName())) content.put("ware_name", "'" + orderDetl.getWareName() + "'");
+        if (!Cools.isEmpty(orderDetl.getPacking())) content.put("packing", "'" + orderDetl.getPacking() + "'");
+//        if (!Cools.isEmpty(orderDetl.getLuHao())) content.put("LuHao", "'" + orderDetl.getLuHao() + "'");
+        if (!Cools.isEmpty(orderDetl.getSPgNO())) content.put("s_pg_no", "'" + orderDetl.getSPgNO() + "'");
         if (!Cools.isEmpty(orderDetl.getTemp1())) content.put("temp1", "'" + orderDetl.getTemp1() + "'");
         if (!Cools.isEmpty(orderDetl.getTemp2())) content.put("temp2", "'" + orderDetl.getTemp2() + "'");
         if (!Cools.isEmpty(orderDetl.getTemp3())) content.put("temp3", "'" + orderDetl.getTemp3() + "'");
-        content.put("LKName", "'涓壃浜屾湡'");
+        content.put("LKName", "'楂橀湒绔嬪簱'");
         return content;
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index edd97b0..b9b17c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -103,7 +103,7 @@
     lcid: 2052
 
   #ERP鎺ュ彛
-  enabled: false
+  enabled: true
   #enabled: false
   #鏌ョ湅ERP涓棿琛ㄩ棿闅�
   refreshtime: 0/5 * * * * ?

--
Gitblit v1.9.1