支数维护BUG修复

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -795,11 +795,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubOne.setAmountTotal(rollClubCommonList.size());// 总支数
 				rollClubOneService.save(rollClubOne);
 			}else {
-				rollClubOne.setAmountTotal(rollClubOne1.getAmountTotal() + rollClubCommonList.size());// 总支数
-				rollClubOne.setId(rollClubOne1.getId());
-				rollClubOne.setBlankOutput(rollClubOne1.getBlankOutput() + rollClubOne.getBlankOutput());
-				rollClubOne.setUpdateTime(new Date());
-				rollClubOneService.updateById(rollClubOne);
+				rollClubOne1.setAmountTotal(rollClubOne1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollClubOne1.setBlankOutput(rollClubOne1.getBlankOutput() + rollClubOne.getBlankOutput());
+				rollClubOne1.setUpdateTime(new Date());
+				rollClubOneService.updateById(rollClubOne1);
 			}
 			// 保存棒一明细信息
 			List<RollClubOneDetails> rollClubOneDetailsList = new ArrayList<>();
@@ -844,11 +843,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubTwo.setAmountTotal(rollClubCommonList.size());// 总支数
 				rollClubTwoService.save(rollClubTwo);
 			}else {
-				rollClubTwo.setId(rollClubTwo1.getId());
-				rollClubTwo.setAmountTotal(rollClubTwo1.getAmountTotal() + rollClubCommonList.size());// 总支数
-				rollClubTwo.setBlankOutput(rollClubTwo1.getBlankOutput() + rollClubTwo.getBlankOutput());//出坯量
-				rollClubTwo.setUpdateTime(new Date());
-				rollClubTwoService.updateById(rollClubTwo);
+				rollClubTwo1.setAmountTotal(rollClubTwo1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollClubTwo1.setBlankOutput(rollClubTwo1.getBlankOutput() + rollClubTwo.getBlankOutput());//出坯量
+				rollClubTwo1.setUpdateTime(new Date());
+				rollClubTwoService.updateById(rollClubTwo1);
 			}
 			// 保存棒二明细信息
 			List<RollClubTwoDetails> rollClubTwoDetailsList = new ArrayList<>();
@@ -893,11 +891,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubThree.setAmountTotal(rollClubCommonList.size());// 总支数
 				rollClubThreeService.save(rollClubThree);
 			}else {
-				rollClubThree.setId(rollClubThree1.getId());
-				rollClubThree.setAmountTotal(rollClubThree1.getAmountTotal() + rollClubCommonList.size());// 总支数
-				rollClubThree.setBlankOutput(rollClubThree1.getBlankOutput() + rollClubThree.getBlankOutput());//出坯量
-				rollClubThree.setUpdateTime(new Date());
-				rollClubThreeService.updateById(rollClubThree);
+				rollClubThree1.setAmountTotal(rollClubThree1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollClubThree1.setBlankOutput(rollClubThree1.getBlankOutput() + rollClubThree.getBlankOutput());//出坯量
+				rollClubThree1.setUpdateTime(new Date());
+				rollClubThreeService.updateById(rollClubThree1);
 			}
 			// 保存棒三明细信息
 			List<RollClubThreeDetails> rollClubThreeDetailsList = new ArrayList<>();
@@ -937,8 +934,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 					.eq(RollHeight::getShift, billetHotsend.getShift())
 					.eq(RollHeight::getShiftGroup, billetHotsend.getShiftGroup());
 			RollHeight rollHeight1 = rollHeightService.getOne(queryWrapper1);
-
-
 			if (oConvertUtils.isEmpty(rollHeight1)){
                 String distinctAssemblyNumber = rollClubCommonList.stream()
                         .map(RollClubCommon::getAssemblyNumber)
@@ -951,10 +946,9 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeight.setAssemblyNumber(distinctAssemblyNumber); // 设置去重后的 assemblyNumber
 				rollHeightService.save(rollHeight);
 			}else {
-				rollHeight.setAmountTotal(rollHeight1.getAmountTotal() + rollClubCommonList.size());// 总支数
-				rollHeight.setId(rollHeight1.getId());
-				rollHeight.setBlankOutput(rollHeight1.getBlankOutput() + rollHeight.getBlankOutput());//出坯量
-				rollHeight.setUpdateTime(new Date());
+				rollHeight1.setAmountTotal(rollHeight1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollHeight1.setBlankOutput(rollHeight1.getBlankOutput() + rollHeight.getBlankOutput());//出坯量
+				rollHeight1.setUpdateTime(new Date());
 
 				String assemblyNumber = "";
 				if (oConvertUtils.isNotEmpty(rollHeight1.getAssemblyNumber())){
@@ -968,18 +962,18 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 							.filter(s -> !s.isEmpty())
 							.distinct()
 							.collect(Collectors.joining(","));
-					rollHeight.setAssemblyNumber(finalAssemblyNumber);
+					rollHeight1.setAssemblyNumber(finalAssemblyNumber);
 				}else {
 					assemblyNumber = rollClubCommonList.stream()
 							.map(RollClubCommon::getAssemblyNumber)
 							.filter(x -> x != null)
 							.distinct()
 							.collect(Collectors.joining(","));
-					rollHeight.setAssemblyNumber(assemblyNumber);
+					rollHeight1.setAssemblyNumber(assemblyNumber);
 				}
 
 
-				rollHeightService.updateById(rollHeight);
+				rollHeightService.updateById(rollHeight1);
 			}
 			// 保存高线明细信息
 			List<RollHeightDetails> rollHeightDetailsList = new ArrayList<>();
@@ -1027,11 +1021,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollOutShipp.setAmountTotal(rollClubCommonList.size());// 总支数
 				rollOutShippService.save(rollOutShipp);
 			}else {
-				rollOutShipp.setId(rollOutShipp1.getId());
-				rollOutShipp.setAmountTotal(rollOutShipp1.getAmountTotal() + rollClubCommonList.size());// 总支数
-				rollOutShipp.setBlankOutput(rollOutShipp1.getBlankOutput() + rollOutShipp.getBlankOutput());//出坯量
-				rollOutShipp.setUpdateTime(new Date());
-				rollOutShippService.updateById(rollOutShipp);
+				rollOutShipp1.setId(rollOutShipp1.getId());
+				rollOutShipp1.setAmountTotal(rollOutShipp1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollOutShipp1.setBlankOutput(rollOutShipp1.getBlankOutput() + rollOutShipp.getBlankOutput());//出坯量
+				rollOutShipp1.setUpdateTime(new Date());
+				rollOutShippService.updateById(rollOutShipp1);
 			}
 			// 保存上若明细信息
 			List<RollOutShippDetails> rollOutShippDetailsList = new ArrayList<>();

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -315,11 +315,10 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollClubTwoService.save(rollClubTwo);
                     } else {
                         // 堆垛发车时
-                        rollClubTwo.setId(rollClubTwo1.getId());
-                        rollClubTwo.setAmountTotal(rollClubTwo1.getAmountTotal() + 1);// 总支数
-                        rollClubTwo.setBlankOutput(rollClubTwo1.getBlankOutput() + y.getBilletWeight());
-                        rollClubTwo.setUpdateTime(new Date());
-                        rollClubTwoService.updateById(rollClubTwo);
+                        rollClubTwo1.setAmountTotal(rollClubTwo1.getAmountTotal() + 1);// 总支数
+                        rollClubTwo1.setBlankOutput(rollClubTwo1.getBlankOutput() + y.getBilletWeight());
+                        rollClubTwo1.setUpdateTime(new Date());
+                        rollClubTwoService.updateById(rollClubTwo1);
                     }
                 });
                 RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
@@ -365,11 +364,10 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollClubThreeService.save(rollClubThree);
                     } else {
                         // 堆垛保存发车时  目的地为为棒三 更新棒三信息
-                        rollClubThree.setId(rollClubThree1.getId());
-                        rollClubThree.setAmountTotal(rollClubThree1.getAmountTotal() + 1);// 总支数
-                        rollClubThree.setBlankOutput(rollClubThree1.getBlankOutput() + y.getBilletWeight());
-                        rollClubThree.setUpdateTime(new Date());
-                        rollClubThreeService.updateById(rollClubThree);
+                        rollClubThree1.setAmountTotal(rollClubThree1.getAmountTotal() + 1);// 总支数
+                        rollClubThree1.setBlankOutput(rollClubThree1.getBlankOutput() + y.getBilletWeight());
+                        rollClubThree1.setUpdateTime(new Date());
+                        rollClubThreeService.updateById(rollClubThree1);
                     }
                 });
                 // 棒三明细
@@ -416,11 +414,10 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollOutShippService.save(rollOutShipp);
                     } else {
                         // 堆垛保存发车时 目的地为为上若 更新上若信息
-                        rollOutShipp.setId(rollOutShipp1.getId());
-                        rollOutShipp.setAmountTotal(rollOutShipp1.getAmountTotal() + 1);// 总支数
-                        rollOutShipp.setBlankOutput(rollOutShipp1.getBlankOutput() + y.getBilletWeight());
-                        rollOutShipp.setUpdateTime(new Date());
-                        rollOutShippService.updateById(rollOutShipp);
+                        rollOutShipp1.setAmountTotal(rollOutShipp1.getAmountTotal() + 1);// 总支数
+                        rollOutShipp1.setBlankOutput(rollOutShipp1.getBlankOutput() + y.getBilletWeight());
+                        rollOutShipp1.setUpdateTime(new Date());
+                        rollOutShippService.updateById(rollOutShipp1);
                     }
                 });
 
@@ -473,10 +470,9 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollHeightService.save(rollHeight);
                     } else {
                         // 堆垛发车时 目的地为高线 更新高线信息
-                        rollHeight.setId(rollHeight1.getId());
-                        rollHeight.setAmountTotal(rollHeight1.getAmountTotal() + 1);// 总支数
-                        rollHeight.setBlankOutput(rollHeight1.getBlankOutput() + y.getBilletWeight());
-                        rollHeight.setUpdateTime(new Date());
+                        rollHeight1.setAmountTotal(rollHeight1.getAmountTotal() + 1);// 总支数
+                        rollHeight1.setBlankOutput(rollHeight1.getBlankOutput() + y.getBilletWeight());
+                        rollHeight1.setUpdateTime(new Date());
 
                         String assemblyNumber = "";
                         if (oConvertUtils.isNotEmpty(rollHeight1.getAssemblyNumber())) {
@@ -490,17 +486,16 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                                     .filter(s -> !s.isEmpty())
                                     .distinct()
                                     .collect(Collectors.joining(","));
-                            rollHeight.setAssemblyNumber(finalAssemblyNumber);
+                            rollHeight1.setAssemblyNumber(finalAssemblyNumber);
                         } else {
                             assemblyNumber = rollClubCommonList.stream()
                                     .map(RollClubCommon::getAssemblyNumber)
                                     .filter(n -> n != null)
                                     .distinct()
                                     .collect(Collectors.joining(","));
-                            rollHeight.setAssemblyNumber(assemblyNumber);
+                            rollHeight1.setAssemblyNumber(assemblyNumber);
                         }
-
-                        rollHeightService.updateById(rollHeight);
+                        rollHeightService.updateById(rollHeight1);
                     }
                 });
                 // 保存高线明细信息