From 13887c2ec44d483eadedd98c3c1aa06efeb786d4 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期日, 21 十二月 2025 11:37:13 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/WaitPakinService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 8 ++++----
src/main/java/com/zy/common/service/CommonService.java | 2 +-
src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
index ea1930b..867f62b 100644
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
@@ -13,6 +13,6 @@
@Select("select count(*) from cust_wait_pakin where matnr = #{matnr};")
Integer selectCountByMatNr(String matnr);
- @Select("select count(*) from cust_wait_pakin where matnr = #{matnr} and zpallet = #{zpallet};")
- Integer selectByBarcodeAndMatnr(String matnr, String zpallet);
+ @Select("select count(*) from cust_wait_pakin where matnr = #{matnr};")
+ Integer selectByBarcodeAndMatnr(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/WaitPakinService.java b/src/main/java/com/zy/asrs/service/WaitPakinService.java
index ec6bc76..7a72bf9 100644
--- a/src/main/java/com/zy/asrs/service/WaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/WaitPakinService.java
@@ -12,5 +12,5 @@
Integer selectCountByMatNr(String matnr);
- Integer selectByBarcodeAndMatnr(String matnr, String zpallet);
+ Integer selectByBarcodeAndMatnr(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index 00c5fb3..21cf0de 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -50,9 +50,9 @@
}
//瀵逛簬宸茬粡缁勬墭杩囩殑 妯″叿+鎵樼洏 涓嶅厑璁稿啀娆＄粍鎵�
- Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr(), matBarcode.getZpallet());
+ Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr());
if (waitPakinCount >= 1){
- throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr() + "鎵樼洏鐮�:" + matBarcode.getZpallet());
+ throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
@@ -82,7 +82,7 @@
}
@Override
- public Integer selectByBarcodeAndMatnr(String matnr, String zpallet) {
- return this.baseMapper.selectByBarcodeAndMatnr(matnr, zpallet);
+ public Integer selectByBarcodeAndMatnr(String matnr) {
+ return this.baseMapper.selectByBarcodeAndMatnr(matnr);
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fbb3a0a..f515e5c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -332,7 +332,7 @@
}
}
- if (locMasts.size() <= 5){
+ if (locMasts.size() < 2){
throw new CoolException("鏃犵┖搴撲綅鍙敤");
}
List<LocMast> locMastList = new ArrayList<>();
--
Gitblit v1.9.1