From 2c1d32f4371145dc8636864fb268f316a57e77cb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 10:29:17 +0800
Subject: [PATCH] MQTT出库订单补充
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 76 ++++++++++----------------------------
1 files changed, 20 insertions(+), 56 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..fb26ee9 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -22,86 +22,46 @@
@Autowired
private BasDevpService basDevpService;
+ /**
+ * 妫�鏌ュ爢鍨涙満鍩虹鍙敤鐘舵�侊紝涓嶆弧瓒虫椂鐩存帴鎶涘嚭涓氬姟寮傚父銆�
+ */
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
BasCrnp crnp = this.selectById(crnId);
if (Cools.isEmpty(crnp)) {
throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
}
- if ("N".equals(crnp.getInEnable())) {
+ if (!isEnabled(crnp.getInEnable())) {
throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
}
- if ("N".equals(crnp.getOutEnable())) {
+ if (!isEnabled(crnp.getOutEnable())) {
throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
}
return crnp;
}
+ /**
+ * 缁熶竴鏍￠獙鍫嗗灈鏈烘槸鍚﹀彲鍙備笌鍏ュ簱/鍑哄簱鍒嗛厤銆�
+ */
@Override
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){
+ if (crnp.getCrnSts() == 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 (crnp.getCrnErr() != null && 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;
-// }
+ //鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-10-23 ADD 鏈疄瑁�
// int maxCount = 2;
-// BasDevp devp = basDevpService.selectById(staNo);
-// if(!Cools.isEmpty(devp)){
-// maxCount = devp.getInQty();
-// }
-//
// int storeCount = wrkMastService.getStoreCount(crnNo);
//
// if(storeCount >= maxCount){
@@ -109,12 +69,12 @@
// return false;
// }
- if ("N".equals(crnp.getInEnable())) {
+ if (!isEnabled(crnp.getInEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
return false;
}
} else {
- if ("N".equals(crnp.getOutEnable())) {
+ if (!isEnabled(crnp.getOutEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
return false;
}
@@ -122,4 +82,8 @@
return true;
}
+
+ private boolean isEnabled(String flag) {
+ return "Y".equalsIgnoreCase(flag);
+ }
}
--
Gitblit v1.9.1