From b5d9419757025f480ea7dbef185e2c9c5332c08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Thu, 25 May 2023 17:01:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8B=86=E7=A0=81=E5=9E=9B=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 3 +- .../service/impl/WorkorderServiceImpl.java | 3 + .../org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql | 8 +- .../sch/task/call/empty/FJCallEmptyTask.java | 61 +- .../task/call/empty/wql/CALL_EMPTY_TASK.wql | 23 + .../call/material/FJCallMaterialTask.java | 76 +-- .../call/material/SZCallMaterialTask.java | 78 ++- .../call/material/YZCallMaterialTask.java | 16 +- .../call/material/wql/CALL_MATERIAL_TASK.wql | 5 + .../send/material/FJSendMaterialTask.java | 4 +- .../send/material/wql/SEND_MATERIAL_TASK.wql | 2 + .../org/nl/wms/sch/task/util/TaskUtils.java | 14 +- .../nl/wms/sch/task/util/wql/TASK_UTILS.wql | 2 +- .../src/main/java/org/nl/wms/wms.xls | Bin 282112 -> 280064 bytes .../src/test/java/org/nl/test/TempTest.java | 56 +- .../src/views/wms/basedata/material/index.vue | 16 + .../views/wms/pdm/workerorder/fj/index.vue | 543 ++++++++++++++++++ .../views/wms/pdm/workerorder/hl/index.vue | 5 +- .../src/views/wms/pdm/workerorder/index.vue | 32 +- 19 files changed, 736 insertions(+), 211 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue 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 483a094..5c52377 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 @@ -704,7 +704,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String unqualified_qty = jsonObject.getString("unqualified_qty"); if (StrUtil.isNotBlank(unqualified_qty) && !"0".equals(unqualified_qty)) { workorder.put("unqualified_qty", unqualified_qty); - + } + if (!"0".equals(workorder.getString("unqualified_qty"))) { JSONObject regionIn = TaskUtils.buildRegionInFromWorkorder(workorder, RegionInType.FPRK); WQLObject.getWQLObject("st_ivt_regionio").insert(regionIn); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index a0af50d..a831fe5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -438,10 +438,13 @@ public class WorkorderServiceImpl implements WorkordeService { String unqualified_qty = row.getString("unqualified_qty"); if (StrUtil.isNotBlank(unqualified_qty) && !"0".equals(unqualified_qty)) { workorder.put("unqualified_qty", unqualified_qty); + } + if (!"0".equals(workorder.getString("unqualified_qty"))) { JSONObject regionIn = TaskUtils.buildRegionInFromWorkorder(workorder, RegionInType.FPRK); WQLObject.getWQLObject("st_ivt_regionio").insert(regionIn); } + String qualified_qty = row.getString("qualified_qty"); if (StrUtil.isNotBlank(qualified_qty) && !"0".equals(qualified_qty)) { workorder.put("qualified_qty", qualified_qty); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index e211f46..765dd83 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -84,11 +84,8 @@ ) ENDOPTION OPTION 输入.region_code <> "" - device.region_code = 'HL' + device.region_code = 输入.region_code ENDOPTION - OPTION 输入.region_code = "" - device.region_code IN ('YZ', 'FJ') - ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF @@ -177,7 +174,8 @@ material.b, material.h, material.w, - device.region_code + device.region_code, + workorder.vehicle_type FROM pdm_bd_workorder workorder LEFT JOIN md_me_materialbase material ON workorder.material_id = material.material_id diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/FJCallEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/FJCallEmptyTask.java index e4925dd..0761c00 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/FJCallEmptyTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/FJCallEmptyTask.java @@ -49,7 +49,7 @@ public class FJCallEmptyTask extends AbstractAcsTask { null, point.getString("point_code"), null, - null, + work_order.getString("material_id"), work_order.getString("vehicle_type"), null, TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 50 : 1, @@ -82,24 +82,18 @@ public class FJCallEmptyTask extends AbstractAcsTask { for (int i = 0; i < tasks.size(); i++) { JSONObject task = tasks.getJSONObject(i); - JSONObject point = WQL + JSONObject bthc_point = WQL .getWO("CALL_EMPTY_TASK") - .addParam("flag", "4") + .addParam("flag", "6") .addParam("vehicle_type", task.getString("vehicle_type")) + .addParam("material_id", task.getString("material_id")) .process() .uniqueResult(0); - - if (ObjectUtil.isNotEmpty(point)) { - JSONArray request_param = new JSONArray(); - request_param.add(point.getString("point_code")); - JSONObject result = wmsToAcsService.getTray(request_param); - if (!"200".equals(result.getString("status"))) { - continue; - } - + if (ObjectUtil.isNotEmpty(bthc_point)) { task.put("task_status", TaskStatus.START_AND_END.value()); - task.put("point_code1", point.getString("device_code")); - task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code"))); + task.put("point_code1", bthc_point.getString("device_code")); + task.put("vehicle_code", TaskUtils.formatVehicleCode(bthc_point.getString("vehicle_code"))); + task.put("group_id", bthc_point.getLongValue("vd_id")); task.put("remark", ""); TaskUtils.addAutoUpdateColum(task); task_table.update(task); @@ -108,7 +102,38 @@ public class FJCallEmptyTask extends AbstractAcsTask { update_point.put("lock_type", LockType.TASK_LOCKED.value()); update_point.put("task_code", task.getString("task_code")); TaskUtils.addAutoUpdateColum(update_point); - point_table.update(update_point, "point_code = '" + point.getString("device_code") + "'"); + point_table.update(update_point, "point_code = '" + bthc_point.getString("device_code") + "'"); + } else { + + JSONObject point = WQL + .getWO("CALL_EMPTY_TASK") + .addParam("flag", "4") + .addParam("vehicle_type", task.getString("vehicle_type")) + .process() + .uniqueResult(0); + + if (ObjectUtil.isNotEmpty(point)) { + JSONArray request_param = new JSONArray(); + request_param.add(point.getString("point_code")); + JSONObject result = wmsToAcsService.getTray(request_param); + if (!"200".equals(result.getString("status"))) { + continue; + } + + task.put("task_status", TaskStatus.START_AND_END.value()); + task.put("point_code1", point.getString("device_code")); + task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code"))); + task.put("material_id", ""); + task.put("remark", ""); + TaskUtils.addAutoUpdateColum(task); + task_table.update(task); + + JSONObject update_point = new JSONObject(); + update_point.put("lock_type", LockType.TASK_LOCKED.value()); + update_point.put("task_code", task.getString("task_code")); + TaskUtils.addAutoUpdateColum(update_point); + point_table.update(update_point, "point_code = '" + point.getString("device_code") + "'"); + } } } } @@ -177,14 +202,14 @@ public class FJCallEmptyTask extends AbstractAcsTask { } } - public void finishTask(JSONObject task, OperationType operation_type) { + public void finishTask(JSONObject task, OperationType operation_type) { int current_task_status = task.getIntValue("task_status"); if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) { if (operation_type == OperationType.MANUAL - && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) { + && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) { throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！"); } - + task.put("task_status", TaskStatus.FINISHED.value()); if (operation_type == OperationType.AUTO) { TaskUtils.addACSUpdateColum(task); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql index 3c08a04..6cf2f52 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/wql/CALL_EMPTY_TASK.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.point_code TYPEAS s_string 输入.vehicle_type TYPEAS s_string + 输入.material_id TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -135,3 +136,25 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "6" + QUERY + SELECT + point.*, + vd.vd_id + FROM + sch_base_point point + LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_type = vd.vehicle_type + AND point.vehicle_code = vd.vehicle_code + AND vd.is_delete = '0' + WHERE + point.is_used = '1' + AND point.lock_type = '1' + AND point.region_code = 'BTHC' + AND point.point_type = '1' + AND point.point_status = '1' + AND point.vehicle_type = 输入.vehicle_type + AND vd.material_id = 输入.material_id + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java index d362577..24b7c71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java @@ -59,53 +59,39 @@ public class FJCallMaterialTask extends AbstractAcsTask { form.getString("create_id"), form.getString("create_name") ); - WQLObject.getWQLObject("sch_base_task").insert(task); - point.put("lock_type", LockType.TASK_LOCKED.value()); - point.put("task_code", task.getString("task_code")); - TaskUtils.addFormUpdateColum(point, form); - WQLObject.getWQLObject("sch_base_point").update(point); - - return task.getString("task_code"); - } - - - @Override - public void findStartPoint() { - WQLObject task_table = WQLObject.getWQLObject("sch_base_task"); - JSONArray tasks = task_table - .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_END.value() + "' AND handle_class = '" + FJCallMaterialTask.class.getName() + "'", "priority DESC, create_time ASC") - .getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(tasks)) { + JSONObject point1 = WQL + .getWO("CALL_MATERIAL_TASK") + .addParam("flag", "3") + .addParam("material_id", task.getString("material_id")) + .process() + .uniqueResult(0); + + if (ObjectUtil.isNotEmpty(point1)) { + point.put("lock_type", LockType.TASK_LOCKED.value()); + point.put("task_code", task.getString("task_code")); + TaskUtils.addFormUpdateColum(point, form); WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); - - for (int i = 0; i < tasks.size(); i++) { - JSONObject task = tasks.getJSONObject(i); - - JSONObject point = WQL - .getWO("CALL_MATERIAL_TASK") - .addParam("flag", "3") - .addParam("material_id", task.getString("material_id")) - .process() - .uniqueResult(0); - - if (ObjectUtil.isNotEmpty(point)) { - task.put("task_status", TaskStatus.START_AND_END.value()); - task.put("point_code1", point.getString("point_code")); - task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code"))); - task.put("material_id", point.getString("material_id")); - task.put("group_id", point.getString("vd_id")); - task.put("remark", ""); - TaskUtils.addAutoUpdateColum(task); - task_table.update(task); - - JSONObject point_update = new JSONObject(); - point_update.put("lock_type", LockType.TASK_LOCKED.value()); - point_update.put("task_code", task.getString("task_code")); - TaskUtils.addAutoUpdateColum(point_update); - point_table.update(point_update, "point_id = " + point.getLongValue("point_id")); - } - } + point_table.update(point); + + task.put("task_status", TaskStatus.START_AND_END.value()); + task.put("point_code1", point1.getString("point_code")); + task.put("vehicle_code", TaskUtils.formatVehicleCode(point1.getString("vehicle_code"))); + task.put("material_id", point1.getString("material_id")); + task.put("group_id", point1.getString("vd_id")); + task.put("remark", ""); + + JSONObject point_update = new JSONObject(); + point_update.put("lock_type", LockType.TASK_LOCKED.value()); + point_update.put("task_code", task.getString("task_code")); + TaskUtils.addFormUpdateColum(point_update, form); + point_table.update(point_update, "point_id = " + point1.getLongValue("point_id")); + + WQLObject.getWQLObject("sch_base_task").insert(task); + + return task.getString("task_code"); + } else { + throw new BadRequestException("[" + point.get("point_code") + "] 的叫料任务未找到起点！"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java index f26ec21..4991a44 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java @@ -57,52 +57,38 @@ public class SZCallMaterialTask extends AbstractAcsTask { form.getString("create_id"), form.getString("create_name") ); - WQLObject.getWQLObject("sch_base_task").insert(task); - point.put("lock_type", LockType.TASK_LOCKED.value()); - point.put("task_code", task.getString("task_code")); - TaskUtils.addFormUpdateColum(point, form); - WQLObject.getWQLObject("sch_base_point").update(point); + JSONObject point1 = WQL + .getWO("CALL_MATERIAL_TASK") + .addParam("flag", "1") + .process() + .uniqueResult(0); - return task.getString("task_code"); - } - - - @Override - public void findStartPoint() { - WQLObject task_table = WQLObject.getWQLObject("sch_base_task"); - JSONArray tasks = task_table - .query("is_delete = '0' AND task_status = '" + TaskStatus.SURE_END.value() + "' AND handle_class = '" + SZCallMaterialTask.class.getName() + "'", "priority DESC, create_time ASC") - .getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(tasks)) { + if (ObjectUtil.isNotEmpty(point1)) { WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); - - for (int i = 0; i < tasks.size(); i++) { - JSONObject task = tasks.getJSONObject(i); - - JSONObject point = WQL - .getWO("CALL_MATERIAL_TASK") - .addParam("flag", "1") - .process() - .uniqueResult(0); - - if (ObjectUtil.isNotEmpty(point)) { - task.put("task_status", TaskStatus.START_AND_END.value()); - task.put("point_code1", point.getString("point_code")); - task.put("material_id", point.getString("material_id")); - task.put("vehicle_code", TaskUtils.formatVehicleCode(point.getString("vehicle_code"))); - task.put("group_id", point.getString("vd_id")); - task.put("remark", ""); - TaskUtils.addAutoUpdateColum(task); - task_table.update(task); - - JSONObject point_update = new JSONObject(); - point_update.put("lock_type", LockType.TASK_LOCKED.value()); - point_update.put("task_code", task.getString("task_code")); - TaskUtils.addAutoUpdateColum(point_update); - point_table.update(point_update, "point_id = " + point.getLongValue("point_id")); - } - } + point.put("lock_type", LockType.TASK_LOCKED.value()); + point.put("task_code", task.getString("task_code")); + TaskUtils.addFormUpdateColum(point, form); + WQLObject.getWQLObject("sch_base_point").update(point); + + task.put("task_status", TaskStatus.START_AND_END.value()); + task.put("point_code1", point1.getString("point_code")); + task.put("material_id", point1.getString("material_id")); + task.put("vehicle_code", TaskUtils.formatVehicleCode(point1.getString("vehicle_code"))); + task.put("group_id", point1.getString("vd_id")); + task.put("remark", ""); + + JSONObject point_update = new JSONObject(); + point_update.put("lock_type", LockType.TASK_LOCKED.value()); + point_update.put("task_code", task.getString("task_code")); + TaskUtils.addFormUpdateColum(point_update, form); + point_table.update(point_update, "point_id = " + point1.getLongValue("point_id")); + + WQLObject.getWQLObject("sch_base_task").insert(task); + + return task.getString("task_code"); + } else { + throw new BadRequestException("[" + point.get("point_code") + "] 的叫料任务未找到起点！"); } } @@ -172,14 +158,14 @@ public class SZCallMaterialTask extends AbstractAcsTask { } - public void finishTask(JSONObject task, OperationType operation_type) { + public void finishTask(JSONObject task, OperationType operation_type) { int current_task_status = task.getIntValue("task_status"); if (current_task_status < Integer.parseInt(TaskStatus.FINISHED.value())) { if (operation_type == OperationType.MANUAL - && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) { + && current_task_status < Integer.parseInt(TaskStatus.START_AND_END.value())) { throw new BadRequestException("只能手动完成 [确认起点和终点] 之后的任务！"); } - + task.put("task_status", TaskStatus.FINISHED.value()); if (operation_type == OperationType.AUTO) { TaskUtils.addACSUpdateColum(task); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java index 1044eb1..a65f47e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.core.engine.object.WO; import org.nl.wms.basedata.eum.TrueOrFalse; import org.nl.wms.basedata.eum.VehicleType; import org.nl.wms.sch.manage.*; @@ -82,12 +83,19 @@ public class YZCallMaterialTask extends AbstractAcsTask { for (int i = 0; i < tasks.size(); i++) { JSONObject task = tasks.getJSONObject(i); - JSONObject point = WQL + WO wo = WQL .getWO("CALL_MATERIAL_TASK") .addParam("flag", "4") - .addParam("material_id", task.getString("material_id")) - .process() - .uniqueResult(0); + .addParam("material_id", task.getString("material_id")); + + JSONObject point2 = point_table.query("point_code = '" + task.getString("point_code2") + "'").uniqueResult(0); + if ("2".equals(point2.getString("point_type"))) { + wo.addParam("is_new", TrueOrFalse.TRUE.value()); + } else if ("3".equals(point2.getString("point_type"))) { + wo.addParam("is_new", TrueOrFalse.FALSE.value()); + } + + JSONObject point = wo.process().uniqueResult(0); if (ObjectUtil.isNotEmpty(point)) { task.put("task_status", TaskStatus.START_AND_END.value()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql index ace9edb..806c5c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/wql/CALL_MATERIAL_TASK.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.material_id TYPEAS f_string + 输入.is_new TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -118,6 +119,7 @@ AND point.vehicle_code = vd.vehicle_code AND vd.is_delete = '0' LEFT JOIN md_me_materialbase mb1 ON vd.material_id = mb1.material_id + LEFT JOIN pdm_bd_workorder workorder ON vd.workorder_id = workorder.workorder_id WHERE point.is_used = '1' AND point.lock_type = '1' @@ -127,6 +129,9 @@ AND point.vehicle_type = '1' AND mb1.material_id = 输入.material_id AND vd.stand_status IN ('3', '4') + OPTION 输入.is_new <> "" + workorder.is_new = 输入.is_new + ENDOPTION ORDER BY vd.create_time ASC ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java index 0963b86..5a68f5c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/FJSendMaterialTask.java @@ -86,7 +86,7 @@ public class FJSendMaterialTask extends AbstractAcsTask { form.getString("create_id"), form.getString("create_name") ); - empty_task.put("table_fk_id", material_task.getLongValue("task_id")); + empty_task.put("task_group_id", material_task.getLongValue("task_id")); WQLObject.getWQLObject("sch_base_task").insert(empty_task); } @@ -163,7 +163,7 @@ public class FJSendMaterialTask extends AbstractAcsTask { JSONObject update_point = new JSONObject(); update_point.put("lock_type", LockType.TASK_LOCKED.value()); - update_point.put("task_code", material_task.getString("task_code")); + update_point.put("task_code", empty_task.getString("task_code")); TaskUtils.addAutoUpdateColum(update_point); task_table.update(material_task); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql index cd44e57..0fb145e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql @@ -53,6 +53,8 @@ AND region_code = 'BCPHJ' AND point_type = '1' AND point_status = '0' + ORDER BY + point_code ASC ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java index a199137..0593c7a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java @@ -182,7 +182,7 @@ public class TaskUtils { regionIn.put("cInvCode", regionInType.value() + material_code); regionIn.put("iQuantity", String.format("%.3f", detail.getDoubleValue("vd_weight") / 1000)); regionIn.put("iNum", detail.getString("qty")); - regionIn.put("iinvexchrate", String.format("%.3f", detail.getDoubleValue("material_weight") / 1000)); + regionIn.put("iinvexchrate", String.format("%.5f", detail.getDoubleValue("material_weight") / 1000)); regionIn.put("cBatch", cMocode); return regionIn; } @@ -192,16 +192,16 @@ public class TaskUtils { JSONObject regionIn = new JSONObject(); regionIn.put("id", IdUtil.getSnowflake(1L, 1L).nextId()); regionIn.put("cCode", CodeUtil.getNewCode("IN_STORE_CODE")); - regionIn.put("dDate", DateUtil.today()); + regionIn.put("dDate", DateUtil.now()); regionIn.put("cVouchType", regionInType.label()); String material_code = detail.getString("material_code"); String cMocode = material_code.substring(11, 16); regionIn.put("cMocode", cMocode); regionIn.put("cInvCode", regionInType.value() + material_code); - int qty = detail.getIntValue("qty"); + int qty = workorder.getIntValue("unqualified_qty"); regionIn.put("iNum", qty); - double material_weight = detail.getDoubleValue("material_weight") / 1000; - regionIn.put("iinvexchrate", String.format("%.3f", material_weight)); + double material_weight = detail.getDoubleValue("material_weight"); + regionIn.put("iinvexchrate", String.format("%.5f", material_weight / 1000)); regionIn.put("iQuantity", String.format("%.3f", qty * material_weight / 1000)); regionIn.put("cBatch", cMocode); return regionIn; @@ -212,14 +212,14 @@ public class TaskUtils { JSONObject regionIn = new JSONObject(); regionIn.put("id", IdUtil.getSnowflake(1L, 1L).nextId()); regionIn.put("cCode", CodeUtil.getNewCode("IN_STORE_CODE")); - regionIn.put("dDate", DateUtil.today()); + regionIn.put("dDate", DateUtil.now()); String material_code = detail.getString("material_code"); String cMocode = material_code.substring(11, 16); regionIn.put("cMocode", cMocode); regionIn.put("cInvCode", regionOutType.value() + material_code); regionIn.put("iQuantity", String.format("%.3f", detail.getDoubleValue("vd_weight") / 1000)); regionIn.put("iNum", detail.getString("qty")); - regionIn.put("iinvexchrate", String.format("%.3f", detail.getDoubleValue("material_weight") / 1000)); + regionIn.put("iinvexchrate", String.format("%.5f", detail.getDoubleValue("material_weight") / 1000)); regionIn.put("cBatch", cMocode); return regionIn; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql index 2512755..4c01b71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/wql/TASK_UTILS.wql @@ -65,7 +65,7 @@ pdm_bd_workorder workorder LEFT JOIN md_me_materialbase material ON workorder.material_id = material.material_id WHERE - workorder.vd_id = 输入.workorder_id + workorder.workorder_id = 输入.workorder_id ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 64298aab2f7471fd35c8208f211067b4f1aa8c45..57ba4ad661b62ff9a343f4f804827f033aa63e74 100644 GIT binary patch delta 9715 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 Rs{GZ#!JYVk>Tp`){{RpH&zJxJ delta 12006 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 diff --git a/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java b/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java index 57a8f66..3a786d1 100644 --- a/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java +++ b/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java @@ -10,6 +10,8 @@ import org.junit.runner.RunWith; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.sch.manage.RegionInType; +import org.nl.wms.sch.task.util.TaskUtils; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @@ -26,58 +28,6 @@ public class TempTest { @Test public void test01() { - JSONArray erp_materials = WQL.getWO("QMD_ME_MATERIAL").setDbname("dataSource1").addParam("flag", "2").process().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(erp_materials)) { - WQLObject material_table = WQLObject.getWQLObject("md_me_materialbase"); - List material_codes = material_table.query().getResultJSONArray(0).stream().map(o -> ((JSONObject) o).getString("material_code")).collect(Collectors.toList()); - WQLObject dict_detail_table = WQLObject.getWQLObject("sys_dict_detail"); - - Long user_id = 1L; - String nick_name = "管理员"; - String now = DateUtil.now(); - - erp_materials.forEach(o -> { - JSONObject erp_material = (JSONObject) o; - String material_code = erp_material.getString("cinvcode").substring(1); - if (!material_codes.contains(material_code)) { - JSONObject material = new JSONObject(); - long id = IdUtil.getSnowflake(1L, 1L).nextId(); - material.put("material_id", id); - material.put("material_code", material_code); - material.put("material_name", erp_material.getString("cinvname")); - material.put("weight", String.format("%.2f", erp_material.getDoubleValue("changerate") * 1000)); - String qty = String.format("%.0f", erp_material.getDoubleValue("qty") * 1000); - material.put("qty", qty); - material.put("surplus_qty", qty); - String aux_qty = String.format("%.0f", erp_material.getDoubleValue("auxqty")); - material.put("aux_qty", aux_qty); - material.put("surplus_aux_qty", aux_qty); - material.put("order_code", erp_material.getString("free1")); - - String furnace_code = material_code.substring(0, 2); - JSONObject furnace_name = dict_detail_table.query("name = 'furnace' AND value = '" + furnace_code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(furnace_name)) { - material.put("furnace", furnace_name.getString("label")); - } else { - material.put("furnace", furnace_code); - } - String material_brick_code = material_code.substring(2, 5); - JSONObject material_brick_type = dict_detail_table.query("name = 'material_brick_type' AND value = '" + material_brick_code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(material_brick_type)) { - material.put("material_brick_type", material_brick_type.getString("label")); - } else { - material.put("material_brick_type", material_brick_code); - } - material.put("product_grade", erp_material.getString("free3")); - material.put("brick_type", erp_material.getString("free4")); - - material.put("create_id", user_id); - material.put("create_name", nick_name); - material.put("create_time", now); - - material_table.insert(material); - } - }); - } + System.out.println(8.94 / 1000); } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue index 86e2824..3b105e6 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -18,6 +18,22 @@ @keyup.enter.native="crud.toQuery" /> + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue new file mode 100644 index 0000000..2aa3f1a --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue index e475458..d0eec10 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue @@ -179,7 +179,7 @@ > - + @@ -192,12 +192,13 @@ + - + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index b7f7c84..88867c6 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -136,30 +136,6 @@ - - - - - - - - - @@ -208,8 +184,8 @@ @@ -240,6 +216,7 @@ +