退火超出装炉量bug修改

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -235,26 +235,36 @@ public class ApsServiceImpl implements ApsService {
                                 runTime.setTotalVolumeWidth(runTime.getTotalVolumeWidth().add(equipmentRunTime.getTotalVolumeWidth()));
                                 runTime.setTotalSinglerollweight(runTime.getTotalSinglerollweight().add(equipmentRunTime.getTotalSinglerollweight()));
                                 runTime.setPcNum(runTime.getPcNum()+equipmentRunTime.getPcNum());
+                                // 最小值最大值初始化
+                                equipmentRunTime.setMinVolumeWidth(equipmentRunTime.getMinVolumeWidth() == null ? equipmentRunTime.getTotalVolumeWidth() : equipmentRunTime.getMinVolumeWidth());
+                                equipmentRunTime.setMaxVolumeWidth(equipmentRunTime.getMaxVolumeWidth() == null ? equipmentRunTime.getTotalVolumeWidth() : equipmentRunTime.getMaxVolumeWidth());
+
+                                equipmentRunTime.setMinSinglerollweight(equipmentRunTime.getMinSinglerollweight() == null ? equipmentRunTime.getTotalSinglerollweight() : equipmentRunTime.getMinSinglerollweight());
+                                equipmentRunTime.setMaxSinglerollweight(equipmentRunTime.getMaxSinglerollweight() == null ? equipmentRunTime.getTotalSinglerollweight() : equipmentRunTime.getMaxSinglerollweight());
+
+                                equipmentRunTime.setMinThickness(equipmentRunTime.getMinThickness() == null ? equipmentRunTime.getTotalThickness() : equipmentRunTime.getMinThickness());
+                                equipmentRunTime.setMaxThickness(equipmentRunTime.getMaxThickness() == null ? equipmentRunTime.getTotalThickness() : equipmentRunTime.getMaxThickness());
+
                                 // 最大、最小宽度
-                                if (equipmentRunTime.getTotalVolumeWidth().compareTo(runTime.getMinVolumeWidth()) < 0) {
-                                    runTime.setMinVolumeWidth(equipmentRunTime.getTotalVolumeWidth());
+                                if (equipmentRunTime.getMinVolumeWidth().compareTo(runTime.getMinVolumeWidth()) < 0) {
+                                    runTime.setMinVolumeWidth(equipmentRunTime.getMinVolumeWidth());
                                 }
-                                if (equipmentRunTime.getTotalVolumeWidth().compareTo(runTime.getMaxVolumeWidth()) > 0) {
-                                    runTime.setMaxVolumeWidth(equipmentRunTime.getTotalVolumeWidth());
+                                if (equipmentRunTime.getMaxVolumeWidth().compareTo(runTime.getMaxVolumeWidth()) > 0) {
+                                    runTime.setMaxVolumeWidth(equipmentRunTime.getMaxVolumeWidth());
                                 }
                                 // 最大、最小厚度
-                                if (equipmentRunTime.getTotalThickness().compareTo(runTime.getMinThickness()) < 0) {
-                                    runTime.setMinThickness(equipmentRunTime.getTotalThickness());
+                                if (equipmentRunTime.getMinThickness().compareTo(runTime.getMinThickness()) < 0) {
+                                    runTime.setMinThickness(equipmentRunTime.getMinThickness());
                                 }
-                                if (equipmentRunTime.getTotalThickness().compareTo(runTime.getMaxThickness()) > 0) {
-                                    runTime.setMaxThickness(equipmentRunTime.getTotalThickness());
+                                if (equipmentRunTime.getMaxThickness().compareTo(runTime.getMaxThickness()) > 0) {
+                                    runTime.setMaxThickness(equipmentRunTime.getMaxThickness());
                                 }
                                 // 最大、最小重量
-                                if (equipmentRunTime.getTotalSinglerollweight().compareTo(runTime.getMinSinglerollweight()) < 0) {
-                                    runTime.setMinSinglerollweight(equipmentRunTime.getTotalSinglerollweight());
+                                if (equipmentRunTime.getMinSinglerollweight().compareTo(runTime.getMinSinglerollweight()) < 0) {
+                                    runTime.setMinSinglerollweight(equipmentRunTime.getMinSinglerollweight());
                                 }
-                                if (equipmentRunTime.getTotalSinglerollweight().compareTo(runTime.getMaxSinglerollweight()) > 0) {
-                                    runTime.setMaxSinglerollweight(equipmentRunTime.getTotalSinglerollweight());
+                                if (equipmentRunTime.getMaxSinglerollweight().compareTo(runTime.getMaxSinglerollweight()) > 0) {
+                                    runTime.setMaxSinglerollweight(equipmentRunTime.getMaxSinglerollweight());
                                 }
                                 runTime.getMinThGroupNames().addAll(minThGroupNames);
                                 isMerged = true;

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -52,7 +52,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
         List<String> blankids = new ArrayList<>();
-        blankids.add("97f8833a143e4d94a3543c1c0495f6e7");
+        blankids.add("3d7f12ce4db247df863ea39c84ad6805");
 //        blankids.add("2f3f48a1c3c74c0481ba06df521fe0d7");
 //        blankids.add("75736c469b1a42568af980260c0689a6");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");
@@ -924,9 +924,19 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 pper.setSeriesProduceMark(productionProcesses.getSeriesProduceMark());
                 pper.setProcessType(productionProcesses.getProcessType());
                 pper.setVolumeMetal(productionProcesses.getVolumeMetal());
-                pper.setTotalVolumeWidth(productionProcesses.getVolumeWidth());
-                pper.setTotalSinglerollweight(productionProcesses.getSinglerollweight());
+                if("小卷成退,小卷包装".contains(productionProcesses.getProcessType())){
+                    pper.setTotalVolumeWidth(productionProcesses.getVolumeWidth());
+                }else{
+                    pper.setTotalVolumeWidth(productionProcesses.getVolumeWidth().multiply(new BigDecimal(productionProcesses.getOpeProducePcNum())));
+                }
+                pper.setTotalSinglerollweight(productionProcesses.getTotalSinglerollweight());
                 pper.setTotalThickness(productionProcesses.getVolumeThickness());
+                pper.setMaxSinglerollweight(productionProcesses.getSinglerollweight());
+                pper.setMinSinglerollweight(productionProcesses.getSinglerollweight());
+                pper.setMaxVolumeWidth(productionProcesses.getVolumeWidth());
+                pper.setMinVolumeWidth(productionProcesses.getVolumeWidth());
+                pper.setMaxThickness(productionProcesses.getVolumeThickness());
+                pper.setMinThickness(productionProcesses.getVolumeThickness());
                 pper.setProducttype(productionProcesses.getProducttype());
                 pper.setOnceprocessmin(productionProcesses.getProduceTime());
                 pper.setPcNum(productionProcesses.getOpeProducePcNum());