From 5479f535cd85b9b7c9bb75f0158102d755cb68b5 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Fri, 18 Nov 2022 18:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E7=A2=BE=E6=9C=BA=E9=80=81=E6=96=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java | 4 ++-- .../wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql | 2 +- lms/nladmin-ui/src/views/login.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 7e04169..1cb105f 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 @@ -549,7 +549,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { throw new BadRequestException("托盘类型不能为空！"); } WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); - JSONObject pointObj = point_table.query("vehicle_type='" + vehicle_type + "' and region_code = 'FMQ'").uniqueResult(0); + JSONObject pointObj = point_table.query("vehicle_type='" + vehicle_type + "' and region_code = 'RGCPQ'").uniqueResult(0); if (ObjectUtil.isEmpty(pointObj)) { throw new BadRequestException("为找到类型为'" + vehicle_type + "' 的设备点位"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java index a389333..f96d884 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java @@ -242,9 +242,9 @@ public class HnSendMaterialTask extends AbstractAcsTask { param1.put("region_code", "KLHJ"); param1.put("vehicle_type", "%" + vehicle_type + "%"); //1、查找困料货架是否有响应的载具类型和对应的物料 - JSONObject endPoint = WQL.getWO("QSCH_hnCallEmptyVehicle_01").addParamMap(param1).process().uniqueResult(0); + JSONObject endPoint = WQL.getWO("QSCH_hnSendMaterial_01").addParamMap(param1).process().uniqueResult(0); if (ObjectUtil.isEmpty(endPoint)) { - taskObj.put("remark", "困料货架无可用货位!"); + taskObj.put("remark", "困料货架无可用货位"); taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql index 592893c..b9158ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql @@ -59,7 +59,7 @@ IF 输入.flag = "1" OPTION 输入.region_code <> "" p.region_code = 输入.region_code ENDOPTION - ORDER BY col_num,row_num,layer_num + ORDER BY p.point_code ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue index ba0c1ea..caa6d06 100644 --- a/lms/nladmin-ui/src/views/login.vue +++ b/lms/nladmin-ui/src/views/login.vue @@ -9,7 +9,7 @@ - +