|
@ -298,10 +298,19 @@ public class PdaServiceImpl implements PdaService { |
|
|
result.put("point_id", point.getString("point_id")); |
|
|
result.put("point_id", point.getString("point_id")); |
|
|
result.put("point_name", point.getString("point_name")); |
|
|
result.put("point_name", point.getString("point_name")); |
|
|
|
|
|
|
|
|
|
|
|
JSONObject material = WQLObject |
|
|
|
|
|
.getWQLObject("md_me_materialbase") |
|
|
|
|
|
.query("material_code = '" + materialCode + "'") |
|
|
|
|
|
.uniqueResult(0); |
|
|
|
|
|
if (ObjectUtil.isEmpty(material)) { |
|
|
|
|
|
throw new BadRequestException("该物料号不存在"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
JSONArray detail = WQL |
|
|
JSONArray detail = WQL |
|
|
.getWO("PDA") |
|
|
.getWO("PDA") |
|
|
.addParam("flag", "5") |
|
|
.addParam("flag", "5") |
|
|
.addParam("vehicle_id", vehicle.getString("vehicle_id")) |
|
|
.addParam("vehicle_id", vehicle.getString("vehicle_id")) |
|
|
|
|
|
.addParam("material_id", material.getString("material_id")) |
|
|
.process() |
|
|
.process() |
|
|
.getResultJSONArray(0); |
|
|
.getResultJSONArray(0); |
|
|
result.put("detail", detail); |
|
|
result.put("detail", detail); |
|
@ -405,8 +414,9 @@ public class PdaServiceImpl implements PdaService { |
|
|
if (StrUtil.equals(nextPoint.getString("point_status"), PointStatus.HAS_VEHICLE.getCode())) { |
|
|
if (StrUtil.equals(nextPoint.getString("point_status"), PointStatus.HAS_VEHICLE.getCode())) { |
|
|
throw new BadRequestException("终点有载具"); |
|
|
throw new BadRequestException("终点有载具"); |
|
|
} |
|
|
} |
|
|
if (StrUtil.equals(nextPoint.getString("region_id"), RegionEnum.JJ.getId())) { |
|
|
if (!StrUtil.equals(nextPoint.getString("region_id"), RegionEnum.JJ.getId()) |
|
|
throw new BadRequestException("只有终点为交接区才能生成出库任务"); |
|
|
&& nextPoint.getString("point_code").startsWith("JJC")) { |
|
|
|
|
|
throw new BadRequestException("只有终点为交接区的出库位才能生成出库任务"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
param = new JSONObject(); |
|
|
param = new JSONObject(); |
|
|