From 3f22772b5b70f6d0808e7e7c8f16793fb0ea47bb Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 15:07:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 131 +++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 68 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 2354694..7b36b86 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -11,7 +11,6 @@
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Slf4j
@@ -45,63 +44,70 @@
log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
return false;
}
- 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 = 107;
- 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);
-// int maxCount = bufferCount;
-// if(crnNo==1){
-// maxCount = 3;
-// }
-
- if(storeCount >= maxCount){
- log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+ if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
+ log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
+ return false;
+ }
+ if (crnp.getCrnErr() != null) {
+ if (crnp.getCrnErr() != 0) {
+ log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
return false;
}
+ }
+
+ 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;
+// }
if ("N".equals(crnp.getInEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
@@ -113,18 +119,7 @@
return false;
}
}
-// if (crnp.getCrnSts() != null) {
-// if (crnp.getCrnSts() == 10) {
-// log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
-// return false;
-// }
-// }
- if (crnp.getCrnErr() != null) {
- if (crnp.getCrnErr() != 0) {
- log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
- return false;
- }
- }
+
return true;
}
}
--
Gitblit v1.9.1