【越加红】【WMS对接】【测试环境全流程测试】

src/main/java/com/uas/eis/entity/vwms/req/ProductReq.java

@@ -12,6 +12,7 @@ public class ProductReq {
     private Long secondQuantity;//盒 pr_hsl_user
     private Long thirdQuantity;//盘 pr_psl_user
     private String skuProperty;//规格型号 pr_spec
+    private String stockUnit;//库存单位 pr_unit
   /*  private ExtendProps extendProps;
     @Data
     public static class ExtendProps {

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,8 +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");
             }
@@ -84,7 +85,7 @@ public class DocCommonServiceImpl implements DocCommonService {
             if("YIT_T".equals(prodInOut.getToMasterCode())){
                 prodInOut.setToMasterCode("YJH_HK");
             }
-        }*/
+        }
         return prodInOut;
     }
 

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

@@ -80,9 +80,8 @@ public class ERPSWMServiceImpl implements ERPWMSService {
             wmsApiResult.setMessage("没有找到对应的账套");
             return wmsApiResult;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(masterCode));
-        //测试阶段
-        /*if("YUEJH".equals(masterCode)){
+        //测试阶段 后续不启用此段逻辑
+        if("YUEJH".equals(masterCode)){
             masterCode ="YUEJH_TEST";
         }
         if("AIFL".equals(masterCode)){
@@ -90,7 +89,8 @@ 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 + "'");
         if (!piMsg.next()) {

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

@@ -43,7 +43,7 @@ public class ERPServiceImpl implements ERPService {
         logger.info("sendProd-Begin:master {} id {}", master, id);
         vwmsConfig.setEv(docCommonService.getMasterEv(master));
         // 执行查询
-        SqlRowList docMsg = baseDao.queryForRowSet(" select nvl(pr_sendwmsflag,0) pr_sendwmsflag,pr_id,pr_code,pr_detail,pr_spec,pr_brand,pr_xsl_user,pr_hsl_user,pr_psl_user " +
+        SqlRowList docMsg = baseDao.queryForRowSet(" select nvl(pr_sendwmsflag,0) pr_sendwmsflag,pr_id,pr_code,pr_detail,pr_spec,pr_brand,pr_xsl_user,pr_hsl_user,pr_psl_user,pr_unit " +
                 " from " + vwmsConfig.getDC_MASTER() + ".product where pr_id = " + id);
         if (!docMsg.next()) {
 //            baseDao.execute("update " + master + ".product set pr_sendwmsstatus='同步失败',pr_sendwmserr='没有需要同步的商品。' where pr_id = " + id);
@@ -64,6 +64,9 @@ public class ERPServiceImpl implements ERPService {
         }
         //需要调用三次对接方法
         String[] masterList = new String[]{"YUEJH_TEST", "YJH_T", "YIT_T"};//YUEJH、AIFL、YJH_HK
+        if("prod".equals(vwmsConfig.getEv())){
+            masterList = new String[]{"YUEJH", "AIFL", "YJH_HK"};
+        }
         for (String m : masterList) {
             Map<String, Object> res = sendProdSigle(m, actionType, docMsg.getCurrentMap());
             if (!res.get("success").equals(true)) {
@@ -102,10 +105,14 @@ public class ERPServiceImpl implements ERPService {
         }
         if ("YJH_T".equals(master)) {
             ownerCode = "AIFL";
-            ownerName = "艾富利";
         }
         if ("YIT_T".equals(master)) {
             ownerCode = "YJH_HK";
+        }
+        if ("AIFL".equals(ownerCode)) {
+            ownerName = "艾富利";
+        }
+        if ("YJH_HK".equals(ownerCode)) {
             ownerName = "越加红香港";
         }
         if (map == null || !StringUtil.hasText(map.get("pr_code"))) {
@@ -126,6 +133,7 @@ public class ERPServiceImpl implements ERPService {
         productReq.setSecondQuantity(Long.valueOf(StringUtil.nvl(map.get("pr_hsl_user"), "0")));
         productReq.setThirdQuantity(Long.valueOf(StringUtil.nvl(map.get("pr_psl_user"), "0")));
         productReq.setSkuProperty(StringUtil.nvl(map.get("pr_spec"), " "));
+        productReq.setStockUnit(StringUtil.nvl(map.get("pr_unit"),""));
         // 创建BaseReq对象
         BaseItemReq<ProductReq> prodBaseItemReq = new BaseItemReq();
         prodBaseItemReq.setActionType(actionType);

src/main/resources/vwms.properties

@@ -4,7 +4,9 @@ customerId=YJH
 vwms.warehouse.code=YJHCK
 #ownerCode=YUEJH
 
-#????: http://vpn-nj.hr-network.cn:285/api/edi/qimen/service
+#????:
+#api_url_test=http://vpn-nj.hr-network.cn:285/api/edi/qimen/service
+
 api_url_test=http://1.12.53.214:8085/api/edi/qimen/service
 app_key_test=YJHUAS
 customerId_test=YJH

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

@@ -115,8 +115,8 @@ public class UasEisApplicationTests {
 	@Test
 	public void testSendIn(){
 		// 设置测试数据
-		String master = "YUEJH_TEST";
-		String id = "50744157";
+		String master = "YUEJH";
+		String id = "50904060";
 		String emCode = "test";
 		String caller ="ProdInOut!OtherIn";
 		//50744156 "ProdInOut!StockProfit";
@@ -129,10 +129,10 @@ public class UasEisApplicationTests {
 	@Test
 	public void testSendProd(){
 		// 设置测试数据
-		String master = "YUEJH_TEST";
+		String master = "DATACENTER";
 		String emCode = "test";
 		String caller = "Product";
-		String id = baseDao.queryForObject("select pr_id from "+vwmsConfig.getDC_MASTER()+".product where pr_code = 'U00014725'",String.class);
+		String id = baseDao.queryForObject("select pr_id from "+vwmsConfig.getDC_MASTER()+".product where pr_code = 'U00014976'",String.class);
 		// 调用待测方法
 		Map<String, Object> result = erpService.sendProd(master, id, emCode,caller);
 		System.out.println("result:"+result.toString());