update堆垛数量

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

@@ -175,7 +175,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
-//            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
+            billetHotsend.setStackNum(Math.max(0, idExistBh.getStackNum() - groupRollClubCommonList.size()));
             // 钢坯热送基础信息存在，但是钢坯信息不存在 直接返回
             if ("roll_club_two".equals(loadingParams.getDestinationTable())) {
                 billetHotsend.setRollclubtwoNum(oConvertUtils.isNotEmpty(idExistBh.getRollclubtwoNum()) ? idExistBh.getRollclubtwoNum() + groupRollClubCommonList.size() : groupRollClubCommonList.size());
@@ -587,7 +587,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
-//            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
+            billetHotsend.setStackNum(Math.max(0, idExistBh.getStackNum() - groupRollClubCommonList.size()));
             // 钢坯热送基础信息存在，但是钢坯信息不存在 直接返回
             if ("roll_club_two".equals(loadingParams.getDestinationTable())) {
                 billetHotsend.setRollclubtwoNum(oConvertUtils.isNotEmpty(idExistBh.getRollclubtwoNum()) ? idExistBh.getRollclubtwoNum() + groupRollClubCommonList.size() : groupRollClubCommonList.size());
@@ -911,7 +911,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             if (oConvertUtils.isNotEmpty(idExistBh)) {
                 log.info("{}{}", ">>>>>更新钢坯热送基础信息叛废支数:", JSON.toJSON(idExistBh));
                 idExistBh.setWasteNum(oConvertUtils.isEmpty(idExistBh.getWasteNum()) ? 4 : idExistBh.getWasteNum() + 4);
-//                idExistBh.setStackNum(idExistBh.getStackNum() - 4);
+                idExistBh.setStackNum(idExistBh.getStackNum() - 4);
                 idExistBh.setUpdateTime(new Date());
                 billetHotsendBaseService.updateById(idExistBh);
             }