From f193fdd84d868624bc53cb0da4425d258153afaf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 16 七月 2025 15:41:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 8ca6eff..c9e5522 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -86,6 +86,7 @@
         Object process2 = null;
         String memo = order.getMemo();
         String remark = "";
+        boolean success = false;
         log.info("璁㈠崟寮�濮嬩笂鎶�:{}", JSON.toJSONString(order));
         try {
             switch (order.getDocType$().toString()) {
@@ -96,6 +97,7 @@
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("閿�鍞彂璐esponse:{}", response);
                         step = 10;
+                        success = true;
                     } else {
                         remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                     }
@@ -107,6 +109,7 @@
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("閿�鍞彂璐esponse:{}", response);
                         step = 10;
+                        success = true;
                     } else {
                         remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                     }
@@ -118,6 +121,7 @@
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("杞簱-鍏ュ簱response:{}", response);
                         step = 10;
+                        success = true;
                     } else {
                         remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                     }
@@ -147,6 +151,7 @@
                         if (!Cools.isEmpty(response) && response.isSuccess()) {
                             log.info("杞簱-鍑哄簱2response:{}", response);
                             step = 10;
+                            success = true;
                         } else {
                             remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                         }
@@ -169,6 +174,7 @@
                             if (!Cools.isEmpty(response) && response.isSuccess()) {
                                 log.info("杞簱-鍑哄簱2response:{}", response);
                                 step = 10;
+                                success = true;
                             } else {
                                 remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                             }
@@ -182,6 +188,7 @@
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("闆嗗洟鍐呴儴璋冩嫧response:{}", response);
                         step = 10;
+                        success = true;
                     } else {
                         remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                     }
@@ -204,7 +211,7 @@
             e.printStackTrace();
             throw new CoolException("璋冪敤鎺ュ彛鎶ラ敊锛岃鑱旂郴绠＄悊鍛�");
         } finally {
-            reportApiLog(order, process1, process2, response, order.getDocType$(), nyncIp, saveRefDelivery);
+            reportApiLog(order, process1, process2, response, order.getDocType$(), nyncIp, saveRefDelivery, success);
         }
 
     }
@@ -434,26 +441,36 @@
     private Object processDBDD(List<OrderDetl> orderDetls) {
         //缁勮瀵硅薄鏁版嵁
         Map<String, Object> data = new HashMap<String, Object>();
-        IaIjBill iaIjBill = new IaIjBill();
-        iaIjBill.setPk_org("FYT");
-        //iaIjBill.setCwarehouseid("6101");
-        IaIjBillB iaIjBillB = null;
-        List<IaIjBillB> iaIjBillBS = new ArrayList<>();
+
+        String hid = "";
+        List<IaIjBillB> bids = new ArrayList<>();
         for (OrderDetl orderDetl : orderDetls) {
-            iaIjBillB = new IaIjBillB();
+            if (orderDetl.getQty() <= 0) {
+                continue;
+            }
+            IaIjBillB iaIjBillB = new IaIjBillB();
             String remark = orderDetl.getRemark();
             if (!Cools.isEmpty(remark)) {
-                NccSaleDbddWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
-                iaIjBillB.setCinventoryid(nccSaleXsfhmxWms.getWlbm());
-                iaIjBillB.setCinventoryvid(nccSaleXsfhmxWms.getWlbm());
-                iaIjBillB.setCsrcid(nccSaleXsfhmxWms.getCbillid());
-                iaIjBillB.setNnum(orderDetl.getQty().intValue() + "");
-                iaIjBillB.setPk_org("FYT");
+                NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
+                if (nccScPcdaWms == null) {
+                    throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetl.getBatch() + orderDetl.getMatnr());
+                }
+
+                Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
+                NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
+                iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
+                iaIjBillB.setNassistnum(weight);
+                iaIjBillB.setNnum(orderDetl.getQty());
+                iaIjBillB.setVbatchcode(orderDetl.getBatch());
+                iaIjBillB.setClocationid("");
+                iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+
+                hid = nccSaleDbddWms.getCbillid();
             }
-            iaIjBillBS.add(iaIjBillB);
+            bids.add(iaIjBillB);
         }
-        data.put("ia_ijbill", iaIjBill);
-        data.put("ia_ijbill_b", iaIjBillBS);
+        data.put("hid", hid);
+        data.put("bids", bids);
         return data;
     }
 
@@ -581,13 +598,12 @@
     }
 
 
-    private Boolean reportApiLog(Order order, Object process1, Object process2, Object response, String docType, String url, String path) {
+    private Boolean reportApiLog(Order order, Object process1, Object process2, Object response, String docType, String url, String path, Boolean success) {
         HashMap<String, Object> request = new HashMap<>();
         request.put("order", order);
         request.put("process1", process1);
         request.put("process2", process2);
 
-        boolean success = false;
         apiLogService.save(
                 docType,
                 url + path,

--
Gitblit v1.9.1