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

@@ -669,7 +669,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationDo = BeanUtil.toBean(apsProcessOperationDo1, ApsProcessOperationDo.class);
                         processOperationDo.setId(processId);
                         processOperationDo.setBlankid(blanckdata.getStr("ID"));
-                        processOperationDo.setNextprocessid(null);
+                        processOperationDo.setNextprocessid("");
+                        processOperationDo.setRemark("");
 
                         //前道工序输出
                         List<PreviousProcessVo> processVo = newProcessIds.stream().filter(pro -> pro.getPreviousstepid().equals(apsProcessOperationDo1.getPreviousprocessid())).collect(Collectors.toList());
@@ -718,6 +719,13 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
                         processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
                         processOperationDo.setLockmark(LOCKMARK_N);
+                        processOperationDo.setRemark("");
+                        processOperationDo.setInputunqualifiedroll(0);
+                        processOperationDo.setCancelroll(0);
+                        processOperationDo.setSecondroll(0);
+                        processOperationDo.setStartingroll(0);
+                        processOperationDo.setReportroll(0);
+                        processOperationDo.setCheckoutroll(0);
 
                         //更新前道工序的后道工序
                         ApsProcessOperationDo aDo = apsProcessOperationDoList.stream().filter(qtr -> processVo.get(0).getProcessId().equals(qtr.getId())).findAny().orElse(null);
@@ -765,7 +773,21 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             processOperationOutMaterDo.setProwidth(wval);
                             BigDecimal lval = changeSize(outMaterDo.getProlength(), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                             processOperationOutMaterDo.setProlength(lval);
-                            processOperationOutMaterDo.setPlanrollnum(processOperationDo.getPlanprocessrall() * apsProcessOperationOutMaterDo.getOutval());
+                            processOperationOutMaterDo.setOutval(1);
+                            processOperationOutMaterDo.setPlanprodrollnum(0);
+                            processOperationOutMaterDo.setPlanstockrollnum(0);
+                            processOperationOutMaterDo.setRollnum(0);
+                            processOperationOutMaterDo.setInspectrollnum(0);
+                            processOperationOutMaterDo.setFailrollnum(0);
+                            processOperationOutMaterDo.setGoodrollnum(0);
+                            processOperationOutMaterDo.setProdoutroll(0);
+                            processOperationOutMaterDo.setMoveoutroll(0);
+                            processOperationOutMaterDo.setStockoutroll(0);
+                            processOperationOutMaterDo.setOutcancelroll(0);
+                            processOperationOutMaterDo.setProdcancelroll(0);
+                            processOperationOutMaterDo.setMovecancelroll(0);
+                            processOperationOutMaterDo.setStockcancelroll(0);
+                            processOperationOutMaterDo.setPlanrollnum(processOperationDo.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));
                             processOperationOutMaterDo.setSinglerollweight(new BigDecimal(singlerollweight));
@@ -863,11 +885,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     processOperationDo.setLeavewaitjobroll(blanckdata.getInt("ROLLNUM"));
                     processOperationDo.setLeavewaitworkroll(blanckdata.getInt("ROLLNUM"));
                     processOperationDo.setBlankid(blanckdata.getStr("ID"));
-                    processOperationDo.setNextprocessid(null);
+                    processOperationDo.setNextprocessid("");
                     processOperationDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
                     processOperationDo.setProcessstatus(SaveConstans.ProductionStatus.TO_BE_SCHEDULED);
                     processOperationDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
                     processOperationDo.setLockmark(LOCKMARK_N);
+                    processOperationDo.setRemark("");
+                    processOperationDo.setInputunqualifiedroll(0);
+                    processOperationDo.setCancelroll(0);
+                    processOperationDo.setSecondroll(0);
+                    processOperationDo.setStartingroll(0);
+                    processOperationDo.setReportroll(0);
+                    processOperationDo.setCheckoutroll(0);
 
 //                    if (!processOperationDo.getProcessway().equals("合并加工")) {
                     BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();
@@ -923,6 +952,20 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationOutMaterDo.setProwidth(wval);
                         BigDecimal lval = changeSize(blanckdata.getBigDecimal("PROLENGTH"), apsProcessOperationOutMaterDo.getLengthrule(), apsProcessOperationOutMaterDo.getLengthchange(), apsProcessOperationOutMaterDo.getProlength());
                         processOperationOutMaterDo.setProlength(lval);
+                        processOperationOutMaterDo.setOutval(1);
+                        processOperationOutMaterDo.setPlanprodrollnum(0);
+                        processOperationOutMaterDo.setPlanstockrollnum(0);
+                        processOperationOutMaterDo.setRollnum(0);
+                        processOperationOutMaterDo.setInspectrollnum(0);
+                        processOperationOutMaterDo.setFailrollnum(0);
+                        processOperationOutMaterDo.setGoodrollnum(0);
+                        processOperationOutMaterDo.setProdoutroll(0);
+                        processOperationOutMaterDo.setMoveoutroll(0);
+                        processOperationOutMaterDo.setStockoutroll(0);
+                        processOperationOutMaterDo.setOutcancelroll(0);
+                        processOperationOutMaterDo.setProdcancelroll(0);
+                        processOperationOutMaterDo.setMovecancelroll(0);
+                        processOperationOutMaterDo.setStockcancelroll(0);
                         processOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
                         processOperationOutMaterDo.setPlanmoverollnum(blanckdata.getInt("ROLLNUM"));
                         //输入单卷重*输出宽度/输入宽度