From 159da6be4a8765efda4be50393ace7578a055429 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 30 一月 2023 11:52:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 b9b9617..595dc84 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -77,9 +77,13 @@
             throw new CoolException(BaseRes.PARAM);
         }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+//            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+//        }
         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() + "缁勬墭鏁版嵁宸插瓨鍦�");
         }
 
         // todo: 涓嶄笅绾块噸鏂板叆搴�
@@ -101,10 +105,10 @@
             param.getCombMats().forEach(elem -> {
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
 
-                if (Cools.isEmpty(detlDto.getBatch())){
-                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
-                    detlDto.setBatch(batch);
-                }
+//                if (Cools.isEmpty(detlDto.getBatch())){
+//                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+//                    detlDto.setBatch(batch);
+//                }
 
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());

--
Gitblit v1.9.1