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 | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 682b00e..e2bdf11 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -139,21 +139,21 @@
}
}
}
-// 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("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�");
-// }
-// }
-// }
+ 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("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�");
+ }
+ }
+ }
if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){
return R.error("璇疯緭鍏ユ祴璇曞嚭搴撶珯").add("璇疯緭鍏ユ祴璇曞嚭搴撶珯");
@@ -199,12 +199,14 @@
}
crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
crnProtocol.setLocMastDemoListF(basCrnpParam.getLocMastDemoListF());
- ArrayList<String[]> locS = LocFCSUtils.getLocS(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);
-// crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
ArrayList<String> locMastDemoList = new ArrayList<>();
locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
-// locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
+ locMastDemoList.addAll(basCrnpParam.getLocMastDemoListE());
crnProtocol.setLocMastDemoList(locMastDemoList);
crnProtocol.setLocMastDemoListSign(locS);
crnProtocol.setStaOutDemo(basCrnpParam.getStaOutDemo());
--
Gitblit v1.9.1