From 24f897e83340a4d4b87d681905a708a24e705ebb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 31 八月 2024 10:56:07 +0800
Subject: [PATCH] 按编号打印标签数量修改
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2 ++
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 2 ++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 8 ++++++--
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 1782a78..fe0686d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -173,4 +173,6 @@
List<Map<String, Object>> selectFlowCardMerge(String processId);
Boolean updateFlowCardMerge(String processId);
+
+ Boolean deleteflowCardSort(String orderId, String processId);
}
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 88a3c3a..eae59b5 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
@@ -85,6 +85,8 @@
flowCardMapper.deleteReportingWork(processId);
//鍒犻櫎鍒嗘灦鏄庣粏
flowCardMapper.deleteFlowCardMp(orderId, processId);
+ //鍒犻櫎鎺掑簭琛ㄦ暟鎹�
+ flowCardMapper.deleteflowCardSort(orderId, processId);
//鍒ゆ柇璇ヨ鍗曟祦绋嬪崱鏄惁鍏ㄩ儴鍒犻櫎
Integer flowNumber = flowCardMapper.selectFlowCardCount(orderId);
if (flowNumber == 0) {
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 633f3d3..3f27de0 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1989,7 +1989,7 @@
od.processing_note as processingNote,
width,
height,
- od.quantity,
+ fc.quantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
@@ -2027,7 +2027,7 @@
ogd.technology_number = fc.technology_number
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
- group by fc.process_id, od.order_number, width, height
+ group by od.order_number, width, height
order by fc.process_id
</select>
@@ -2103,4 +2103,8 @@
where fc.process_id = #{processId}
</update>
+ <delete id="deleteflowCardSort">
+ delete from flow_card_sort where process_id = #{processId}
+ </delete>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0