2025-07-17

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -1539,7 +1539,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 if (!RoutingDetailEntity.isEmpty()) {
                     RoutingDetailEntity routing = RoutingDetailEntity.get(0);
                     technicalSpecificationMapper.deleteBmRouting(paramData.getSite(), paramData.getDocNo());
-                    technicalSpecificationMapper.saveBmRouting(paramData.getSite(), paramData.getDocNo(), routing.getPartNo(), routing.getRoutingRevision(), routing.getRoutingType(), routing.getAlternativeNo());
+                    technicalSpecificationMapper.saveBmRouting(paramData.getSite(), paramData.getDocNo(), routing.getPartNo(), routing.getRoutingRevision(), routing.getRoutingType(), routing.getAlternativeNo(), paramData.getUserName());
                 }
             }
 

src/main/java/com/spring/modules/part/vo/BomComponentVo.java

@@ -58,4 +58,8 @@ public class BomComponentVo extends BomComponentEntity {
     private String compBomType;
 
     private String compAlternativeNo;
+
+    private String codeNo;
+
+    private Integer sortSeqNo;
 }

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -1248,7 +1248,7 @@ public interface TechnicalSpecificationMapper {
 
 
     void saveBmRouting(@Param("site") String site, @Param("codeNo") String docNo, @Param("partNo") String partNo, @Param("routingRevision") Integer routingRevision,
-                       @Param("routingType") String routingType, @Param("alternativeNo") String alternativeNo);
+                       @Param("routingType") String routingType, @Param("alternativeNo") String alternativeNo, @Param("createBy") String createBy);
 
     List<RoutingComponentVo> selectBmRouting(@Param("site") String site, @Param("codeNo") String codeNo);
 

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -546,7 +546,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         List<BomComponentVo> list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo());
         //List<BomComponentVo> list = bomManagementMapper.queryBomComponent(bomDetailEntity.get(0));
         map.put("rows", list);
-        map.put("row", list.get(0));
+        if (list.isEmpty()) {
+            map.put("row", new BomComponentVo());
+        } else {
+            map.put("row", list.get(0));
+        }
         return map;
     }
 
@@ -556,6 +560,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         params.add(codeNo);
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params);
 
+        if (resultList.isEmpty()) {
+            return new ArrayList<>();
+        }
+
         String code = String.valueOf(resultList.get(0).get("code"));
         if ("400".equalsIgnoreCase(code)) {
             String msg = String.valueOf(resultList.get(0).get("message"));
@@ -566,6 +574,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
                 .map(a -> {
                     BomComponentVo bomComponentVo = new BomComponentVo();
                     bomComponentVo.setSite(String.valueOf(a.get("site")));
+                    bomComponentVo.setCodeNo(codeNo);
                     bomComponentVo.setPartNo(String.valueOf(a.get("part_no")));
                     bomComponentVo.setEngChgLevel(Integer.valueOf(String.valueOf(a.get("eng_chg_level"))));
                     bomComponentVo.setBomType(String.valueOf(a.get("bom_type")));
@@ -2110,18 +2119,6 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     @Override
     @Transactional
     public void bmStatusToFinish(PlmTechnicalSpecificationSheetData data) {
-//        // 将状态改为"已完成"
-//        data.setStatus("已完成");
-//        // 更新单据状态和节点
-//        technicalSpecificationMapper.updateStatus(data);
-//        // 2025-05-28 归档操作要更改step_id = NULL
-//        data.setStepId(null);
-//        technicalSpecificationMapper.updateBMStepId(data);
-        // 2025-07-08 点击归档后将stage改为Mass Production 合并上述修改
-        data.setStatus("已完成");
-        data.setStepId(null);
-        data.setStage("Mass Production");
-        technicalSpecificationMapper.updateBMInfo(data);
 
         // 2025-07-17 修改技术参数卡的状态为已完成后，重新获取bom和工艺路线
         List<BomComponentVo> bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo());
@@ -2138,9 +2135,15 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         if (!RoutingDetailEntity.isEmpty()) {
             RoutingDetailEntity routing = RoutingDetailEntity.get(0);
             technicalSpecificationMapper.deleteBmRouting(data.getSite(), data.getCodeNo());
-            technicalSpecificationMapper.saveBmRouting(data.getSite(), data.getCodeNo(), routing.getPartNo(), routing.getRoutingRevision(), routing.getRoutingType(), routing.getAlternativeNo());
+            technicalSpecificationMapper.saveBmRouting(data.getSite(), data.getCodeNo(), routing.getPartNo(), routing.getRoutingRevision(), routing.getRoutingType(), routing.getAlternativeNo(), data.getUsername());
         }
 
+        // 2025-07-08 点击归档后将stage改为Mass Production 合并上述修改
+        data.setStatus("已完成");
+        data.setStepId(null);
+        data.setStage("Mass Production");
+        technicalSpecificationMapper.updateBMInfo(data);
+
     }
 
     @Override

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -3105,7 +3105,6 @@
         (site, code_no, part_no, routing_revision, routing_type, alternative_no, operation_no, efficiency_factor, mach_run_factor, mach_setup_time,
         run_time_code, labor_run_factor, labor_setup_time, crew_size, setup_crew_size, outside_op_item, machine_no, work_center_no, labor_class_no,
         setup_labor_class_no, overlap, note_text, create_date, create_by, operation_name)
-        values
         select
             site, #{codeNo}, part_no, routing_revision, routing_type, alternative_no, operation_no, efficiency_factor, mach_run_factor, mach_setup_time,
             run_time_code, labor_run_factor, labor_setup_time, crew_size, setup_crew_size, outside_op_item, machine_no, work_center_no, labor_class_no,