From e35f1e6361aeff0c4f2fef3eea699a1733c13144 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 七月 2025 16:54:07 +0800
Subject: [PATCH] 流程卡打印添加按落架顺序打印
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 5 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 15 +++++++
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 10 ++--
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 11 +++--
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 24 ++++++------
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 20 ++++++++++
6 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 897322f..4206831 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -35,6 +35,7 @@
merges:null,
printFc:null,
flashback:null,
+ landingSequence:null,
compound:null
})
@@ -76,7 +77,7 @@
let flowCardCount = ''
onMounted(() => {
if(props.printProject!=null){
- request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}`).then((res) => {
+ request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
if (res.code == 200) {
load(res.data.data)
} else {
@@ -85,7 +86,7 @@
}
})
}else{
- request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
if (res.code == 200) {
load(res.data.data)
} else {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 782c4ad..4c4a3b3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -68,6 +68,7 @@
merge: null,
printFc:null,
flashback:null,
+ landingSequence:null,
compound:null
})
@@ -81,6 +82,8 @@
//鍊掑彊
let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
//鍚堟灦鎵撳嵃
let compound = ref(null)
@@ -421,6 +424,7 @@
printRow.value.merge = company.flowCardMerge
printRow.value.printFc= printFc
printRow.value.flashback = flashback.value
+ printRow.value.landingSequence=landingSequence.value
printRow.value.compound = compound.value
// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
@@ -711,6 +715,10 @@
function onFlashbackChange(checked) {
flashback.value = checked ? 0 : 1
}
+
+function onlandingSequenceChange(checked) {
+ landingSequence.value = checked ? 0 : 1
+}
</script>
<template>
@@ -816,6 +824,12 @@
>
{{ t('processCard.flashback') }}
</el-checkbox>
+ <el-checkbox
+ :model-value="landingSequence === 0"
+ @change="onlandingSequenceChange"
+ >
+ {{ t('processCard.landingSequence') }}
+ </el-checkbox>
<el-input
v-model="compound"
:placeholder="$t('processCard.printCompound')"
@@ -881,6 +895,7 @@
:printFc="printRow.printFc"
:merges="printRow.merge"
:flashback = "printRow.flashback"
+ :landingSequence = "printRow.landingSequence"
:compound = "printRow.compound"
style="width: 100%;height: 100%"/>
</el-dialog>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 5ec3c33..e9d2fba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -187,22 +187,23 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}/{landingSequence}")
public Result getSelectPrinting(
@PathVariable String printMerge,
@PathVariable String printLike,
@PathVariable String merge,
@PathVariable String flashback,
@PathVariable String compound,
+ @PathVariable String landingSequence,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound));
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
}
@ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")
public Result getSelectPrintProject(
- @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback) {
- return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback));
+ @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
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 ba31fea..ec5ea6a 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
@@ -83,7 +83,7 @@
List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
- List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback);
+ List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback, String landingSequence);
List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
@@ -137,9 +137,9 @@
List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
- List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback);
+ List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback, String landingSequence);
- List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback);
+ List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback, String landingSequence);
List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
@@ -258,7 +258,7 @@
Integer getSumQuantity(String orderId);
- List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound);
+ List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
- List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound);
+ List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
}
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 f009e7d..d5e82fc 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
@@ -296,7 +296,7 @@
}
}
- public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge, String flashback, String compound) {
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge, String flashback, String compound, String landingSequence) {
if (printMerge == null) {
printMerge = "";
}
@@ -334,10 +334,10 @@
if (compound == null
|| "null".equals(compound)
|| compound.trim().isEmpty()){
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,landingSequence);
itemmap.put("detailList", detailList);
}else {//鏈夐渶瑕佸悓鏋剁殑灞�
- List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,compound);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,compound,landingSequence);
itemmap.put("detailList", detailList);
}
} else {
@@ -349,7 +349,7 @@
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
processedKeys.add(uniqueKey);
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(),flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(),flashback,landingSequence);
itemmap.put("detailList", detailList);
} else {
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
@@ -360,10 +360,10 @@
if (compound == null
|| "null".equals(compound)
|| compound.trim().isEmpty()){
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
itemmap.put("detailList", detailList);
}else {//鏈夐渶瑕佸悓鏋剁殑灞�
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,compound);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,compound,landingSequence);
itemmap.put("detailList", detailList);
}
}
@@ -375,12 +375,12 @@
if (printLike.equals("") || printLike.equals("null")) {
itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge, flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
} else {
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), printMerge, flowCard.getProcess(), flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), printMerge, flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
}
}
@@ -420,7 +420,7 @@
return map;
}
- public Map<String, Object> getSelectPrintProject(String printProject, String merge, String flashback) {
+ public Map<String, Object> getSelectPrintProject(String printProject, String merge, String flashback, String landingSequence) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
@@ -445,7 +445,7 @@
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
if (flowCard.getPatchState().equals(0)) {
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
} else {
List<Map<String, Object>> detailList = flowCardMapper.getDetailLists(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber());
@@ -464,11 +464,11 @@
processedKeys.add(uniqueKey);
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(), flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
} else {
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(), flashback);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
}
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 8c32341..f3aca7b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -784,6 +784,10 @@
and position(fc.technology_number in #{technologyNumber})
group by fc.process_id, fc.order_number
<choose>
+ <!-- landingSequence != 1 鏃讹紝浼樺厛鎸� landing_sequence 鍊掑簭 -->
+ <when test="landingSequence != 1">
+ ORDER BY landing_sequence DESC
+ </when>
<!-- flashback = 1 鏃舵搴� -->
<when test="flashback == 1">
ORDER BY
@@ -1473,6 +1477,10 @@
and position(fc.technology_number in #{technologyNumber})
group by fc.process_id, fc.order_number, fc.technology_number
<choose>
+ <!-- landingSequence != 1 鏃讹紝浼樺厛鎸� landing_sequence 鍊掑簭 -->
+ <when test="landingSequence != 1">
+ ORDER BY landing_sequence DESC
+ </when>
<!-- flashback = 1 鏃舵搴� -->
<when test="flashback == 1">
ORDER BY
@@ -1522,6 +1530,10 @@
where fc.process_id = #{processId} and fc.`merge`=1
group by fc.process_id, fc.order_number
<choose>
+ <!-- landingSequence != 1 鏃讹紝浼樺厛鎸� landing_sequence 鍊掑簭 -->
+ <when test="landingSequence != 1">
+ ORDER BY landing_sequence DESC
+ </when>
<!-- flashback = 1 鏃舵搴� -->
<when test="flashback == 1">
ORDER BY
@@ -3209,6 +3221,10 @@
and position(fc.technology_number in #{compound})
group by fc.process_id, fc.order_number
<choose>
+ <!-- landingSequence != 1 鏃讹紝浼樺厛鎸� landing_sequence 鍊掑簭 -->
+ <when test="landingSequence != 1">
+ ORDER BY landing_sequence DESC
+ </when>
<!-- flashback = 1 鏃舵搴� -->
<when test="flashback == 1">
ORDER BY
@@ -3258,6 +3274,10 @@
and position(fc.technology_number in #{compound})
group by fc.process_id, fc.order_number
<choose>
+ <!-- landingSequence != 1 鏃讹紝浼樺厛鎸� landing_sequence 鍊掑簭 -->
+ <when test="landingSequence != 1">
+ ORDER BY landing_sequence DESC
+ </when>
<!-- flashback = 1 鏃舵搴� -->
<when test="flashback == 1">
ORDER BY
--
Gitblit v1.8.0