diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 4f3cb2792..1a3913d99 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -957,8 +957,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //纸管任务 String task_code2 = whereJson.getString("task_code2"); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(task_jo)){ + throw new BadRequestException("接口sendGetGoalStruct，任务号为空！"); + } JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0); String product_area = task_jo.getString("product_area"); + String public_area = ""; + if (product_area.equals("A1") || product_area.equals("A2")){ + public_area = "A1"; + } + if (product_area.equals("A3") || product_area.equals("A4")){ + public_area = "A3"; + } JSONObject cbz_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '0'").uniqueResult(0); String cbz_size = cbz_jo.getString("qzz_size"); String cbz_generation = cbz_jo.getString("qzz_generation"); @@ -1093,6 +1103,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "6") .addParam("need_size", need_size) .addParam("need_generation", need_generation) + .addParam("product_area",public_area) .process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)) { @@ -1116,6 +1127,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "7") .addParam("need_size", have_size) .addParam("need_generation", have_generation) + .addParam("product_area",public_area) .process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)) { @@ -1228,6 +1240,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if ("2".equals(plan_type)) { JSONObject plan_task = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + plan_jo.getString("start_code") + "'").uniqueResult(0); plan_task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + WQLObject.getWQLObject("sch_base_task").update(plan_task); paperTrussTask.immediateNotifyAcs(null); } } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java index 8626ed46f..77fc67db9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java @@ -68,7 +68,7 @@ public class AutoCallEmptyVehicle { if (plan_rows.size() >= 2) { donw_num += 2; - } else { + } else if (plan_rows.size() == 1){ donw_num += 1; } } @@ -143,13 +143,14 @@ public class AutoCallEmptyVehicle { case 2: container_jo1 = rows.getJSONObject(0); container_jo2 = rows.getJSONObject(1); - paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("FRP_material")); - paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("FRP_material")); + paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("frp_material")); + paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("frp_material")); paper_jo.put("paper_code", paper_code1); paper_jo.put("num", 1); paper_jo.put("pcsn", container_jo1.getString("container_name")); paper_rows.add(paper_jo); this.getPaperStruct(paper_rows, product_area); + paper_rows = new JSONArray(); paper_jo.put("paper_code", paper_code2); paper_jo.put("pcsn", container_jo2.getString("container_name")); paper_jo.put("num", 1); @@ -160,8 +161,8 @@ public class AutoCallEmptyVehicle { container_jo1 = rows.getJSONObject(0); container_jo2 = rows.getJSONObject(1); container_jo3 = rows.getJSONObject(2); - paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("FRP_material")); - paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("FRP_material")); + paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("frp_material")); + paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("frp_material")); if (paper_code2.equals(paper_code1)) { paper_jo.put("paper_code", paper_code1); paper_jo.put("num", 2); @@ -179,7 +180,8 @@ public class AutoCallEmptyVehicle { paper_rows.add(paper_jo); this.getPaperStruct(paper_rows, product_area); } - paper_code1 = getMaterial(container_jo3.getString("paper_tube_material"), container_jo3.getString("FRP_material")); + paper_rows = new JSONArray(); + paper_code1 = getMaterial(container_jo3.getString("paper_tube_material"), container_jo3.getString("frp_material")); paper_jo.put("paper_code", paper_code1); paper_jo.put("num", 1); paper_jo.put("pcsn", container_jo3.getString("container_name")); @@ -191,8 +193,8 @@ public class AutoCallEmptyVehicle { container_jo2 = rows.getJSONObject(1); container_jo3 = rows.getJSONObject(2); container_jo4 = rows.getJSONObject(3); - paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("FRP_material")); - paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("FRP_material")); + paper_code1 = getMaterial(container_jo1.getString("paper_tube_material"), container_jo1.getString("frp_material")); + paper_code2 = getMaterial(container_jo2.getString("paper_tube_material"), container_jo2.getString("frp_material")); if (paper_code2.equals(paper_code1)) { paper_jo.put("paper_code", paper_code1); paper_jo.put("num", 2); @@ -210,8 +212,9 @@ public class AutoCallEmptyVehicle { paper_jo.put("pcsn", container_jo2.getString("container_name")); this.getPaperStruct(paper_rows, product_area); } - paper_code1 = getMaterial(container_jo3.getString("paper_tube_material"), container_jo3.getString("FRP_material")); - paper_code2 = getMaterial(container_jo4.getString("paper_tube_material"), container_jo4.getString("FRP_material")); + paper_rows = new JSONArray(); + paper_code1 = getMaterial(container_jo3.getString("paper_tube_material"), container_jo3.getString("frp_material")); + paper_code2 = getMaterial(container_jo4.getString("paper_tube_material"), container_jo4.getString("frp_material")); if (paper_code2.equals(paper_code1)) { paper_jo.put("paper_code", paper_code1); paper_jo.put("num", 2); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index 889e9b8a4..68f4fff7d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -210,6 +210,7 @@ public class PaperTubeTask extends AbstractAcsTask { json.put("product_area", form.getString("product_area")); json.put("priority", "1"); json.put("acs_task_type", "10"); + json.put("material_code", form.getString("material_code")); json.put("response_param", form.getString("paper_array")); json.put("request_param", form.getString("request_param")); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QAUTO_QUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QAUTO_QUERY.wql index c87851052..c2983f577 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QAUTO_QUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QAUTO_QUERY.wql @@ -198,9 +198,13 @@ AND ivt.have_qzz = '1' AND + ivt.is_used = '1' + AND ivt.qzz_size = 输入.need_size AND ivt.qzz_generation = 输入.need_generation + AND + ivt.product_area = 输入.product_area ORDER BY sort_seq ENDSELECT @@ -216,8 +220,10 @@ WHERE ivt.point_type = '1' AND ivt.have_qzz = '0' + AND ivt.is_used = '1' AND ivt.qzz_size = 输入.need_size AND ivt.qzz_generation = 输入.need_generation + AND ivt.product_area = 输入.product_area AND NOT EXISTS ( SELECT * diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java index e83892dfd..89ba0d659 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java @@ -70,12 +70,12 @@ public class RecutPlanServiceImpl implements RecutPlanService { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_ProductScrapMst"); + WQLObject wo_mst = WQLObject.getWQLObject("st_ivt_productplanmst"); JSONObject jsonObject = new JSONObject(); jsonObject.put("is_delete", "1"); - for (Long scrap_id : ids) { - wo_mst.update(jsonObject, "scrap_id = '" + scrap_id + "'"); + for (Long plan_id : ids) { + wo_mst.update(jsonObject, "plan_id = '" + plan_id + "'"); } }