From b87fd470a866ffcf50bb5c5d55ff9b2dd11fc20c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 八月 2025 08:17:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 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 393e27c..94e4e6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -220,12 +220,17 @@
     }
 
     @Override
-    public boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme) {
+    public boolean reportTkrk(WaitPakin waitPakin) {
+        String matnr = waitPakin.getMatnr();
+        String batch = waitPakin.getBatch();
+        String orderNo = waitPakin.getOrderNo();
+        Double anfme = waitPakin.getAnfme();
+
         Object process1 = null;
         NcResultMessage response1 = null;
         boolean success1 = false;
         try {
-            process1 = processTKRK(matnr, batch, orderNo, anfme);
+            process1 = processTKRK(matnr, batch, orderNo, anfme, waitPakin.getCstateid());
             //鍙戦�佽姹�
             response1 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
             log.info("閫�搴撳叆搴搑esponse:{}", response1);
@@ -245,7 +250,7 @@
         NcResultMessage response2 = null;
         boolean success2 = false;
         try {
-            process2 = processDBTK(matnr, batch, orderNo, anfme);
+            process2 = processDBTK(matnr, batch, orderNo, anfme, waitPakin.getCstateidVcode());
             //鍙戦�佽姹�
             response2 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, dbdd, JSONObject.toJSONString(process2));
             log.info("閫�搴撳叆搴搑esponse:{}", response2);
@@ -350,7 +355,7 @@
         return data;
     }
 
-    private Object processTKRK(String matnr,String batch, String orderNo, Double anfme) {
+    private Object processTKRK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
 //        EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
 //        wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
 //        NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
@@ -362,7 +367,7 @@
                 .eq("VBILLCODE", orderNo)
                 .eq("WLBM", matnr)
         );
-        if(null == nccSaleXsfhmxWms) {
+        if (null == nccSaleXsfhmxWms) {
             throw new CoolException("鏈壘鍒伴攢鍞崟鎹�");
         }
 
@@ -381,6 +386,7 @@
 
         saleOutBodyVO.setVbatchcode(batch);
         saleOutBodyVO.setNnum(anfme * -1);
+        saleOutBodyVO.setCstateid(cstateid);
         saleOutBodyVOList.add(saleOutBodyVO);
 
         data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -388,7 +394,7 @@
         return data;
     }
 
-    private Object processDBTK(String matnr, String batch, String orderNo, Double anfme) {
+    private Object processDBTK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
         List<NccSaleDbddWms> nccSaleDbddWmsList = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>()
                 .eq("wlbm", matnr)
                 .eq("vbillcode", orderNo)
@@ -405,10 +411,10 @@
 
         List<IaIjBillB> bids = new ArrayList<>();
         IaIjBillB iaIjBillB = new IaIjBillB();
-        NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", batch).eq("wlbm", matnr));
-        if (nccScPcdaWms == null) {
-            throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + batch + "-" + matnr);
-        }
+//        NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", batch).eq("wlbm", matnr));
+//        if (nccScPcdaWms == null) {
+//            throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + batch + "-" + matnr);
+//        }
 
         Double weight = MatUtils.calcWeight(matnr, anfme);
         iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -416,7 +422,7 @@
         iaIjBillB.setNnum(anfme * -1);
         iaIjBillB.setVbatchcode(batch);
         iaIjBillB.setClocationid("");
-        iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+        iaIjBillB.setCstateid(cstateid);
 
         bids.add(iaIjBillB);
 
@@ -532,8 +538,8 @@
                 iaIjBillB.setCstateid(orderDetl.getCstateidVcode());
 
                 hid = nccSaleDbddWms.getCbillid();
+                bids.add(iaIjBillB);
             }
-            bids.add(iaIjBillB);
         }
         data.put("hid", hid);
         data.put("bids", bids);
@@ -592,7 +598,7 @@
             }
 
             whsTransBillBodyVO = new WhsTransBillBodyVO();
-            whsTransBillBodyVO.setCstateid(nccScPcdaWms.getPkStorestate());
+            whsTransBillBodyVO.setCstateid(orderDetl.getCstateid());
 
             String remark = orderDetl.getRemark();
             //if (!Cools.isEmpty(remark)) {
@@ -644,7 +650,7 @@
             generalout_b.setCsourcetype("4K-01");
             generalout_b.setCsourcebillhid(cspecialhid);
             generalout_b.setCmaterialvid(orderDetl.getMatnr());
-            generalout_b.setCstateid(nccScPcdaWms.getPkStorestate());
+            generalout_b.setCstateid(orderDetl.getCstateid());
             generalout_b.setPk_batchcode(nccScPcdaWms.getPkBatchcode());
             StoreType storeType = storeTypeService.selectOne(new EntityWrapper<StoreType>().eq("store_id", orderDetl.getStandby1()));
             generalout_b.setCdptvid(storeType.getDepartmentId());

--
Gitblit v1.9.1