From 040c966720e66bfa400181bb26d46ca59ac44e6c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 16 八月 2022 16:07:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 12 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 ac5e058..262e32b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,14 +4,23 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
+
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
@@ -35,7 +44,71 @@
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);
+ return false;
+ }
+
if ("N".equals(crnp.getInEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
return false;
@@ -46,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