【华信科】【富勒WMS对接】【变更同步防呆处理】

src/main/java/com/uas/eis/service/ERPService.java

@@ -19,4 +19,6 @@ public interface ERPService {
     Map<String, Object> cancelIO(String master, String id, String emCode, String caller,String op);
 
     Map<String, Object> sendStockData(String master, String emCode);
+
+    void syncUnValidChange(String master, String emCode);
 }

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -49,7 +49,7 @@ public class ERPServiceImpl implements ERPService {
 //        SpObserver.putSp(master);//没有用
         // 执行查询
         SqlRowList docMsg = baseDao.queryForRowSet(" select pr_id,pr_code,pr_ycxh,pr_ycxhin,pr_detail,pr_orispeccode,pr_brand,pr_unit,pr_zxbzs,nvl(pr_sendwmsflag,0) pr_sendwmsflag " +
-                " from "+vwmsConfig.getDC_MASTER()+".product left join "+vwmsConfig.getDC_MASTER()+".productbrand on pb_name = pr_brand where pr_id in ("+ids+") and pb_sendwms = -1 ");
+                " from "+vwmsConfig.getDC_MASTER()+".product left join "+vwmsConfig.getDC_MASTER()+".productbrand on pb_name = pr_brand where pr_id in ("+ids+") and ( pb_sendwms = -1 or nvl(pr_sendwmsflag,0) = -1 )");
         if(!docMsg.hasNext()){
             baseDao.execute("update "+vwmsConfig.getDC_MASTER()+".product set pr_sendwmsstatus='同步失败',pr_sendwmserr='没有需要同步的商品(品牌需设置对接WMS)。' where pr_id IN ("+ids+")");
             retMap.put("success",false);
@@ -914,8 +914,6 @@ public class ERPServiceImpl implements ERPService {
         return resMap;
     }
 
-
-
     private OrderVastRequest.OrdersRequest<OrderCancel> getOrderCancelOrdersRequest(String cancelReason, ProdInout prodInOut) {
         OrderVastRequest.OrdersRequest<OrderCancel> orders = new OrderVastRequest.OrdersRequest<OrderCancel>();
         OrderCancel cancelOrder = new OrderCancel();
@@ -928,5 +926,168 @@ public class ERPServiceImpl implements ERPService {
         return orders;
     }
 
+    @Override
+    public void syncUnValidChange(String master, String emCode) {
+        //物料资料变更
+        try {
+            SqlRowList unSyncProdCList = baseDao.queryForRowSet("select cl_id,cl_code,cl_keyvalue,cl_auditman,pr_code,cl_caller " +
+                    " from commonchangelog left join product on pr_id = cl_keyvalue " +
+                    " where cl_status='已审核' and CL_CALLER like 'Product%' and nvl(pr_sendwmsflag,0) = -1 and nvl(CL_sendwmsflag,0) = 0 " +
+                    "    and to_char(CL_AUDITDATE,'yyyymm') >= '202506' and CL_AUDITDATE <= SYSDATE - INTERVAL '5' MINUTE" +
+                    " order by cl_id,cl_keyvalue");
+            if(unSyncProdCList.hasNext()){
+                while (unSyncProdCList.next()){
+                    Integer clId = unSyncProdCList.getGeneralInt("cl_id");
+                    Integer prId = unSyncProdCList.getGeneralInt("cl_keyvalue");
+                    String auditman = unSyncProdCList.getGeneralString("cl_auditman");
+                    String code = unSyncProdCList.getGeneralString("pr_code");
+                    String caller = unSyncProdCList.getGeneralString("cl_caller");
+                    String clCode = unSyncProdCList.getGeneralString("cl_code");
+                    Map<String, Object> result = sendProd(master, String.valueOf(prId), emCode,"Product");
+                    String message = "";
+                    boolean successFlag = true;
+                    if (result.get("success") == null || !"true".equals(result.get("success").toString())) {
+                        if(result.get("errList")!=null){
+                            try {
+                                List<Map<String,Object>> errList = (List<Map<String,Object>>) result.get("errList");
+                                for(Map<String,Object> map:errList){
+                                    if(map.get("code").equals(code)){
+                                        message = map.get("eMsg") == null? "同步失败" : map.get("eMsg").toString();
+                                        successFlag = false;
+                                    }
+                                }
+                            } catch (Exception e) {
+                                message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                                successFlag = false;
+                            }
+                        }else{
+                            message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                            successFlag = false;
+                        }
+                    }
+                    if(successFlag){
+                        baseDao.execute("update commonchangelog set CL_sendwmsflag = -1,cl_sendwmserr='' where cl_id = ?",clId);
+                        baseDao.execute("update product set pr_sendwmsflag = -1 where pr_id = ?",prId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','同步成功','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }else {
+                        baseDao.execute("update commonchangelog set CL_sendwmsflag = -1,cl_sendwmserr='"+message+"' where cl_id = ?",clId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','"+message+"','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        //客户资料
+        try {
+            SqlRowList unSyncCustCList = baseDao.queryForRowSet("select cl_id,cl_code,cl_keyvalue,cl_auditman,cu_code,cl_caller " +
+                    " from commonchangelog left join customer on cu_id = cl_keyvalue " +
+                    " where cl_status='已审核' and CL_CALLER like 'Customer!Base%' and nvl(CL_sendwmsflag,0) = 0 " +
+                    "    and to_char(CL_AUDITDATE,'yyyymm') >= '202506' and CL_AUDITDATE <= SYSDATE - INTERVAL '5' MINUTE " +
+                    " order by cl_id,cl_keyvalue");
+            if(unSyncCustCList.hasNext()){
+                while (unSyncCustCList.next()){
+                    Integer clId = unSyncCustCList.getGeneralInt("cl_id");
+                    Integer cuId = unSyncCustCList.getGeneralInt("cl_keyvalue");
+                    String auditman = unSyncCustCList.getGeneralString("cl_auditman");
+                    String code = unSyncCustCList.getGeneralString("cu_code");
+                    String caller = unSyncCustCList.getGeneralString("cl_caller");
+                    String clCode = unSyncCustCList.getGeneralString("cl_code");
+                    Map<String, Object> result = sendCust(master, String.valueOf(cuId), emCode,"Customer!Base");
+                    String message = "";
+                    boolean successFlag = true;
+                    if (result.get("success") == null || !"true".equals(result.get("success").toString())) {
+                        if(result.get("errList")!=null){
+                            try {
+                                List<Map<String,Object>> errList = (List<Map<String,Object>>) result.get("errList");
+                                for(Map<String,Object> map:errList){
+                                    if(map.get("code").equals(code)){
+                                        message = map.get("eMsg") == null? "同步失败" : map.get("eMsg").toString();
+                                        successFlag = false;
+                                    }
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                                successFlag = false;
+                            }
+                        }else{
+                            message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                            successFlag = false;
+                        }
+                    }
+                    if(successFlag){
+                        baseDao.execute("update commonchangelog set cl_sendwmsflag = -1,cl_sendwmserr='' where cl_id = ?",clId);
+                        baseDao.execute("update customer set cu_sendwmsflag = -1 where cu_id = ?",cuId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','同步成功','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }else {
+                        baseDao.execute("update commonchangelog set cl_sendwmsflag = -1,cl_sendwmserr='"+message+"' where cl_id = ?",clId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','"+message+"','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        //供应商资料
+        try {
+            SqlRowList unSyncCustCList = baseDao.queryForRowSet("select cl_id,cl_code,cl_keyvalue,cl_auditman,ve_code,cl_caller " +
+                    " from commonchangelog left join Vendor on ve_id = cl_keyvalue " +
+                    " where cl_status='已审核' and CL_CALLER like 'Vendor%' and nvl(CL_sendwmsflag,0) = 0 " +
+                    "    and to_char(CL_AUDITDATE,'yyyymm') >= '202506' and CL_AUDITDATE <= SYSDATE - INTERVAL '5' MINUTE " +
+                    " order by cl_id,cl_keyvalue");
+            if(unSyncCustCList.hasNext()){
+                while (unSyncCustCList.next()){
+                    Integer clId = unSyncCustCList.getGeneralInt("cl_id");
+                    Integer veId = unSyncCustCList.getGeneralInt("cl_keyvalue");
+                    String auditman = unSyncCustCList.getGeneralString("cl_auditman");
+                    String code = unSyncCustCList.getGeneralString("ve_code");
+                    String caller = unSyncCustCList.getGeneralString("cl_caller");
+                    String clCode = unSyncCustCList.getGeneralString("cl_code");
+                    Map<String, Object> result = sendVend(master, String.valueOf(veId), emCode,"Vendor");
+                    String message = "";
+                    boolean successFlag = true;
+                    if (result.get("success") == null || !"true".equals(result.get("success").toString())) {
+                        if(result.get("errList")!=null){
+                            try {
+                                List<Map<String,Object>> errList = (List<Map<String,Object>>) result.get("errList");
+                                for(Map<String,Object> map:errList){
+                                    if(map.get("code").equals(code)){
+                                        message = map.get("eMsg") == null? "同步失败" : map.get("eMsg").toString();
+                                        successFlag = false;
+                                    }
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                                successFlag = false;
+                            }
+                        }else{
+                            message = result.get("message") == null ? "同步失败" : result.get("message").toString();
+                            successFlag = false;
+                        }
+                    }
+                    if(successFlag){
+                        baseDao.execute("update commonchangelog set cl_sendwmsflag = -1,cl_sendwmserr='' where cl_id = ?",clId);
+                        baseDao.execute("update vendor set ve_sendwmsflag = -1 where ve_id = ?",veId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','同步成功','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }else {
+                        baseDao.execute("update commonchangelog set cl_sendwmsflag = -1,cl_sendwmserr='"+message+"' where cl_id = ?",clId);
+                        baseDao.execute("Insert into MESSAGELOG (ML_ID,ML_DATE,ML_MAN,ML_CONTENT,ML_RESULT,ML_SEARCH,CODE) " +
+                                "values (MESSAGELOG_seq.nextval,sysdate,'"+auditman+"','同步至WMS','"+message+"','" + caller + "|cl_id=" + clId + "','" + clCode + "')");
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
 
 }

src/main/java/com/uas/eis/task/BatchZhanglingSyncTask.java

@@ -14,4 +14,10 @@ public class BatchZhanglingSyncTask {
     private void syncBatchZhangling(){
         erpService.sendStockData("HUAXK_P","JOB");
     }
+
+
+    @Scheduled(cron = "0 */5 * * * *")
+    private void syncUnValidChange(){
+        erpService.syncUnValidChange("DATACENTER_P","JOB");
+    }
 }

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -40,13 +40,18 @@ public class UasEisApplicationTests {
 	private ERPService erpService;
 	@Autowired
 	private VwmsConfig vwmsConfig;
+	@Test
+	public void testsyncUnValidChange(){
+		erpService.syncUnValidChange("DATACENTER_P","JOB");
+	}
 
 	@Test
 	public void testSendProdByEv(){
 		// 设置测试数据
-		String master = "DATACENTER";
+		String master = "DATACENTER_P";
 		Map<String, Object> result = new HashMap<>();
-		String id = "100072167";
+		String id = "100075265,100075205,100075146,100075145,100075144,100075143,100075142,100075141,100075140,100075138,100075137,100075136,100075135,100075134,100075133,100075132,100075131,100075130,100075129,100075128,100075127,100075126,100075125,100075124,100075123,100075122,100075121,100075120,100075119,100075118,100075117,100075116,100075115,100075114,100075113,100075112,100075111,100075110,100075109,100075108,100075107,100075106,100075105,100075104,100075103,100075102,100075101,100075100,100075099,100075098,100075097,100075096,100075095,100075094,100075093,100075092,100075091,100075090,100075089,100075088,100075087,100075086,100075085,100074815,100074814,100074813,100074811,100074810,100074809,100074808,100074807,100074806,100074805,100074594,100074592,100074591,100074590,100074589,100074588,100074586,100074585,100074538,100074537,100074536,100074535,100074534,100074533,100074532,100074531,100074530,100074529,100074528,100074527,100074526,100074525,100066126,100061486,100061485,100059029,100054953,100053985,100044457,100044414,100044413,100044412,100044406,100044405,100044394,100044393,100044391,100044389,100044383,100044374,100044372,100044370,100044369,100044366,100044364,100044363,100044361,100044360"
+				;
 		String emCode = "ADMIN";
 		String caller = "Product";
 		result = erpService.sendProd(master, id, emCode,caller);