From ec1e75adab2aacb7b49f06c663944b30de46160b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 九月 2025 12:17:14 +0800
Subject: [PATCH] 提交 报工补片条件修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 1f88a1b..5ae8080 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -1214,26 +1214,29 @@
}
public Boolean updateProcessSv(String processId,String orderNumber, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
+ List<OrderProcessDetail> resultList = new ArrayList<>();
//鑾峰彇宸叉姤宸ュ伐鑹烘祦绋�
String processOk = flowCardMapper.getProcessOk(processId,orderNumber,technologyNumber);
- List<String> okList = Arrays.asList(processOk.split("->"));
- List<String> orderList = Arrays.asList(Orderprocess.split("->"));
+ if (processOk != null && !processOk.isEmpty()){
+ List<String> okList = Arrays.asList(processOk.split("->"));
+ List<String> orderList = Arrays.asList(Orderprocess.split("->"));
- // 鍒ゆ柇 processOk 鐨勬瘡涓伐搴忔槸鍚﹂兘鍖呭惈鍦� orderProcess 涓�
- for (String p : okList) {
- if (!orderList.contains(p)) {
- return false;
+ // 鍒ゆ柇 processOk 鐨勬瘡涓伐搴忔槸鍚﹂兘鍖呭惈鍦� orderProcess 涓�
+ for (String p : okList) {
+ if (!orderList.contains(p)) {
+ return false;
+ }
}
- }
- List<OrderProcessDetail> resultList = new ArrayList<>();
- for (String process : okList) {
- List<OrderProcessDetail> details =
- flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);
- if (details != null && !details.isEmpty()) {
- resultList.addAll(details);
+ for (String process : okList) {
+ List<OrderProcessDetail> details =
+ flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);
+
+ if (details != null && !details.isEmpty()) {
+ resultList.addAll(details);
+ }
}
}
--
Gitblit v1.8.0