From b6c0ffd5380fb4c9b7324298bade1bc0210b565d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 05 十月 2025 10:32:08 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 112 +++++++++++++++++---------------------------------------
1 files changed, 34 insertions(+), 78 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 7b36b86..e2e1fce 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -39,86 +39,42 @@
@Override
public boolean checkSiteError(Integer crnNo, boolean pakin) {
- BasCrnp crnp = this.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
- return false;
- }
- 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);
+// BasCrnp crnp = this.selectById(crnNo);
+// if (Cools.isEmpty(crnp)) {
+//// log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+// return false;
+// }
+// if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
+// log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
+// return false;
+// }
+// if (crnp.getCrnErr() != null) {
+// if (crnp.getCrnErr() != 0 && crnp.getCrnErr() != 10 && crnp.getCrnErr() != 6) {
+// log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
// return false;
// }
-
- if ("N".equals(crnp.getInEnable())) {
- log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
- return false;
- }
- } else {
- if ("N".equals(crnp.getOutEnable())) {
- log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
- return false;
- }
- }
+// }
+//
+// if (pakin) {
+// //鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝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);
+// return false;
+// }
+// } else {
+// if ("N".equals(crnp.getOutEnable())) {
+// log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
+// return false;
+// }
+// }
return true;
}
--
Gitblit v1.9.1