From ec976e88774d138236c09273705cb948a6e7a25f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 23 五月 2025 16:59:42 +0800
Subject: [PATCH] 对复合工序添加的类型，进行重新的逻辑处理
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 15e72fb..b0570b2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -218,6 +218,8 @@
public Map<String, Object> SelectProcessSv(String userId) {
Map<String, Object> map = new HashMap<>();
String process = reportingWorkMapper.selectUserProcess(userId);
+ //宸ュ簭鍒楄〃
+ List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
if (process==null) {
map.put("process", reportingWorkMapper.SelectProcessMp());
}
@@ -230,7 +232,7 @@
map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
}
}
-
+ map.put("processNameList", processNameList);
return map;
}
@@ -404,7 +406,7 @@
//鑾峰彇鎶ュ伐宸ュ簭鏄惁涓哄鍚堝伐绋�
String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);
//鍚堢墖宸ュ簭
-if (laminating.equals("stepA") || laminating.equals("stepB")){
+if (laminating.indexOf("step")!=-1){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
--
Gitblit v1.8.0