From d39efc13280b047556fd0d62ede5f9540e839335 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 16:37:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/vo/ic_generalout_b.java | 2 ++
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 12 +++++++-----
2 files changed, 9 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..9a39455 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -515,10 +515,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 +527,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);
diff --git a/src/main/java/com/zy/nc/vo/ic_generalout_b.java b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
index d12f780..83863a8 100644
--- a/src/main/java/com/zy/nc/vo/ic_generalout_b.java
+++ b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
@@ -30,4 +30,6 @@
private String cothercalbodyvid;
private Double nnum;
+
+ private String pk_batchcode;
}
--
Gitblit v1.9.1