From 979f2505861b77b8702604739486b62f1e339e76 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:44:11 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 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 20287f1..e2e1fce 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,12 +4,13 @@
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Slf4j
@@ -18,9 +19,8 @@
@Autowired
private WrkMastService wrkMastService;
-
- @Value("${store.bufferCount}")
- private int bufferCount;
+ @Autowired
+ private BasDevpService basDevpService;
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
@@ -39,43 +39,43 @@
@Override
public boolean checkSiteError(Integer crnNo, boolean pakin) {
- BasCrnp crnp = this.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
- return false;
- }
- if (pakin) {
- //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
- int storeCount = wrkMastService.getStoreCount(crnNo);
-// int maxCount = 2;
-
- if(storeCount >= bufferCount){
- 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;
- }
- }
-// if (crnp.getCrnSts() != null) {
-// if (crnp.getCrnSts() == 10) {
-// log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", 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 (crnp.getCrnErr() != null) {
- if (crnp.getCrnErr() != 0) {
- log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
- 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