From ea63cc4745ace568fe5570e18f7ff5b21a811826 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 14 五月 2025 14:52:26 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/common/web/WcsController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3245881..00a4bf2 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -327,7 +327,7 @@
         // 妫�绱㈠簱浣�
         List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
         List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+        StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -367,9 +367,8 @@
                 Order order = orderService.selectByNo(waitPakin.getOrderNo());
                 if (order != null) {
                     OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
-//                    if (orderDetl == null) {
-//                        orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
-//                    }
+                    wrkDetl.setBatch(orderDetl.getBatch());
+                    wrkDetl.setProType(orderDetl.getProType());
                     wrkDetl.setSPgNO(orderDetl.getSPgNO());
                     wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
                     wrkDetl.setLuHao(orderDetl.getLuHao());

--
Gitblit v1.9.1