From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6b2dda5..e5ddb86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -96,8 +96,8 @@
 //        }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
         if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+                eq("zpallet", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "鏉$爜宸茬粍鎵�");
         }
         try{
             param.setOrderNo(param.getCombMats().get(0).getOrderNo());
@@ -134,6 +134,7 @@
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
+                detlDto.setMemo(elem.getMemo());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -165,6 +166,7 @@
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setUuid(uuid);
                 waitPakin.setWeight(detlDto.getWeight());
+                waitPakin.setMemo(detlDto.getMemo());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -245,6 +247,7 @@
                 waitPakin.setPayment(detlDto.getPayment());
                 waitPakin.setUuid(uuid);
                 waitPakin.setWeight(detlDto.getWeight());
+                waitPakin.setMemo(detlDto.getMemo());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }

--
Gitblit v1.9.1