|
@ -266,6 +266,10 @@ public class PdaServiceImpl implements PdaService { |
|
|
Assert.notNull(requestParam, "参数不能为空!"); |
|
|
Assert.notNull(requestParam, "参数不能为空!"); |
|
|
String point_code = requestParam.getPoint_code(); |
|
|
String point_code = requestParam.getPoint_code(); |
|
|
Assert.notBlank(point_code, "点位编码不能为空!"); |
|
|
Assert.notBlank(point_code, "点位编码不能为空!"); |
|
|
|
|
|
SchBasePoint point = pointService.getById(point_code); |
|
|
|
|
|
if (StrUtil.isNotEmpty(point.getIng_task_code())) { |
|
|
|
|
|
throw new BadRequestException("满托出库确认失败,存在未完成的任务!"); |
|
|
|
|
|
} |
|
|
String vehicle_code = requestParam.getVehicle_code(); |
|
|
String vehicle_code = requestParam.getVehicle_code(); |
|
|
Assert.notBlank(vehicle_code, "载具号不能为空!"); |
|
|
Assert.notBlank(vehicle_code, "载具号不能为空!"); |
|
|
String residue_num = requestParam.getResidue_num(); |
|
|
String residue_num = requestParam.getResidue_num(); |
|
@ -288,7 +292,6 @@ public class PdaServiceImpl implements PdaService { |
|
|
groupOne.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); |
|
|
groupOne.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); |
|
|
vehiclematerialgroupService.update(groupOne); |
|
|
vehiclematerialgroupService.update(groupOne); |
|
|
|
|
|
|
|
|
SchBasePoint point = pointService.getById(point_code); |
|
|
|
|
|
point.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode()); |
|
|
point.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode()); |
|
|
pointService.update(point); |
|
|
pointService.update(point); |
|
|
} else { |
|
|
} else { |
|
|