Browse Source

【越加红】【WMS对接】【正式切换】

wuyx 5 months ago
parent
commit
6cf87d6a2d

+ 4 - 4
src/main/java/com/uas/eis/service/Impl/DocCommonServiceImpl.java

@@ -65,7 +65,7 @@ public class DocCommonServiceImpl implements DocCommonService {
         if (!prodInOut.getPiWmsstatus().equals("已确认")) {
             updateWmsTables(master, prodInOut, detSql);
         }
-        if("YUEJH_TEST".equals(master)){
+        /*if("YUEJH_TEST".equals(master)){
             prodInOut.setCurrentMaster("YUEJH");
         }
         if("YJH_T".equals(master)){
@@ -73,9 +73,9 @@ public class DocCommonServiceImpl implements DocCommonService {
         }
         if("YIT_T".equals(master)){
             prodInOut.setCurrentMaster("YJH_HK");
-        }
+        }*/
         //测试环境
-        if(StringUtil.hasText(prodInOut.getToMasterCode())){
+        /*if(StringUtil.hasText(prodInOut.getToMasterCode())){
             if("YUEJH_TEST".equals(prodInOut.getToMasterCode())){
                 prodInOut.setToMasterCode("YUEJH");
             }
@@ -85,7 +85,7 @@ public class DocCommonServiceImpl implements DocCommonService {
             if("YIT_T".equals(prodInOut.getToMasterCode())){
                 prodInOut.setToMasterCode("YJH_HK");
             }
-        }
+        }*/
         return prodInOut;
     }
 

+ 2 - 2
src/main/java/com/uas/eis/service/Impl/ERPSWMServiceImpl.java

@@ -81,7 +81,7 @@ public class ERPSWMServiceImpl implements ERPWMSService {
             return wmsApiResult;
         }
         //测试阶段 后续不启用此段逻辑
-        if("YUEJH".equals(masterCode)){
+        /*if("YUEJH".equals(masterCode)){
             masterCode ="YUEJH_TEST";
         }
         if("AIFL".equals(masterCode)){
@@ -89,7 +89,7 @@ public class ERPSWMServiceImpl implements ERPWMSService {
         }
         if("YJH_HK".equals(masterCode)){
             masterCode ="YIT_T";
-        }
+        }*/
         vwmsConfig.setEv(docCommonService.getMasterEv(masterCode));
         logger.info("IOConfirm-Begin:masterCode {} method {} inoutno {}",masterCode, method, orderCode);
         SqlRowList piMsg = baseDao.queryForRowSet("select pi_id,pi_inoutno,pi_class,pi_wmsordertype from " + masterCode + ".PRODINOUT WHERE PI_INOUTNO = '" + orderCode + "'");