From 528df0077f514bf0b0926e113630a570b9046eb2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 八月 2025 08:22:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 12d570d..4cd06b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -661,6 +661,17 @@
                     throw new CoolException("鍗曟嵁缂栧彿宸蹭綔涓氬畬鎴�");
                 }
 
+                List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>()
+                        .eq("matnr", elem.getMatnr())
+                        .eq("batch", elem.getBatch())
+                        .eq("order_no", elem.getOrderNo())
+                        .eq("anfme", elem.getAnfme())
+                        .eq("standby1", elem.getStandby1())
+                );
+                if (!waitPakinList.isEmpty()) {
+                    throw new CoolException("璇ヨ鍗曠墿鏂欏凡缁忕粍鎵橈紒");
+                }
+
                 // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
                 OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                         elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
@@ -1303,6 +1314,12 @@
 
     @Override
     public void toAllOut(PalletToAllOutParam param, Long userId) {
+        String barcodeSize = param.getBarcode().substring(0, 2);
+        String newBarcodeSize = param.getNewBarcode().substring(0, 2);
+        if (!barcodeSize.equals(newBarcodeSize)) {
+            throw new CoolException("鎵樼洏灏哄涓嶄竴鑷�");
+        }
+
         WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
         if (wrkMast == null) {
             throw new CoolException("宸ヤ綔妗d笉瀛樺湪");

--
Gitblit v1.9.1