From c5a4ca275cbf2c20d5ef4023970723b799015e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 31 Aug 2022 17:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=A2=E6=89=98=E5=89=8D=E7=BC=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20KGTDDW05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/common/StructFindUtil.java | 4 ++-- .../java/org/nl/wms/ext/acs/rest/AcsToWmsController.java | 4 ++-- .../src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql | 7 +++++-- .../org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) 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 b6d1270..c90f966 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 @@ -95,8 +95,8 @@ public class StructFindUtil { String vehicle_type = jsonObject.getString("vehicle_type"); String point_code = jsonObject.getString("point_code"); //如果是堆叠位5 需要更新 设备状态 - if(StrUtil.equals(point_code,"KGTPDDW05")){ - JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0); + if(StrUtil.equals(point_code,"KGTDDW05")){ + JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0); PointUpdateUtil.updatePoint(pointarr); } if (StrUtil.isEmpty(area_type)) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 5185bf7..b1b7391 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -36,7 +36,7 @@ public class AcsToWmsController { public ResponseEntity receiveTaskFromAcs(@RequestBody Map whereJson) { acsToWmsService.receiveTaskFromAcs(whereJson); JSONObject result = new JSONObject(); - result.put("status", "200"); + result.put("status", HttpStatus.OK.value()); result.put("message", "发送任务成功"); return new ResponseEntity<>(result, HttpStatus.OK); } @@ -47,7 +47,7 @@ public class AcsToWmsController { public ResponseEntity manipulatorApply(@RequestBody Map whereJson) { acsToWmsService.manipulatorApply(whereJson); JSONObject result = new JSONObject(); - result.put("status", "200"); + result.put("status", HttpStatus.OK.value()); result.put("message", "发送任务成功"); return new ResponseEntity<>(result, HttpStatus.OK); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql index f387989..db95d7a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql @@ -13,9 +13,11 @@ ################################################# ## 表字段对应输入参数 ################################################# - 输入.flag TYPEAS s_string - 输入.workprocedure_id TYPEAS s_string + 输入.flag TYPEAS s_string + 输入.workprocedure_id TYPEAS s_string 输入.material_id TYPEAS s_string + 输入.area_type TYPEAS s_string + 输入.point_code TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -71,6 +73,7 @@ sch_base_point point WHERE 1=1 + AND point.is_delete = '0' OPTION 输入.area_type <> "" point.area_type = 输入.area_type ENDOPTION 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 f46aaaf..56522a1 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 @@ -213,7 +213,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { case YZGX: vehicle_type = VehicleTypeEnum.GTP.getCode(); start_area = AreaEnum.KGTDDQ.getCode(); - start_point_code = "KGTPDDW05"; + start_point_code = "KGTDDW05"; break; //烧制工序 case SZGX: