fix:修改所有写死的管制点
This commit is contained in:
@@ -120,7 +120,7 @@ public class AutoSendVehicleToDjq extends Prun{
|
|||||||
} else {
|
} else {
|
||||||
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
|
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
|
||||||
packageList = packageList.stream()
|
packageList = packageList.stream()
|
||||||
.filter(r -> r.getPoint_status().equals("4"))
|
.filter(r -> !r.getPoint_status().equals("4"))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (ObjectUtils.isEmpty(packageList)) {
|
if (ObjectUtils.isEmpty(packageList)) {
|
||||||
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
|
packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
|
|||||||
}else {
|
}else {
|
||||||
//判断托盘重量是否为空或小于等于0
|
//判断托盘重量是否为空或小于等于0
|
||||||
String qty = vehicle_ext.getString("qty");
|
String qty = vehicle_ext.getString("qty");
|
||||||
if (StrUtil.isEmpty(qty) || Integer.parseInt(qty) <= 0){
|
if (StrUtil.isEmpty(qty) || Double.parseDouble(qty) <= 0){
|
||||||
throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量!");
|
throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -268,6 +268,9 @@ public class BakingServiceImpl implements BakingService {
|
|||||||
case "B2":
|
case "B2":
|
||||||
reging_id = RegionTypeEnum.B2_HKZC.getId();
|
reging_id = RegionTypeEnum.B2_HKZC.getId();
|
||||||
break;
|
break;
|
||||||
|
case "B1":
|
||||||
|
reging_id = RegionTypeEnum.B1_HKZC.getId();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -478,6 +481,9 @@ public class BakingServiceImpl implements BakingService {
|
|||||||
case "A4":
|
case "A4":
|
||||||
reging_id = RegionTypeEnum.D_HKZC.getId();
|
reging_id = RegionTypeEnum.D_HKZC.getId();
|
||||||
break;
|
break;
|
||||||
|
case "B1":
|
||||||
|
reging_id = RegionTypeEnum.B1_HKZC.getId();
|
||||||
|
break;
|
||||||
case "B2":
|
case "B2":
|
||||||
reging_id = RegionTypeEnum.B2_HKZC.getId();
|
reging_id = RegionTypeEnum.B2_HKZC.getId();
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user