Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -324,6 +324,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                             apsProcessOperationOutMaterDo.setProlength(lval);
                             apsProcessOperationOutMaterDo.setOutval(1);
+                            apsProcessOperationOutMaterDo.setSplittrainno(1);
                             apsProcessOperationOutMaterDo.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall());
                             //输入单卷重*输出宽度/输入宽度
                             String singlerollweight = df.format(outMaterDo.getSinglerollweight().multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(outMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : outMaterDo.getProwidth(), 3, BigDecimal.ROUND_HALF_UP));
@@ -497,6 +498,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                         apsProcessOperationOutMaterDo.setProlength(lval);
                         apsProcessOperationOutMaterDo.setOutval(1);
+                        apsProcessOperationOutMaterDo.setSplittrainno(1);
                         apsProcessOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
                         apsProcessOperationOutMaterDo.setPlanmoverollnum(blanckdata.getInt("ROLLNUM"));
                         //输入单卷重*输出宽度/输入宽度
@@ -807,6 +809,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                             processOperationOutMaterDo.setProlength(lval);
                             processOperationOutMaterDo.setOutval(1);
+                            processOperationOutMaterDo.setSplittrainno(1);
                             processOperationOutMaterDo.setPlanprodrollnum(0);
                             processOperationOutMaterDo.setPlanstockrollnum(0);
                             processOperationOutMaterDo.setRollnum(0);
@@ -1004,6 +1007,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                         processOperationOutMaterDo.setProlength(lval);
                         processOperationOutMaterDo.setOutval(1);
+                        processOperationOutMaterDo.setSplittrainno(1);
                         processOperationOutMaterDo.setPlanprodrollnum(0);
                         processOperationOutMaterDo.setPlanstockrollnum(0);
                         processOperationOutMaterDo.setRollnum(0);
@@ -1042,17 +1046,17 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList1);
                     newProcessIds.add(previousProcessVo);
 
-                    //本道工序的可选设备
-                    List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
-                    for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
-                        ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
-                        processOperationEquDo.setId(SecurityUtil.getUUID());
-                        processOperationEquDo.setMainid(processId);
-                        processOperationEquDo.setBlankid(blanckdata.getStr("ID"));
-                        apsProcessOperationEquDoList.add(processOperationEquDo);
-                    }
-
                     if (hasFirst) {
+                        //本道工序的可选设备
+                        List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
+                        for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
+                            ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
+                            processOperationEquDo.setId(SecurityUtil.getUUID());
+                            processOperationEquDo.setMainid(processId);
+                            processOperationEquDo.setBlankid(blanckdata.getStr("ID"));
+                            apsProcessOperationEquDoList.add(processOperationEquDo);
+                        }
+
                         //本道工序思维导图
                         List<SysMindMappingDo> sysMindMappingDos1 = sysMindMappingDos.stream().filter(mind -> mind.getId().equals(apsProcessOperationDo.getId())).collect(Collectors.toList());
                         SysMindMappingDo sysMindMappingDo1 = sysMindMappingDos1.get(0);

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationOutMaterDo.java

@@ -328,6 +328,11 @@ public class ApsProcessOperationOutMaterDo extends BaseDo implements Serializabl
      */
     private Integer stockleaveoutroll;
 
+    /**
+     * 分切车次
+     */
+    private Integer splittrainno;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationOutMaterHistoryDo.java

@@ -327,6 +327,11 @@ public class ApsProcessOperationOutMaterHistoryDo extends BaseDo implements Seri
      */
     private Integer stockleaveoutroll;
 
+    /**
+     * 分切车次
+     */
+    private Integer splittrainno;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }