UPDATE

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -17,6 +17,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
@@ -471,6 +472,10 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			}
 			log.info("钢坯装运单编辑，未知目的地数据同步结果：{}", jsonObject);
 		} else {
+			if (!old.getLicensePlate().equals(storageBill.getLicensePlate())){
+				int carNum = calculateCarNum(storageBill.getCcmNo(), storageBill.getLicensePlate(), storageBill.getShiftGroup(), storageBill.getShift());
+				storageBill.setCarNum(carNum + 1);
+			}
 			storageBillService.updateById(storageBill);
 		}
 		operateLogService.add(old,storageBill,StorageBill.class);
@@ -1397,6 +1402,23 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		return Result.OK(result);
 	}
 
-
+	/**
+	 * 计算 本车车次
+	 * @param ccmNo
+	 * @param licensePlate
+	 * @param shiftGroup
+	 * @param shift
+	 * @return
+	 */
+	private int calculateCarNum(String ccmNo, String licensePlate, String shiftGroup, String shift) {
+		LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(StorageBill::getCcmNo, ccmNo)
+				.eq(StorageBill::getLicensePlate, licensePlate)
+				.eq(StorageBill::getShiftGroup, shiftGroup)
+				.eq(StorageBill::getShift, shift)
+				.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+		long count = storageBillService.count(queryWrapper);
+		return (int) count;
+	}
 
 }