手动模式

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -608,7 +608,8 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                     BomProcedureProgram item = new BomProcedureProgram();
                     BeanUtil.copyProperties(map, item);
                     item.setProcedureId(bean.getId());
-//                    item.setProcedureTrayGroupId(Long.parseLong(trayGroupMap.get(map.getGroupSort().toString())));
+
+                    item.setToolList(map.getToolList());
                     item.setId(null);
                     return item;
                 }).collect(Collectors.toList());
@@ -617,16 +618,19 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
 
                 //删除刀具
                 bomProcedureToolService.remove(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,bean.getId()));
-                List<BBomProcedureTool> toolList = bean.getToolList();
-                if(programList != null && programList.size() > 0) {
-                    List<BBomProcedureTool> tList = programList.stream().map((map) -> {
-                        BBomProcedureTool item = new BBomProcedureTool();
-                        BeanUtil.copyProperties(map, item);
-                        item.setProcedureId(bean.getId());
-                        item.setId(null);
-                        return item;
-                    }).collect(Collectors.toList());
-                    bomProcedureToolService.saveBatch(toolList);
+                for(BomProcedureProgram procedureProgram:pList){
+                    List<BBomProcedureTool> toolList = procedureProgram.getToolList();
+                    if(toolList != null && toolList.size() > 0) {
+                        List<BBomProcedureTool> tList = toolList.stream().map((m) -> {
+                            BBomProcedureTool t = new BBomProcedureTool();
+                            BeanUtil.copyProperties(m, t);
+                            t.setProcedureId(bean.getId());
+                            t.setId(null);
+                            t.setProgramId(procedureProgram.getId());
+                            return t;
+                        }).collect(Collectors.toList());
+                        bomProcedureToolService.saveBatch(tList);
+                    }
                 }
 
 
@@ -778,7 +782,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
 
         //设置刀具
         List<BBomProcedureTool>toolList = bomProcedureToolService.list(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,bean.getId()));
-        model.setToolList(toolList);
+//        model.setToolList(toolList);
 
         //人工质检
         model.setProcedureTestList(bomProcedureTestService.list(Wraps.<BomProcedureTest>lbQ().eq(BomProcedureTest::getProcedureId,bean.getId())));

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BBomProcedureTool.java

@@ -55,6 +55,12 @@ public class BBomProcedureTool extends Entity<Long> {
     @Excel(name = "工序ID")
     private Long procedureId;
 
+
+    @ApiModelProperty(value = "程序ID")
+    @TableField("program_id")
+    @Excel(name = "程序ID")
+    private Long programId;
+
     /**
      * 设备id
      */

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureProgram.java

@@ -139,6 +139,11 @@ public class BomProcedureProgram extends Entity<Long> {
     private String submittedFileName;
 
 
+    @ApiModelProperty(value="程序")
+    @TableField(exist = false)
+    private List<BBomProcedureTool> toolList;
+
+
     @Builder
     public BomProcedureProgram(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     Long resourceId, Long procedureTrayGroupId, Integer prority, String programType, Float runTime, Long procedureId) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureVersion.java

@@ -260,9 +260,6 @@ public class BomProcedureVersion extends Entity<Long> {
     @TableField(exist = false)
     private List<BomProcedureProgram> programList;
 
-    @ApiModelProperty(value="程序")
-    @TableField(exist = false)
-    private List<BBomProcedureTool> toolList;
 
     @ApiModelProperty(value="人工质检")
     @TableField(exist = false)