From f8ee1bea8543296792f23489d142e8b3231cd66c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 16 十二月 2025 13:52:18 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 70 ++++++++--------------------------
1 files changed, 17 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 262e32b..3789e89 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -13,6 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
@@ -41,7 +44,7 @@
public boolean checkSiteError(Integer crnNo, boolean pakin) {
BasCrnp crnp = this.selectById(crnNo);
if (Cools.isEmpty(crnp)) {
- log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+// log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
return false;
}
if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
@@ -56,58 +59,14 @@
}
if (pakin) {
- //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
- int staNo = 0;
- switch (crnNo){
- case 1:
- staNo = 123;
- break;
- case 2:
- staNo = 121;
- break;
- case 3:
- staNo = 119;
- break;
- case 4:
- staNo = 117;
- break;
- case 5:
- staNo = 115;
- break;
- case 6:
- staNo = 113;
- break;
- case 7:
- staNo = 111;
- break;
- case 8:
- staNo = 109;
- break;
- case 9:
- staNo = 106;
- break;
- case 10:
- staNo = 105;
- break;
- case 11:
- staNo = 103;
- break;
- case 12:
- staNo = 101;
- break;
- }
- int maxCount = 2;
- BasDevp devp = basDevpService.selectById(staNo);
- if(!Cools.isEmpty(devp)){
- maxCount = devp.getInQty();
- }
-
- int storeCount = wrkMastService.getStoreCount(crnNo);
-
- if(storeCount >= maxCount){
- log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
- return false;
- }
+ //鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-10-23 ADD 鏈疄瑁�
+// int maxCount = 2;
+// int storeCount = wrkMastService.getStoreCount(crnNo);
+//
+// if(storeCount >= maxCount){
+// log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+// return false;
+// }
if ("N".equals(crnp.getInEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
@@ -122,4 +81,9 @@
return true;
}
+
+ @Override
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
+ }
}
--
Gitblit v1.9.1