From 404e71d265efa3687604ed53eb7b9682751a6318 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Thu, 1 Sep 2022 13:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/WorkProcedureEnum.java | 3 ++- .../src/main/java/org/nl/wms/common/StructFindUtil.java | 7 +++---- .../src/main/java/org/nl/wms/sch/manage/AreaEnum.java | 7 ++++--- .../org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java | 2 +- .../org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java | 9 +++++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/WorkProcedureEnum.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/WorkProcedureEnum.java index 7450757..7c3e9d6 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/WorkProcedureEnum.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/WorkProcedureEnum.java @@ -12,7 +12,8 @@ public enum WorkProcedureEnum { YZGX(2, "1514444247439380480", "02", "压制工序", ""), SZGX(3, "1514444321896665088", "03", "烧制工序", ""), FJGX(4, "1514444386174373888", "04", "分拣工序", ""), - DPGX(4, "1514444386174373888", "05", "分拣工序", ""); + DPGX(4, "1514444386174373888", "05", "叠盘工序", ""), + CPGX(4, "1514444386174373888", "06", "拆盘工序", ""); //顺序号 private int index; //工序标识 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index 8958fe4..7255776 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -66,7 +66,7 @@ public class StructFindUtil { throw new BadRequestException("托盘不能为空！"); } if (StrUtil.equals(point_code, "KGTPDDW05")) { - JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0); + JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTCPQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0); PointUpdateUtil.updatePoint(pointarr); } //根据托盘找托盘类型， @@ -93,8 +93,7 @@ public class StructFindUtil { //如果是堆叠位5 需要更新 设备状态 if(StrUtil.equals(point_code,"KGTDDW05")){ JSONArray pointarr = WQL.getWO("ACSTOMES_001") - .addParam("area_type", AreaEnum.KGTDDQ.getCode()) - .addParam("point_code","KGTDDW05") + .addParam("area_type", AreaEnum.KGTCPQ.getCode()) .addParam("flag", "2").process().getResultJSONArray(0); PointUpdateUtil.updatePoint(pointarr); } @@ -105,7 +104,7 @@ public class StructFindUtil { JSONObject result = new JSONObject(); //如果是堆叠位5 需要更新 设备状态 if (StrUtil.equals(point_code, "KGTDDW05")) { - JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0); + JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTCPQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0); PointUpdateUtil.updatePoint(pointarr); result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "6") .addParam("area_type", area_type) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AreaEnum.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AreaEnum.java index f8f4e00..1b135f7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AreaEnum.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AreaEnum.java @@ -14,10 +14,11 @@ public enum AreaEnum { YZQY("22", "压制区域"), YYJLZ("23", "液压机料盅架"), YQU("24", "窑区域"), - KGTDDQ("25", "空钢托堆叠区"), + KGTCPQ("25", "空钢拆盘区"), ZDCDX("26", "自动柴垛线"), - RGCPQ("26", "人工拆盘区域"), - BZQ("26", "包装区"); + RGCPQ("27", "人工拆盘区域"), + BZQ("28", "包装区"), + KGTPDPQ("29", "空钢托叠盘区"); private final String name; private final String code; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java index 56522a1..64cedc7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java @@ -212,7 +212,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { // 压制工序 case YZGX: vehicle_type = VehicleTypeEnum.GTP.getCode(); - start_area = AreaEnum.KGTDDQ.getCode(); + start_area = AreaEnum.KGTCPQ.getCode(); start_point_code = "KGTDDW05"; break; //烧制工序 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java index e138990..a247419 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java @@ -183,8 +183,13 @@ public class SendEmptyVehicleTask extends AbstractAcsTask { break; //分拣工序 case FJGX: - next_area = AreaEnum.KGTDDQ.getCode(); - next_point_code = "KGTPDDW05"; + next_area = AreaEnum.KGTPDPQ.getCode(); + next_point_code = "KGTDTW01"; + break; + //拆盘工序 + case DPGX: + next_area = AreaEnum.KGTCPQ.getCode(); + next_point_code = "KGTDDW01"; break; default: next_area = AreaEnum.KLHJ.getCode();