From 048e7aac0c5411f932083aa33b9b22b28e64ec97 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Dec 2024 13:08:01 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-24=20=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/BomManagementServiceImpl.java       | 8 ++++++--
 src/main/resources/mapper/part/BomManagementMapper.xml    | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
index 4c399077..a45c4e4c 100644
--- a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
@@ -682,7 +682,9 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 bomIfsItem.setLineItemNo(data.getLineItemNo().toString());
                 bomIfsItem.setLineSequence(data.getLineSequence().toString());
                 bomIfsItem.setNoteText(data.getNoteText());
-                bomIfsItem.setOperationNo(data.getOperationNo().toString());
+                bomIfsItem.setOperationNo(data.getOperationNo() == null ? "" : data.getOperationNo().toString());
+                bomIfsItem.setConsumptionItem(data.getConsumptionItem());
+                bomIfsItem.setProductFlag(data.getProductFlag());
                 Map<String, String> getBomComponentResponse = bomServiceBean.getBomItems(srv, bomIfsItem);
                 if (!"200".equals(getBomComponentResponse.get("resultCode"))) { // 新增
                     LinkedList<BomIfsItem> bomIfsItems = new LinkedList<>();
@@ -775,7 +777,9 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 bomIfsItem.setLineItemNo(data.getLineItemNo().toString());
                 bomIfsItem.setLineSequence(data.getLineSequence().toString());
                 bomIfsItem.setNoteText(data.getNoteText());
-                bomIfsItem.setOperationNo(data.getOperationNo().toString());
+                bomIfsItem.setOperationNo(data.getOperationNo() == null ? "" : data.getOperationNo().toString());
+                bomIfsItem.setConsumptionItem(data.getConsumptionItem());
+                bomIfsItem.setProductFlag(data.getProductFlag());
                 Map<String, String> updateBomComponentResponse = bomServiceBean.modifyBomItem(srv, bomIfsItem);
                 if (!"200".equals(updateBomComponentResponse.get("resultCode"))) {
                     throw new RuntimeException("IFS BomItem修改异常：" + updateBomComponentResponse.get("resultMsg"));
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 9496b813..ab0568bd 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -603,7 +603,8 @@
             shrinkage_factor,
             note_text,
             consumption_item,
-            operation_no
+            operation_no,
+            case when qty_per_assembly <![CDATA[<]]> 0 then 'byProduct' else '' end as productFlag
         FROM plm_bom_component
         WHERE site = #{site} and part_no = #{partNo} and eng_chg_level = #{engChgLevel} and bom_type = #{bomType} and alternative_no = #{alternativeNo}
     </select>