From 1e0b3d37a8162da92146684ec1cbd7e00a0cf0ba Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 29 六月 2025 10:13:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 a3b0320..eb968e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -484,6 +484,7 @@
             whsTransBillBodyVO.setNnum(orderDetl.getQty());
             whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
             whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
+            whsTransBillBodyVO.setPk_batchcode(nccScPcdaWms.getPkBatchcode());
             //}
             whsTransBillHeaderVO.setCwarehouseid(orderDetl.getStandby1());
             whsTransBillBodyVOS.add(whsTransBillBodyVO);
@@ -515,10 +516,11 @@
         ic_generalout_b generalout_b = null;
         List<ic_generalout_b> ic_purchasein_bs = new ArrayList<>();
         for (int i = 0; i < orderDetls.size(); i++) {
-//            NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetls.get(i).getBatch()).eq("wlbm", orderDetls.get(i).getMatnr()));
-//            if (nccScPcdaWms == null) {
-//                throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetls.get(i).getBatch() + orderDetls.get(i).getMatnr());
-//            }
+            NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetls.get(i).getBatch()).eq("wlbm", orderDetls.get(i).getMatnr()));
+            if (nccScPcdaWms == null) {
+                throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetls.get(i).getBatch() + orderDetls.get(i).getMatnr());
+            }
+
             OrderDetl orderDetl = orderDetls.get(i);
             generalout_h.setCwarehouseid(orderDetl.getStandby1());
             generalout_b = new ic_generalout_b();
@@ -526,7 +528,8 @@
             generalout_b.setCsourcetype("4K-01");
             generalout_b.setCsourcebillhid(cspecialhid);
             generalout_b.setCmaterialvid(orderDetl.getMatnr());
-            //generalout_b.setCstateid(nccScPcdaWms.getVcode());
+            generalout_b.setCstateid(nccScPcdaWms.getPkStorestate());
+            generalout_b.setPk_batchcode(nccScPcdaWms.getPkBatchcode());
             StoreType storeType = storeTypeService.selectOne(new EntityWrapper<StoreType>().eq("store_id", orderDetl.getStandby1()));
             generalout_b.setCdptvid(storeType.getDepartmentId());
             generalout_b.setBillmaker(renyuan);

--
Gitblit v1.9.1