【华信科】【富勒WMS对接】【新增测试环境】

src/main/java/com/uas/eis/config/VwmsConfig.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.PropertySource;
 @Data
 public class VwmsConfig {
     private String ev;
-
+    private String DC_MASTER;
     @Value("${api_url}")
     private String apiUrl;
 
@@ -52,6 +52,13 @@ public class VwmsConfig {
     public void setEv(String ev) {
         this.ev = ev;
     }
+    public String getDC_MASTER() {
+        if("test".equals(getEv())){
+            return "DATACENTER";
+        }else {
+            return "DATACENTER_P";
+        }
+    }
     public String getApiUrl() {
         if("test".equals(getEv())){
             return apiUrlTest;

src/main/java/com/uas/eis/sdk/samples/OrderDemo.java

@@ -42,7 +42,7 @@ public class OrderDemo {
         HttpRequest<Object> build = HttpRequest.builder(Object.class)
                 .method(HttpMethod.POST)
                 .endpoint("https://openapi.lingxing.com")
-                .path("erp/sc/data/mws_report/allOrders")
+                .path("erp/sc/data/WMS_report/allOrders")
                 .queryParams(queryParam)
                 .json(JSON.toJSONString(body))
                 .build();

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

@@ -73,7 +73,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                 .append("pi_Recordman piRecordman,to_char(pi_recorddate,'yyyy-mm-dd hh24:mi:ss') piRecorddate,pi_Remark piRemark,")
                 .append("abs(nvl(pi_sendwmsflag,0)) piSendwmsflag,nvl(pi_WmsInType,'in') piWmsInType,pi_wmsstatus piWmsstatus,")
                 .append("pi_invostatuscode piInvoStatusCode,pi_lxr_user piLxr,pi_lxdh_user piLxdh,pi_shrsj_user piShrsj,pi_khdz_user piKhdz,ma_function currentMasterName ")
-                .append("from ").append(master).append(".prodinout left join DATACENTER_P.MASTER on MA_USER = '").append(master).append("' where pi_id = ").append(id)
+                .append("from ").append(master).append(".prodinout left join ").append(vwmsConfig.getDC_MASTER()).append(".MASTER on MA_USER = '").append(master).append("' where pi_id = ").append(id)
                 .toString();
         List<ProdInout> prodInOuts = baseDao.getJdbcTemplate().query(sql,
                 new BeanPropertyRowMapper<>(ProdInout.class));
@@ -86,8 +86,8 @@ public class DocCommonServiceImpl implements DocCommonService {
                     .append("pr_detail pdProdname,pr_brand pdBrandName,sum(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty,")
                     .append("pd_whcode pdWhcode,wh_description pdWhname,pd_description pdInBatch,")
                     .append("pd_custprodcode pdCustprodcode,pd_custprodcode1_user pdCustprodcode1, pd_pocode pdPocode ")
-                    .append("from ").append(master).append(".prodiodetail LEFT JOIN DATACENTER_P.product on pr_code = pd_prodcode ")
-                    .append("left join DATACENTER_P.productbrand on pb_name = pr_brand ")
+                    .append("from ").append(master).append(".prodiodetail LEFT JOIN ").append(vwmsConfig.getDC_MASTER()).append(".product on pr_code = pd_prodcode ")
+                    .append("left join ").append(vwmsConfig.getDC_MASTER()).append(".productbrand on pb_name = pr_brand ")
                     .append("left join ").append(master).append(".warehouse on wh_Code = pd_whcode ")
                     .append("where pd_piid = ").append(prodInOut.getPiId()).append(" and pb_sendwms = -1 ")
                     .append("group by pd_piid,pd_prodcode,pr_detail,pr_brand,pd_whcode,wh_description,pd_description,")
@@ -102,9 +102,10 @@ public class DocCommonServiceImpl implements DocCommonService {
                         ",pi_custwhcode_user pdWhcodeTo,iwh.wh_description pdWhnameTo" +
                         ",pi_postmastercode postMasterCode,ma_function postMasterName " +
                         ",pd_prodcode pdProdcodeTo,pr_brand pdBrandNameTo" +
-                        " from "+master+".prodiodetail left join "+master+".prodinout on pi_id = pd_piid " +
-                        " left join DATACENTER_P.product on pr_code = pd_prodcode left join DATACENTER_P.productbrand on pb_name = pr_brand " +
-                        " left join "+master+".warehouse owh on owh.wh_Code = pd_whcode " +
+                        " from "+master+".prodiodetail left join "+master+".prodinout on pi_id = pd_piid " )
+                        .append(" left join ").append(vwmsConfig.getDC_MASTER()).append(".product on pr_code = pd_prodcode ")
+                        .append("left join ").append(vwmsConfig.getDC_MASTER()).append(".productbrand on pb_name = pr_brand ")
+                        .append(" left join "+master+".warehouse owh on owh.wh_Code = pd_whcode " +
                         " left join "+master+".warehouse iwh on iwh.wh_Code = pi_custwhcode_user" +
                         " left join DATACENTER_P.MASTER ON MA_USER = pi_postmastercode "+
                         " where pd_piid = "+prodInOut.getPiId()+" and pb_sendwms = -1 " +
@@ -120,7 +121,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                         ",pd_inwhcode pdWhcodeTo,iwh.wh_description pdWhnameTo" +
                         ",'"+master+"' postMasterCode,'"+prodInOut.getCurrentMasterName()+"' postMasterName " +
                         ",pd_prodcode pdProdcodeTo,pr_brand pdBrandNameTo" +
-                        " from "+master+".prodiodetail LEFT JOIN DATACENTER_P.product on pr_code = pd_prodcode left join  DATACENTER_P.productbrand on pb_name = pr_brand " +
+                        " from "+master+".prodiodetail LEFT JOIN ").append(vwmsConfig.getDC_MASTER()).append(".product on pr_code = pd_prodcode left join  ").append(vwmsConfig.getDC_MASTER()).append(".productbrand on pb_name = pr_brand " +
                         " left join "+master+".warehouse owh on owh.wh_Code = pd_whcode " +
                         " left join "+master+".warehouse iwh on iwh.wh_Code = pd_inwhcode " +
                         " where pd_piid = "+prodInOut.getPiId()+" and pb_sendwms = -1 " +
@@ -137,8 +138,8 @@ public class DocCommonServiceImpl implements DocCommonService {
                         ",'"+master+"' postMasterCode,'"+prodInOut.getCurrentMasterName()+"' postMasterName " +
                         ",pd_prodcode1_user pdProdcodeTo,ipr.pr_brand pdBrandNameTo" +
                         " from "+master+".prodiodetail " +
-                        " LEFT JOIN DATACENTER_P.product ipr on ipr.pr_code = pd_prodcode left join  DATACENTER_P.productbrand ibr on ibr.pb_name = ipr.pr_brand " +
-                        " LEFT JOIN DATACENTER_P.product opr on opr.pr_code = pd_prodcode left join DATACENTER_P.productbrand obr on obr.pb_name = opr.pr_brand " +
+                        " LEFT JOIN ").append(vwmsConfig.getDC_MASTER()).append(".product ipr on ipr.pr_code = pd_prodcode left join  ").append(vwmsConfig.getDC_MASTER()).append(".productbrand ibr on ibr.pb_name = ipr.pr_brand " +
+                        " LEFT JOIN ").append(vwmsConfig.getDC_MASTER()).append(".product opr on opr.pr_code = pd_prodcode left join ").append(vwmsConfig.getDC_MASTER()).append(".productbrand obr on obr.pb_name = opr.pr_brand " +
                         " left join "+master+".warehouse owh on owh.wh_Code = pd_whcode " +
                         " left join "+master+".warehouse iwh on iwh.wh_Code = pd_postwhcode " +
                         " where pd_piid = "+prodInOut.getPiId()+" and obr.pb_sendwms = -1 and ibr.pb_sendwms = -1 " +
@@ -150,7 +151,7 @@ public class DocCommonServiceImpl implements DocCommonService {
             sqlBuilder.append("select pd_piid pdPiid,min(pd_id) pdId,min(pd_pdno) pdPdno,pd_prodcode pdProdcode,pr_detail pdProdname,pr_brand pdBrandName" +
                     ",sum(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty" +
                     ",pd_whcode pdWhcode,wh_description pdWhname,pd_description pdInBatch" +
-                    " from "+master+".prodiodetail LEFT JOIN DATACENTER_P.product on pr_code = pd_prodcode left join  DATACENTER_P.productbrand on pb_name = pr_brand " +
+                    " from "+master+".prodiodetail LEFT JOIN ").append(vwmsConfig.getDC_MASTER()).append(".product on pr_code = pd_prodcode left join ").append(vwmsConfig.getDC_MASTER()).append(".productbrand on pb_name = pr_brand " +
                     " left join "+master+".warehouse on wh_Code = pd_whcode " +
                     " where pd_piid = "+prodInOut.getPiId()+" and pb_sendwms = -1 " +
                     " group by pd_piid,pd_prodcode,pr_detail,pr_brand,pd_whcode,wh_description,pd_description" +

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

@@ -45,14 +45,15 @@ public class ERPServiceImpl implements ERPService {
         Map<String,Object> retMap = new HashMap<>();
         retMap.put("success",true);
         logger.info("sendProd-Begin:master {} ids {}",master,ids);
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
 //        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 DATACENTER_P.product left join DATACENTER_P.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 ");
         if(!docMsg.hasNext()){
-            baseDao.execute("update DATACENTER_P.product set pr_sendwmsstatus='同步失败',pr_sendwmserr='没有需要同步的商品(品牌需设置对接MWS)。' where pr_id IN ("+ids+")");
+            baseDao.execute("update "+vwmsConfig.getDC_MASTER()+".product set pr_sendwmsstatus='同步失败',pr_sendwmserr='没有需要同步的商品(品牌需设置对接WMS)。' where pr_id IN ("+ids+")");
             retMap.put("success",false);
-            retMap.put("message","没有需要同步的商品(品牌需设置对接MWS)。");
+            retMap.put("message","没有需要同步的商品(品牌需设置对接WMS)。");
             return retMap;
         }
         List<Map<String, Object>> docMsgResultList = docMsg.getResultList();
@@ -107,10 +108,9 @@ public class ERPServiceImpl implements ERPService {
         Map<String, Object> retMap = new HashMap<>();
         if(CollectionUtil.isEmpty(list)){
             retMap.put("success",false);
-            retMap.put("message","没有需要同步的商品(品牌需设置对接MWS)。");
+            retMap.put("message","没有需要同步的商品(品牌需设置对接WMS)。");
             return retMap;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         String outBizCode = "sendProd-"+System.currentTimeMillis();
         for (Map<String, Object> map : list) {
             // 创建ProductReq对象
@@ -242,6 +242,7 @@ public class ERPServiceImpl implements ERPService {
         Map<String,Object> retMap = new HashMap<>();
         retMap.put("success",true);
         logger.info("sendVend-Begin:master {} ids {}",master,ids);
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         // 执行查询
         SqlRowList docMsg = baseDao.queryForRowSet(" select nvl(ve_sendwmsflag,0) sendwmsflag,ve_id,ve_code,ve_name,ve_shortname,ve_add1," +
                 "vc_id,(case when nvl(vc_isvendor,0) = 0 then 0 else 1 end ) vc_isvendor,vc_name,vc_officeemail,vc_mobile " +
@@ -340,10 +341,9 @@ public class ERPServiceImpl implements ERPService {
         Map<String, Object> retMap = new HashMap<>();
         if(CollectionUtil.isEmpty(list)){
             retMap.put("success",false);
-            retMap.put("message","没有需要同步的商品(品牌需设置对接MWS)。");
+            retMap.put("message","没有需要同步的商品(品牌需设置对接WMS)。");
             return retMap;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         String outBizCode = "sendVend-"+System.currentTimeMillis();
         for (Vendor vend : list) {
             // 创建Req对象
@@ -482,6 +482,7 @@ public class ERPServiceImpl implements ERPService {
         Map<String,Object> retMap = new HashMap<>();
         retMap.put("success",true);
         logger.info("sendCust-Begin:master {} ids {}",master,ids);
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         // 执行查询
         SqlRowList docMsg = baseDao.queryForRowSet(" select nvl(cu_sendwmsflag,0) sendwmsflag,cu_id,cu_code,cu_name,cu_shortname," +
                 "ca_id,(case when nvl(ca_remark,' ') = '是' then 1 else 0 end ) isDefault,ca_person,ca_phone,ca_address " +
@@ -578,7 +579,6 @@ public class ERPServiceImpl implements ERPService {
             retMap.put("message","没有需要同步的客户。");
             return retMap;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         String outBizCode = "sendCust-"+System.currentTimeMillis();
         for (Customer cust : list) {
             // 创建Req对象
@@ -715,8 +715,9 @@ public class ERPServiceImpl implements ERPService {
         Map<String,Object> retMap = new HashMap<>();
         retMap.put("success",true);
         logger.info("sendIO-Begin:master {}  id {}",master,id);
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         // 执行查询
-        if(!baseDao.checkIf(master+".prodiodetail left join DATACENTER_P.product on pr_code = pd_prodcode left join DATACENTER_P.productbrand on pb_name = pr_brand "
+        if(!baseDao.checkIf(master+".prodiodetail left join "+vwmsConfig.getDC_MASTER()+".product on pr_code = pd_prodcode left join "+vwmsConfig.getDC_MASTER()+".productbrand on pb_name = pr_brand "
                 ,"pd_piid = "+id+" and pb_sendwms = -1"
         )){
             logger.info("sendIO-End:master {} id {} res {}",master,id,"没有需要对接的明细。");
@@ -745,7 +746,6 @@ public class ERPServiceImpl implements ERPService {
             retMap.put("message","WMS单据类型为空或异常，不允许同步。");
             return retMap;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         //构建请求主体
         String masterName = prodInOut.getCurrentMasterName();
         Long piId = prodInOut.getPiId();
@@ -784,6 +784,7 @@ public class ERPServiceImpl implements ERPService {
         retMap.put("success",true);
         String eMsg = null;
         logger.info("sendIO-cancel-Begin:master {}  id {} cancelReason {}",master,id,cancelReason);
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         // 执行查询
         if(!baseDao.checkIf(master+".prodinout","pi_id = "+id+" and nvl(pi_sendwmsflag,0) = -1")){
             logger.info("sendIO-cancel-End:master {} id {} res {}",master,id,"单据不存在或尚未同步到WMS。");
@@ -797,7 +798,6 @@ public class ERPServiceImpl implements ERPService {
             retMap.put("message","单据已确认采集，不允许取消。");
             return retMap;
         }
-        vwmsConfig.setEv(docCommonService.getMasterEv(master));
         Long piId = prodInOut.getPiId();
         BaseReq<OrderVastRequest<OrderCancel>> req = new BaseReq();
         OrderVastRequest<OrderCancel> cancelReq = new OrderVastRequest();
@@ -858,11 +858,11 @@ public class ERPServiceImpl implements ERPService {
         Map<String, Object> resMap = new HashMap<>();
         resMap.put("success",true);
         logger.info("sendStockData-Begin master {} emCode {} ",master,emCode);
-        List<StockData> stockDataList = baseDao.getJdbcTemplate().query("SELECT * FROM "+master+".SCM_KCZLB_WMS_VIEW ",
+        vwmsConfig.setEv(docCommonService.getMasterEv(master));
+        List<StockData> stockDataList = baseDao.getJdbcTemplate().query("SELECT * FROM "+vwmsConfig.getDC_MASTER()+".SCM_KCZLB_WMS_VIEW ",
                 new BeanPropertyRowMapper<>(StockData.class));
         String dataNo = "";
         if(!CollectionUtil.isEmpty(stockDataList)){
-            vwmsConfig.setEv(docCommonService.getMasterEv(master));
             // 每1000条分批处理
             int batchSize = 1000;
             int totalSize = stockDataList.size();