From 173c2665d9d53534489a5374abe855dad19b86a6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 11 十月 2024 08:40:39 +0800
Subject: [PATCH] 入库:添加仓库编码逻辑

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 04d1f5d..73bde27 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -50,10 +50,10 @@
     @Transactional
     public ReturnT<String> start(Order order) {
 
-        List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�","閾跺骇濮斿鏉愭枡鍑哄簱鍗�","閾跺骇濮斿鍏ュ簱鍗�","閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+        List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
 
         DocType docType = docTypeService.selectById(order.getDocType());
-        if(!docNames.contains(docType.getDocName())){
+        if (!docNames.contains(docType.getDocName())) {
             order.setSettle(8L);
             orderService.updateById(order);
             return SUCCESS;
@@ -70,11 +70,11 @@
         List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
 
         ReportErpParam param = new ReportErpParam();
-        mappingParam(order,param);
-        mappingParamChildren(orderDetlList,param);
+        mappingParam(order, param);
+        mappingParamChildren(orderDetlList, param);
 
         int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
-        if(code == 0){
+        if (code == 0) {
             order.setSettle(6L);
             orderService.updateById(order);
         }
@@ -82,12 +82,12 @@
         return SUCCESS;
     }
 
-    private void mappingParam(Order order, ReportErpParam param){
+    public void mappingParam(Order order, ReportErpParam param) {
         param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
         param.set鎿嶄綔鍗曟嵁(order.getDocType$());
         param.set鎿嶄綔绫诲瀷("add");
         param.setDdate(order.getOrderTime());
-        param.setCWhCode("");
+        param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
         param.setCDepCode("YZ");
         param.setCOrderCode(order.getOrderNo());
         param.setCMaker("");
@@ -95,10 +95,10 @@
         param.setCDefine14(order.getOrderNo());
     }
 
-    private void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param){
+    public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
         List<ReportErpParam.ChildInfo> paramChild = new ArrayList<>();
         param.setChildren(paramChild);
-        for (OrderDetl orderDetl : orderDetlList){
+        for (OrderDetl orderDetl : orderDetlList) {
             ReportErpParam.ChildInfo childInfo = new ReportErpParam.ChildInfo();
             childInfo.setIrowno(orderDetl.getItemNum());
             childInfo.setCInvCode(orderDetl.getMatnr());
@@ -110,7 +110,6 @@
             childInfo.setIPOsID(orderDetl.getSku());
             childInfo.setCOrderCode(orderDetl.getOrderNo());
             childInfo.setIvouchrowno(orderDetl.getItemNum());
-            childInfo.setCBatch("");
             childInfo.setDefine22(orderDetl.getThreeCode());
 
             paramChild.add(childInfo);
@@ -118,7 +117,7 @@
 
     }
 
-    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
         String response = "";
         boolean success = false;
 
@@ -131,22 +130,22 @@
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
 
-            if(Cools.isEmpty(jsonObject.get("succeed"))){
+            if (Cools.isEmpty(jsonObject.get("succeed"))) {
                 throw new CoolException(jsonObject.get("dsc").toString());
             }
 
             String succeed = jsonObject.get("succeed").toString();
 
-            int code = Cools.eq("0",succeed) ? 0 : 1;
-            if(code != 0){
+            int code = Cools.eq("0", succeed) ? 0 : 1;
+            if (code != 0) {
                 throw new CoolException(jsonObject.get("dsc").toString());
             }
             success = true;
             return code;
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage());
             throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
-        }finally {
+        } finally {
             apiLogService.save(
                     namespace,
                     url + path,

--
Gitblit v1.9.1