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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 2dbf63d..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
@@ -326,9 +326,9 @@
String processName = flowCardMapper.getProcessName(processSub);
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
- String.valueOf(compound != null
- ? compound //鍚屾灦灞�
- : flowCard.getTechnologyNumber()),//姝ｅ父灞�
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
if (compound == null
@@ -353,9 +353,9 @@
itemmap.put("detailList", detailList);
} else {
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
- String.valueOf(flashback != null
- ? compound //鍚屾灦灞�
- : flowCard.getTechnologyNumber()),//姝ｅ父灞�
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
if (compound == null
|| "null".equals(compound)
--
Gitblit v1.8.0