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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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..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;
@@ -199,12 +200,18 @@
crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
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.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