2025-05-21

src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java

@@ -675,7 +675,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 bomIfsItem.setBomType(data.getBomType());
                 bomIfsItem.setAlternativeNo(data.getAlternativeNo());
                 bomIfsItem.setComponentPart(data.getComponentPart());
-                bomIfsItem.setQtyPerAssembly("byProduct".equals(data.getProductFlag()) ? data.getQtyPerAssembly().negate().toString() : data.getQtyPerAssembly().toString());
+                bomIfsItem.setQtyPerAssembly(data.getQtyPerAssembly().toString());
                 bomIfsItem.setComponentScrap(data.getComponentScrap().toString());
                 bomIfsItem.setIssueType(data.getIssueType());
                 bomIfsItem.setShrinkageFactor(data.getShrinkageFactor().toString());
@@ -758,6 +758,11 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
     @Override
     @Transactional
     public Map<String, Object> updateBomComponent(BomComponentEntity data) {
+        // 修改bom子明细物料
+        if ("byProduct".equals(data.getProductFlag())) {
+            data.setQtyPerAssembly(data.getQtyPerAssembly().negate());
+        }
+        bomManagementMapper.updateBomComponent(data);
         if (dataUrl) {
             // 判断替代是否为正式
             List<BomDetailEntity> bomDetailList = bomManagementMapper.queryBomDetailOfficialFlag(data);
@@ -770,7 +775,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 bomIfsItem.setBomType(data.getBomType());
                 bomIfsItem.setAlternativeNo(data.getAlternativeNo());
                 bomIfsItem.setComponentPart(data.getComponentPart());
-                bomIfsItem.setQtyPerAssembly("byProduct".equals(data.getProductFlag()) ? data.getQtyPerAssembly().negate().toString() : data.getQtyPerAssembly().toString());
+                bomIfsItem.setQtyPerAssembly(data.getQtyPerAssembly().toString());
                 bomIfsItem.setComponentScrap(data.getComponentScrap().toString());
                 bomIfsItem.setIssueType(data.getIssueType());
                 bomIfsItem.setShrinkageFactor(data.getShrinkageFactor().toString());
@@ -786,12 +791,6 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 }
             }
         }
-
-        // 修改bom子明细物料
-        if ("byProduct".equals(data.getProductFlag())) {
-            data.setQtyPerAssembly(data.getQtyPerAssembly().negate());
-        }
-        bomManagementMapper.updateBomComponent(data);
         // 查询bom子明细列表
         BomDetailEntity bomDetail = new BomDetailEntity();
         BeanUtils.copyProperties(data,bomDetail);

src/main/resources/mapper/part/BomManagementMapper.xml

@@ -74,13 +74,13 @@
             and a.part_type in ('Manufactured', 'Manufactured Recipe', 'Purchased')
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -117,13 +117,13 @@
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             and a.part_type <![CDATA[<>]]> 'Purchased (raw)'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -158,13 +158,13 @@
             a.site = #{query.site}
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -2358,10 +2358,10 @@
                 AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}

src/main/resources/mapper/part/RecipeManagementMapper.xml

@@ -77,13 +77,13 @@
             and a.part_type in ('Manufactured', 'Manufactured Recipe', 'Purchased')
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -119,13 +119,13 @@
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             and a.part_type <![CDATA[<>]]> 'Purchased (raw)'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -160,13 +160,13 @@
             a.site = #{query.site}
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -64,13 +64,13 @@
             and a.part_type in ('Manufactured', 'Manufactured Recipe')
             and a.active = 'Y' and a.show_in_query_flag = 'Y'
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -99,13 +99,13 @@
             a.site = #{query.site} and a.active = 'Y' and a.show_in_query_flag = 'Y'
             and a.part_type in ('Manufactured', 'Manufactured Recipe')
             <if test = "query.partNo != null and query.partNo != ''">
-                AND a.part_no = #{query.partNo}
+                AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND a.plm_part_no = #{query.plmPartNo}
+                AND a.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND a.ifs_part_no = #{query.ifsPartNo}
+                AND a.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND a.part_desc like #{query.partDesc}
@@ -699,10 +699,10 @@
                 AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND e.plm_part_no = #{query.plmPartNo}
+                AND e.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND e.ifs_part_no = #{query.ifsPartNo}
+                AND e.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND e.part_desc like #{query.partDesc}

src/main/resources/mapper/part/WorkGuidelinesMapper.xml

@@ -176,10 +176,10 @@
                 AND a.part_no like #{query.partNo}
             </if>
             <if test = "query.plmPartNo != null and query.plmPartNo != ''">
-                AND p.plm_part_no = #{query.plmPartNo}
+                AND p.plm_part_no like #{query.plmPartNo}
             </if>
             <if test = "query.ifsPartNo != null and query.ifsPartNo != ''">
-                AND p.ifs_part_no = #{query.ifsPartNo}
+                AND p.ifs_part_no like #{query.ifsPartNo}
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
                 AND p.part_desc like #{query.partDesc}