From 7e68f81b38116bba40e70620c563168fcde66a37 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 05 十二月 2025 09:18:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 26529f7..682b00e 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;
@@ -138,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("璇疯緭鍏ユ祴璇曞嚭搴撶珯");
@@ -198,13 +199,17 @@
}
crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
crnProtocol.setLocMastDemoListF(basCrnpParam.getLocMastDemoListF());
- crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
+ ArrayList<String[]> locS = LocFCSUtils.getLocS(basCrnpParam.getLocMastDemoListF());
+
+// crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
ArrayList<String> locMastDemoList = new ArrayList<>();
locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
- locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
+// locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
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