立体仓库指令下发错误修复

src/custom/beans/wms/Wms.java

@@ -76,7 +76,7 @@ public class Wms {
         String billno = stockbillRow.getString("billno");
         String billdate = BaseClass.getDateTime_Str(stockbillRow.getDate("billdate"));
         Row enterpriseRow = stockbillRow.getRow("sys_enterprise", "sys_enterpriseid=:sys_enterpriseid");
-        Row contactsRow = stockbillRow.getRow("sys_enterprise_contacts", "contactsid=:rec_contactsid");
+        // Row contactsRow = stockbillRow.getRow("sys_enterprise_contacts", "contactsid=:rec_contactsid");
 
         DBConnect tqwms = new DBConnect("TQWMS");
         String SQL = "";
@@ -88,9 +88,9 @@ public class Wms {
         SQL = SQL + "0,";// 是否已删除
         SQL = SQL + "'" + billdate + "',";// 出库日期，单据日期
         SQL = SQL + "'" + enterpriseRow.getString("enterprisename") + "',";// 经销商名称
-        SQL = SQL + "'" + contactsRow.getString("name") + "',";// 经销商联系人
-        SQL = SQL + "'" + contactsRow.getString("address") + "',";// 经销商地址
-        SQL = SQL + "'" + contactsRow.getString("phonenumber") + "',";// 联系方式
+        SQL = SQL + "'" + stockbillRow.getString("name") + "',";// 经销商联系人
+        SQL = SQL + "'" + stockbillRow.getString("address") + "',";// 经销商地址
+        SQL = SQL + "'" + stockbillRow.getString("phonenumber") + "',";// 联系方式
         SQL = SQL + "0,";// 状态:0:WMS未处理 1:WMS正在出库 2:WMS出库完成 10:ERP出库完成
         SQL = SQL + "'" + controller.username + "',";
         SQL = SQL + "'" + enterpriseRow.getString("abbreviation") + "')";// 经销商简称
@@ -125,7 +125,7 @@ public class Wms {
         String billno = stockbillRow.getString("billno");
         Row enterpriseRow = stockbillRow.getRow("sys_enterprise", "sys_enterpriseid=:sys_enterpriseid");
         Row agentsRow = stockbillRow.getRow("sa_agents", "sys_enterpriseid=:sys_enterpriseid");
-        Row contactsRow = stockbillRow.getRow("sys_enterprise_contacts", "contactsid=:rec_contactsid");
+        //Row contactsRow = stockbillRow.getRow("sys_enterprise_contacts", "contactsid=:rec_contactsid");
 
         ArrayList<String> sqlist = new ArrayList<>();
         for (Row stockbillitemsRow : stockbillitemsRows) {
@@ -139,14 +139,15 @@ public class Wms {
             SQL = SQL + " GETDATE(),";// 创建日期
             SQL = SQL + " '" + agentsRow.getString("agentnum") + "',";
             SQL = SQL + " '" + enterpriseRow.getString("abbreviation") + "',";
-            SQL = SQL + " '" + contactsRow.getString("name") + "',";
-            SQL = SQL + " '" + contactsRow.getString("phonenumber") + "',";
-            SQL = SQL + " '" + contactsRow.getString("address") + "',";
+            SQL = SQL + " '" + stockbillRow.getString("name") + "',";
+            SQL = SQL + " '" + stockbillRow.getString("phonenumber") + "',";
+            SQL = SQL + " '" + stockbillRow.getString("address") + "',";
             SQL = SQL + " 0 ";
             sqlist.add(SQL);
         }
         mqwms.runSqlUpdate(sqlist);
-        SQLFactory.createUpdateSQL(controller, "st_stockbill_items").setValue("wmsuploadflag", 2).setWhere("st_stockbill_itemsid", stockbillitemsRows.toArrayList("st_stockbill_itemsid")).update();;
+        SQLFactory.createUpdateSQL(controller, "st_stockbill_items").setValue("wmsuploadflag", 2).setWhere("st_stockbill_itemsid", stockbillitemsRows.toArrayList("st_stockbill_itemsid")).update();
+        ;
     }
 
 

src/custom/common/crm/bean/customer.java

@@ -16,7 +16,7 @@ public class customer extends CrmBase {
     @Override
     public void autoAction() throws YosException {
         Rows rows = crmDBConnect.runSqlQuery("select t1.id as syncid,t1.ownerid,t2.* from (select max(id) id,ownerid from e_order_sync where ownertable='st_customer' group by ownerid) t1 left join st_customer t2 on t1.ownerid=t2.cid");
-        logger.info("监测到crm有{}个客户档案待同步", rows.size());
+        logger.info(" 监测到有【{}】个【客户档案】 待同步至E-订单", rows.size());
         ArrayList<String> agentnums = rows.toArrayList("fagent_num_created");
         agentnums.addAll(rows.toArrayList("fagent_num"));
 

src/custom/common/crm/bean/sku_crm.java

@@ -18,7 +18,8 @@ public class sku_crm extends CrmBase {
         JSONObject resultObject = JSONObject.parseObject(result);
         if (resultObject.containsKey("data")) {
             JSONArray dataArray = resultObject.getJSONArray("data");
-            logger.info("监测到crm有{}个序列号待同步", dataArray.size());
+            logger.info(" 监测到有【{}】个【序列号】 待同步至E-订单", dataArray.size());
+
             for (int i = 0; i < dataArray.size(); i++) {
                 JSONObject jsonObject = dataArray.getJSONObject(i);
                 String fmechineCode = jsonObject.getString("fmechineCode");