From a88e7781bd21a066b7e3bda62d4510838777e012 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Thu, 27 Oct 2022 14:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/RawFoilServiceImpl.java | 8 ---- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 280576 -> 280576 bytes .../org/nl/wms/sch/manage/FinishTypeEnum.java | 4 +- .../org/nl/wms/sch/manage/TaskStatusEnum.java | 14 +++---- .../src/main/java/org/nl/wms/sch/sch.xls | Bin 178688 -> 176128 bytes .../wms/sch/service/impl/TaskServiceImpl.java | 16 -------- .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 37 +++++++++--------- .../tasks/fq/FqCallMaterialSendEmptyTask.java | 7 ++++ .../tasks/fq/FqFromLqCallMaterialTask.java | 7 ++++ .../wms/sch/tasks/fq/FqToLqSendEmptyTask.java | 7 ++++ .../sch/tasks/fq/HxToLqSendMaterialTask.java | 7 ++++ .../sch/tasks/fq/LqToHxSendMaterialTask.java | 7 ++++ .../src/views/wms/sch/task/index.vue | 12 +++--- 13 files changed, 69 insertions(+), 57 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqCallMaterialSendEmptyTask.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqFromLqCallMaterialTask.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqToLqSendEmptyTask.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/HxToLqSendMaterialTask.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/LqToHxSendMaterialTask.java diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index bd0a7a229..c5f14f329 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -191,14 +191,6 @@ public class RawFoilServiceImpl implements RawFoilService { jsonRaw.put("status", "02"); rawTab.update(jsonRaw); - // 下发任务 - /* JSONObject jsonObject = callEmpReelTask.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - JSONObject jsonTask = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - }*/ JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); return jo; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index d44f13a7e451f411a29e095f69d9a29722d33860..a858eaf70bebb20db60f1b1af8890ba2dde08856 100644 GIT binary patch delta 52 zcmZpeAlNWLa6=9YTZ7w`A4gwqE@Igx%*n>UkdvC1UzXo&DA8^x!3e}mK+L?|P=e*W FJ^%Qq`LcCE5)o7=f4xh?%z=O0b;Q F2LQl@4}Jgu diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/FinishTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/FinishTypeEnum.java index a64986ffc..5c3bf9d51 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/FinishTypeEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/FinishTypeEnum.java @@ -4,8 +4,8 @@ package org.nl.wms.sch.manage; * 完成方式:00自动,01:手动 */ public enum FinishTypeEnum { - AUTO("00", "自动"), - WCS_DELETE("01", "手动"); + AUTO("1", "自动"), + WCS_DELETE("2", "手动"); private String name; private String code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java index 8afd41e40..6fdcea1f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java @@ -1,13 +1,13 @@ package org.nl.wms.sch.manage; public enum TaskStatusEnum { - CREATED("1", "生成"), - SURE_START("2", "确定起点"), - SURE_END("3", "确定终点"), - START_AND_POINT("4", "起点终点确认"), - ISSUE("5", "下发"), - EXECUTING("6", "执行中"), - FINISHED("7", "完成"); + CREATED("01", "生成"), + SURE_START("02", "确定起点"), + SURE_END("03", "确定终点"), + START_AND_POINT("04", "起点终点确认"), + ISSUE("05", "下发"), + EXECUTING("06", "执行中"), + FINISHED("07", "完成"); private String name; private String code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/sch.xls index 9c348dbec08ce1177e43e36609f82d22f1dfffcf..12ce07f07070bcbe0d5673c6a5c8238c0bcbded9 100644 GIT binary patch delta 19998 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 delta 21466 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 986265641..e13fbab1c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -92,22 +92,6 @@ public class TaskServiceImpl implements TaskService { WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); for (int i = 0; i < content.size(); i++) { JSONObject taskObj = content.getJSONObject(i); - String point_code1 = taskObj.getString("point_code1"); - if (ObjectUtil.isNotEmpty(point_code1)) { - JSONObject point1 = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - taskObj.put("point1_region_name", point1.getString("region_name")); - } - - String point_code2 = taskObj.getString("point_code2"); - if (ObjectUtil.isNotEmpty(point_code2)) { - JSONObject point2 = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - taskObj.put("point2_region_name", point2.getString("region_name")); - } - String point_code3 = taskObj.getString("point_code3"); - if (ObjectUtil.isNotEmpty(point_code3)) { - JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0); - taskObj.put("point3_region_name", point3.getString("region_name")); - } res.add(taskObj); } json.put("content", res); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 7a0338c43..0ed3e5743 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -69,9 +69,9 @@ public class CallEmpReelTask extends AbstractAcsTask { String task_id = taskObj.getString("task_id"); JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - if (StrUtil.equals(status,"0")) { + if (StrUtil.equals(status, "0")) { // 取消删除任务 - taskTab.delete("task_id = '"+task_id+"'"); + taskTab.delete("task_id = '" + task_id + "'"); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { @@ -86,9 +86,9 @@ public class CallEmpReelTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if(StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { // 更改任务状态为完成 - jsonTask.put("task_status",TaskStatusEnum.FINISHED.getCode()); + jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("update_optid", SecurityUtils.getCurrentUserId()); jsonTask.put("update_optname", SecurityUtils.getCurrentUsername()); jsonTask.put("update_time", DateUtil.now()); @@ -104,7 +104,8 @@ public class CallEmpReelTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("未找到可用点位:" + point_code1); // 校验终点是否存在 JSONObject nextDto = sbTab.query("point_code ='" + point_code2 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(nextDto)) throw new BadRequestException("未找到可用点位:" + jsonTask.getString("point_code2")); + if (ObjectUtil.isEmpty(nextDto)) + throw new BadRequestException("未找到可用点位:" + jsonTask.getString("point_code2")); // 更新冷却库存状态 jsonIvt.put("empty_point_status", "01"); @@ -127,7 +128,7 @@ public class CallEmpReelTask extends AbstractAcsTask { // 更新冷却区出入表 JSONObject jsonCool = coolTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonCool.put("bill_status","50"); + jsonCool.put("bill_status", "50"); jsonCool.put("confirm_optid", SecurityUtils.getCurrentUserId()); jsonCool.put("confirm_optname", SecurityUtils.getCurrentUsername()); jsonCool.put("confirm_time", DateUtil.now()); @@ -158,21 +159,21 @@ public class CallEmpReelTask extends AbstractAcsTask { String point_code2 = form.getString("point_code2"); String point_code3 = form.getString("point_code3"); String point_code4 = form.getString("point_code4"); - if (cutConveyorTask.isSingleTask(point_code1)){ - throw new BadRequestException("点位:"+point_code1+"存在未完成的任务!"); + if (cutConveyorTask.isSingleTask(point_code1)) { + throw new BadRequestException("点位:" + point_code1 + "存在未完成的任务!"); } - if (cutConveyorTask.isSingleTask(point_code2)){ - throw new BadRequestException("点位:"+point_code2+"存在未完成的任务!"); + if (cutConveyorTask.isSingleTask(point_code2)) { + throw new BadRequestException("点位:" + point_code2 + "存在未完成的任务!"); } - if (cutConveyorTask.isSingleTask(point_code3)){ - throw new BadRequestException("点位:"+point_code3+"存在未完成的任务!"); + if (cutConveyorTask.isSingleTask(point_code3)) { + throw new BadRequestException("点位:" + point_code3 + "存在未完成的任务!"); } - if (cutConveyorTask.isSingleTask(point_code4)){ - throw new BadRequestException("点位:"+point_code4+"存在未完成的任务!"); + if (cutConveyorTask.isSingleTask(point_code4)) { + throw new BadRequestException("点位:" + point_code4 + "存在未完成的任务!"); } JSONObject json = new JSONObject(); - json.put("task_id",IdUtil.getSnowflake(1,1).nextId()); + json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); json.put("task_status", "01"); json.put("material_code", form.getString("material_code")); @@ -186,10 +187,11 @@ public class CallEmpReelTask extends AbstractAcsTask { json.put("create_id", currentUserId); json.put("create_name", currentUsername); json.put("create_time", DateUtil.now()); - json.put("priority","1" ); - json.put("acs_task_type","1" ); + json.put("priority", "1"); + json.put("acs_task_type", "1"); tab.insert(json); + this.immediateNotifyAcs(); return json.getString("task_id"); } @@ -201,7 +203,6 @@ public class CallEmpReelTask extends AbstractAcsTask { } - @Override public void cancel(String task_id) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqCallMaterialSendEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqCallMaterialSendEmptyTask.java new file mode 100644 index 000000000..ae248bdd5 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqCallMaterialSendEmptyTask.java @@ -0,0 +1,7 @@ +package org.nl.wms.sch.tasks.fq; + +/** + * 分切呼叫物料并送空轴到冷却暂存区 + */ +public class FqCallMaterialSendEmptyTask { +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqFromLqCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqFromLqCallMaterialTask.java new file mode 100644 index 000000000..53c9ff546 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqFromLqCallMaterialTask.java @@ -0,0 +1,7 @@ +package org.nl.wms.sch.tasks.fq; + +/** + * 分切机从冷却暂存区呼叫物料 + */ +public class FqFromLqCallMaterialTask { +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqToLqSendEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqToLqSendEmptyTask.java new file mode 100644 index 000000000..e4cd77b3f --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/FqToLqSendEmptyTask.java @@ -0,0 +1,7 @@ +package org.nl.wms.sch.tasks.fq; + +/** + * 分切机送空轴到冷却暂存区 + */ +public class FqToLqSendEmptyTask { +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/HxToLqSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/HxToLqSendMaterialTask.java new file mode 100644 index 000000000..312e6eefb --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/HxToLqSendMaterialTask.java @@ -0,0 +1,7 @@ +package org.nl.wms.sch.tasks.fq; + +/** + * 烘箱到冷却区送物料 + */ +public class HxToLqSendMaterialTask { +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/LqToHxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/LqToHxSendMaterialTask.java new file mode 100644 index 000000000..61d9e16ae --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/fq/LqToHxSendMaterialTask.java @@ -0,0 +1,7 @@ +package org.nl.wms.sch.tasks.fq; + +/** + * 冷却到烘箱送物料 + */ +public class LqToHxSendMaterialTask { +} diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index e0ee4bd5b..05e095231 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -113,25 +113,25 @@ @selection-change="crud.selectionChangeHandler" > - - + - + - +