|
@ -33,13 +33,13 @@ public class StructFindUtil { |
|
|
if (StrUtil.isEmpty(area_type)) { |
|
|
if (StrUtil.isEmpty(area_type)) { |
|
|
throw new BadRequestException("区域不能为空!"); |
|
|
throw new BadRequestException("区域不能为空!"); |
|
|
} |
|
|
} |
|
|
String vehice_type = vehicleObj.getString("vehicle_type"); |
|
|
String vehicle_type = vehicleObj.getString("vehicle_type"); |
|
|
JSONObject result = WQL |
|
|
JSONObject result = WQL |
|
|
.getWO("QSTRUCT_RULE") |
|
|
.getWO("QSTRUCT_RULE") |
|
|
.addParam("flag", "2") |
|
|
.addParam("flag", "2") |
|
|
.addParam("material_id", material_id) |
|
|
.addParam("material_id", material_id) |
|
|
.addParam("area_type", area_type) |
|
|
.addParam("area_type", area_type) |
|
|
.addParam("vehice_type", vehice_type) |
|
|
.addParam("vehicle_type", vehicle_type) |
|
|
.process() |
|
|
.process() |
|
|
.uniqueResult(0); |
|
|
.uniqueResult(0); |
|
|
return result; |
|
|
return result; |
|
@ -66,7 +66,8 @@ public class StructFindUtil { |
|
|
.addParam("material_id", material_id) |
|
|
.addParam("material_id", material_id) |
|
|
.addParam("area_type", area_type) |
|
|
.addParam("area_type", area_type) |
|
|
.addParam("vehicle_type", vehicle_type) |
|
|
.addParam("vehicle_type", vehicle_type) |
|
|
.addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id) |
|
|
.addParam("is_full", is_full) |
|
|
|
|
|
.addParam("workprocedure_id", workprocedure_id) |
|
|
.process() |
|
|
.process() |
|
|
.uniqueResult(0); |
|
|
.uniqueResult(0); |
|
|
return result; |
|
|
return result; |
|
|