From d9c906634caef1128f0976b346c676f5c97032d6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 10 五月 2025 15:14:50 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3940f88..60130ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1633,7 +1633,7 @@
                     }catch (Exception e){
                         log.error("宸ヤ綔妗f鏄庣粏杈撳叆鐢佃鏈哄け璐�1锛氬紓甯镐俊鎭�==銆�"+e);
                     }
-                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs())));
+                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getSku())));
                 }
                 commands.add(ledCommand);
             }
@@ -1876,7 +1876,8 @@
                     wrkMast.setCrnNo(crn.getId());
                     wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
                     wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
-                    wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
+//                    wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
+                    wrkMast.setFullPlt(shallowLoc.getLocSts().equals("D") ? "N" : "Y"); // 婊℃澘
                     wrkMast.setPicking("N"); // 鎷f枡
                     wrkMast.setExitMk("N"); // 閫�鍑�
                     wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
@@ -1893,6 +1894,7 @@
                     // 宸ヤ綔妗f槑缁嗕繚瀛�
                     if (shallowLoc.getLocSts().equals("F")) {
                         List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+
                         for (LocDetl locDetl : locDetls) {
                             WrkDetl wrkDetl = new WrkDetl();
                             wrkDetl.setWrkNo(workNo);

--
Gitblit v1.9.1