From 07c72dbfe2fdf6dd5fb7232977f02fe49ac95d60 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 08 八月 2025 16:14:45 +0800
Subject: [PATCH] 明细分架打印界面打印半成品标签可自定义打印数量
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 2 +-
north-glass-erp/northglass-erp/src/lang/zh.js | 2 +-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 4 ++--
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 8 ++++----
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index b30c6ce..6ed36cf 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -507,7 +507,7 @@
mergePrinting:'鍚堝苟鎵撳嵃',
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
- finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
+ finishedProductPrinting2:'鎵撳嵃',
editablePrinting:'鏍囩鑷畾涔夋墦鍗�',
invertSelection:'鍙嶉��',
sortSummary:'鎺掑簭姹囨��',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index 9f5d607..02b85e2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -854,7 +854,7 @@
/>
</el-select>
- <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
+ <el-select v-model="stateValue" v-show="false" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
filterable style="width: 140px">
<el-option
v-for="item in stateOptions"
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 ad8695a..ecedcc1 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
@@ -159,7 +159,7 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
List<Map<String, String>> selectPrintNotMp(String orderId);
@@ -262,7 +262,7 @@
List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
- List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
Integer getLayoutStatus(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 0cd83ec..de25751 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
@@ -690,14 +690,14 @@
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
flowCard.getProcess(),
- flowCard.getOrderNumber()
+ flowCard.getOrderNumber(), flowCard.getPrintQuantity()
));
} else {
itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
- flowCard.getProcess()
+ flowCard.getProcess(), flowCard.getPrintQuantity()
));
}
list.add(itemmap);
@@ -735,7 +735,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
@@ -952,7 +952,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
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 6994629..acee6c0 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1982,7 +1982,7 @@
od.processing_note as processingNote,
ogd.child_width as width,
ogd.child_height as height,
- fc.quantity,
+ #{printQuantity} as quantity,
CONCAT(ogd.child_width , ' X ', ogd.child_height ,' = ',fc.quantity ) as size,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
@@ -3418,7 +3418,7 @@
od.processing_note as processingNote,
ogd.child_width as width,
ogd.child_height as height,
- fc.quantity,
+ #{printQuantity} as quantity,
CONCAT(ogd.child_width , ' X ', ogd.child_height ,' = ',fc.quantity ) as size,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
--
Gitblit v1.8.0