Ver código fonte

快速创建装运单日志、提示优化

qiangxuan 4 dias atrás
pai
commit
5412b6e502

+ 5 - 5
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -927,8 +927,8 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 	@ApiOperation(value="推钢室快速创建装运单", notes="推钢室快速创建装运单")
 	@RequestMapping(value = "/addStorageBill", method = {RequestMethod.PUT})
 	public Result<String> addStorageBillHandle(@RequestParam(name="ccmNo",required = false) String ccmNo,
-											   @RequestParam(name="positionNum",required = true) Integer positionNum,
-											   @RequestParam(name="licensePlate",required = true) String licensePlate) {
+											   @RequestParam(name="positionNum") Integer positionNum,
+											   @RequestParam(name="licensePlate") String licensePlate) {
 		// 参数验证
 		if (positionNum == 2 && StringUtils.isEmpty(ccmNo)) {
 			return Result.error("车位2铸机号不能为空!");
@@ -963,15 +963,15 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				.isNull(StorageBill::getOutTime);
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper);
 		if (oConvertUtils.isNotEmpty(isStorageBill)) {
-			log.info("推钢室查询到存在未发车车辆,车牌号为:{},新增钢坯装运单失败!", storageBill.getLicensePlate());
-			return Result.error("该车存在未发车信息,创建失败!");
+			log.info("该车牌号存在未发车车辆,车牌号为:{},快速创建钢坯装运单失败!", licensePlate);
+			return Result.error("该车牌号存在未发车信息,创建失败!");
 		}
 		// 判断车位是否存在未发车车辆(2025/3.3,半自动化逻辑,等自动化发车车位发车完善后,在添加此段逻辑)
 		List<StorageBill> storageBillList = storageBillService.list(new LambdaQueryWrapper<StorageBill>()
 				.eq(StorageBill::getPositionNum, positionNum)
 				.isNull(StorageBill::getOutTime));
 		if (oConvertUtils.listIsNotEmpty(storageBillList)){
-			log.info("{}{}", "推钢室该车位存在未发车信息,新增钢坯装运单失败!", JSON.toJSON(storageBillList));
+			log.info("{}{}", "该车位存在未发车信息,快速创建钢坯装运单失败!", JSON.toJSON(storageBillList));
 			return Result.error("该车位存在未发车信息,创建失败!");
 		}