From 966f21f2b189291b1c0a6d9a147f7c92ada8edb9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 18 Sep 2024 14:26:34 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-18=20RFQ=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/service/impl/BomManagementServiceImpl.java    | 1 +
 .../part/service/impl/RoutingManagementServiceImpl.java        | 2 +-
 src/main/resources/mapper/part/PartInformationMapper.xml       | 3 +--
 src/main/resources/mapper/part/RoutingManagementMapper.xml     | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
index 5461ffa5..598b69cb 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
@@ -514,6 +514,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             detailEntity.setPartNo(data.getPartNo());
             detailEntity.setBomType(data.getBomType());
             detailEntity.setEngChgLevel(data.getEngChgLevel());
+            detailEntity.setStatus("Tentative");
             bomManagementMapper.bomDetailSave(detailEntity);
             // 创建bomComponent
             if (!componentDataList.isEmpty()) {
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
index bc339974..c75977c5 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -519,6 +519,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
             detailEntity.setPartNo(data.getPartNo());
             detailEntity.setRoutingType(data.getRoutingType());
             detailEntity.setRoutingRevision(data.getRoutingRevision());
+            detailEntity.setStatus("Tentative");
             routingManagementMapper.routingDetailSave(detailEntity);
             // 创建routingComponent
             if (!componentDataList.isEmpty()) {
@@ -668,7 +669,6 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         valueData.setPartNo(data.getPartNo());
         List<PartSubPropertiesValueData> partItems = partInformationMapper.getItemModal(valueData);
 
-
         // 获取的商品组的condition
         List<PgPtmConditionEntity> conditionList = routingManagementMapper.getPtmCondition(data.getSite(), data.getBuNo(), part.getOtherGroup1());
         for (PgPtmConditionEntity conditionData : conditionList) {
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 1150eb62..d5925b2a 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -48,8 +48,7 @@
         product_rev,
         invtype,
         code_no,
-        dbo.get_code_desc(site, sourceBu, code_no, 'IP') as codeDesc
-        code_no,
+        dbo.get_code_desc(site, sourceBu, code_no, 'IP') as codeDesc,
         dbo.get_bu_desc(site, sourceBu) as buDesc
         FROM part
         <where>
diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml
index 7f614307..cac50851 100644
--- a/src/main/resources/mapper/part/RoutingManagementMapper.xml
+++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml
@@ -571,7 +571,8 @@
             b.labor_class_no,
             dbo.get_labor_class_desc(a.site, a.bu_no, b.labor_class_no) as laborClassDesc,
             b.setup_labor_class_no,
-            dbo.get_labor_class_desc(a.site, a.bu_no, b.setup_labor_class_no) as setupLaborClassDesc
+            dbo.get_labor_class_desc(a.site, a.bu_no, b.setup_labor_class_no) as setupLaborClassDesc,
+            'Units/Hour' as runTimeCode
         FROM part_group_std_operations as a
         left join standard_routing_operation as b on a.operation_id = b.id
         where a.site = #{site} and a.bu_no = #{buNo} and a.product_group_id = #{productGroupId}