From 538ce7e95297953686db099cacd63e76d2d83154 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期一, 08 十二月 2025 09:24:11 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 8be3d09..e2bdf11 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -15,6 +15,7 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.utils.CodeDetectionUtil;
+import com.zy.asrs.utils.LocFCSUtils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.CrnErrCache;
@@ -121,20 +122,35 @@
if (Cools.isEmpty(basCrnpParam.getLocMastDemoCount()) || basCrnpParam.getLocMastDemoCount()<1){
- return R.error("璇疯緭鍏ユ祴璇曞簱浣嶆暟閲�").add("璇疯緭鍏ユ祴璇曞簱浣嶆暟閲�");
+ return R.error("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶆暟閲�").add("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶆暟閲�");
}
- if (Cools.isEmpty(basCrnpParam.getLocMastDemo())){
- return R.error("璇疯緭鍏ユ祴璇曞簱浣嶅垪琛�").add("璇疯緭鍏ユ祴璇曞簱浣嶅垪琛�");
+ if (Cools.isEmpty(basCrnpParam.getLocMastDemoF())){
+ return R.error("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶅垪琛�").add("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶅垪琛�");
} else {
- String[] split = basCrnpParam.getLocMastDemo().split(";");
+ String[] split = basCrnpParam.getLocMastDemoF().split(";");
if (split.length!=basCrnpParam.getLocMastDemoCount()){
- return R.error("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
+ return R.error("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
}
- basCrnpParam.setLocMastDemoList(new ArrayList<>(Arrays.asList(split)));
- for (String locNo : basCrnpParam.getLocMastDemoList()){
+ basCrnpParam.setLocMastDemoListF(new ArrayList<>(Arrays.asList(split)));
+ for (String locNo : basCrnpParam.getLocMastDemoListF()){
boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
if (!locNoDetection){
- return R.error("杈撳叆娴嬭瘯搴撲綅寮傚父").add("杈撳叆娴嬭瘯搴撲綅寮傚父");
+ return R.error("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅寮傚父").add("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅寮傚父");
+ }
+ }
+ }
+ if (Cools.isEmpty(basCrnpParam.getLocMastDemoE())){
+ return R.error("璇疯緭鍏ユ祴璇曠┖搴撲綅鍒楄〃").add("璇疯緭鍏ユ祴璇曠┖搴撲綅鍒楄〃");
+ } else {
+ String[] split = basCrnpParam.getLocMastDemoE().split(";");
+ if (split.length!=basCrnpParam.getLocMastDemoCount()){
+ return R.error("杈撳叆娴嬭瘯绌哄簱浣嶅垪琛ㄦ暟閲忎笉鍖归厤").add("杈撳叆娴嬭瘯绌哄簱浣嶅垪琛ㄦ暟閲忎笉鍖归厤");
+ }
+ basCrnpParam.setLocMastDemoListE(new ArrayList<>(Arrays.asList(split)));
+ for (String locNo : basCrnpParam.getLocMastDemoListE()){
+ boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
+ if (!locNoDetection){
+ return R.error("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�").add("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�");
}
}
}
@@ -182,9 +198,20 @@
}
}
crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
- crnProtocol.setLocMastDemoList(basCrnpParam.getLocMastDemoList());
+ crnProtocol.setLocMastDemoListF(basCrnpParam.getLocMastDemoListF());
+ crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
+ ArrayList<String[]> locSF = LocFCSUtils.getLocS(basCrnpParam.getLocMastDemoListF());
+ ArrayList<String[]> locSE = LocFCSUtils.getLocS(basCrnpParam.getLocMastDemoListE());
+ ArrayList<String[]> locS = LocFCSUtils.updateLocSInPlace(locSF,locSE);
+
+ ArrayList<String> locMastDemoList = new ArrayList<>();
+ locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
+ locMastDemoList.addAll(basCrnpParam.getLocMastDemoListE());
+ crnProtocol.setLocMastDemoList(locMastDemoList);
+ crnProtocol.setLocMastDemoListSign(locS);
crnProtocol.setStaOutDemo(basCrnpParam.getStaOutDemo());
crnProtocol.setStaIntDemo(basCrnpParam.getStaIntDemo());
+ crnProtocol.setSignIntOut(false);
}
basCrnp.setHpMk(basCrnpParam.getHpMk());
basCrnp.setModiUser(getUserId());
--
Gitblit v1.9.1