From 788f4f217e039a3f2b4982e9d0fc0afb36a483f5 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 07 七月 2025 20:16:35 +0800
Subject: [PATCH] 提交 加工单数据
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
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 53077cd..66ebae3 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) {
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge, String flashback, String compound) {
if (printMerge == null) {
printMerge = "";
}
@@ -325,10 +325,21 @@
//鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
String processName = flowCardMapper.getProcessName(processSub);
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
- itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
+ flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback);
- itemmap.put("detailList", detailList);
+ if (compound == null
+ || "null".equals(compound)
+ || compound.trim().isEmpty()){
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback);
+ itemmap.put("detailList", detailList);
+ }else {//鏈夐渶瑕佸悓鏋剁殑灞�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,compound);
+ itemmap.put("detailList", detailList);
+ }
} else {
if (merge.equals("1") && flowCard.getMerge().equals(1)) {//鍚�
// 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
@@ -341,9 +352,20 @@
List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(),flashback);
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);
- itemmap.put("detailList", detailList);
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
+ flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ 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);
+ itemmap.put("detailList", detailList);
+ }else {//鏈夐渶瑕佸悓鏋剁殑灞�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,compound);
+ itemmap.put("detailList", detailList);
+ }
}
}
--
Gitblit v1.8.0