From d7034f9fba72df076850e2f11e79b8a6b0488834 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 06 八月 2025 14:35:16 +0800
Subject: [PATCH] 根据最新需求实现创建工程时根据流程卡号和层号分配架号
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 7 ++++++-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 3 ++-
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 16 +++++++++++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index fda3062..a11c982 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -22,7 +22,6 @@
List<Map<String, Object>> analogComputationOptimization(String projectNo);
- // todo 妯℃嫙璁＄畻杩欏潡鍎跨殑rackNo涓虹‖缂栫爜锛屽悗缁渶瑕佹敼
List<Map<String, Object>> computeAndOptimization(String projectNo);
List<Map<String, Object>> getOptimizeDetail(String projectNo);
@@ -185,4 +184,6 @@
List<Map<String, Object>> getProcessCardMpThirdParty(String projectNo);
List<Map<String, Object>> getProjectByProjectNoSv(String projectNo);
+
+ void updateFlowCardRack(String processId, String technologyNumber, int rackValue);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 42d0dc3..f6e1d5e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -590,11 +590,25 @@
if(projectType.equals("2")){
deleteProject(projectId,2);
}
+
+ // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
+ Map<String, Integer> rackMap = new HashMap<>();
+ int rackCounter = 1;
+
for (FlowCard flowCard : flowCardList) {
+ // 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
+ String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
+ if (!rackMap.containsKey(key)) {
+ rackMap.put(key, rackCounter++);
+ }
+ int rackValue = rackMap.get(key);
+
if(flowCard.getPatchState().equals(0)){
state1=1;
//缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
- Boolean a=glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ // 鏇存柊娴佺▼鍗＄殑rack瀛楁
+ glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
sumArea = sumArea.add(BigDecimal.valueOf(area));
sumQuantity +=flowCard.getQuantity();
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index c75a554..81be6d1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -310,7 +310,7 @@
<!--浼樺寲鏌ヨ-->
<select id="computeAndOptimization">
SELECT
- 1 AS rackNo,
+ c.rack AS rackNo,
h.layout_id as layoutId,
h.width AS width,
h.height AS height,
@@ -1436,6 +1436,11 @@
UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
where config_type=#{type} and creater=#{username}
</update>
+ <update id="updateFlowCardRack">
+ UPDATE pp.flow_card
+ SET rack = #{rackValue}
+ WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
+ </update>
<select id="simulatedTypesettingUsingOpt">
SELECT
--
Gitblit v1.8.0