From f60cbaae6ccf1cae994b81508246b839f442ffad Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 24 Dec 2022 19:02:32 +0800 Subject: [PATCH] =?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 --- .../sch/tasks/sendMaterial/YqxSendMaterialTask.java | 4 ++++ .../sendMaterial/wql/QSCH_yqxSendMaterial_01.wql | 12 ++++++++++++ .../org/nl/wms/sch/tasks/utils/PointUpdateUtil.java | 8 +++++--- lms/nladmin-ui/public/config.js | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java index fda2ebe..edea920 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java @@ -21,6 +21,7 @@ import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.RegionTypeEnum; +import org.nl.wms.sch.tasks.utils.PointUpdateUtil; import org.nl.wms.util.IdUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -108,6 +109,9 @@ public class YqxSendMaterialTask extends AbstractAcsTask { for (int i = 0; i < taskArry.size(); i++) { JSONObject taskObj = taskArry.getJSONObject(i); String task_id = taskObj.getString("task_id"); + // 更新点位 + JSONArray jsonArray = WQL.getWO("QSCH_yqxSendMaterial_01").addParam("flag", "2").process().getResultJSONArray(0); + PointUpdateUtil.updatePoint(jsonArray); JSONObject param = new JSONObject(); param.put("flag", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql index 0e1582e..e78505e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql @@ -53,10 +53,22 @@ lock_type = '1' AND is_used = '1' AND is_delete = '0' + AND point_status = '1' and (point_code = 'SSX01A2' or point_code = 'SSX02A1') ENDSELECT ENDQUERY ENDIF + IF 输入.flag = "2" + QUERY + SELECT + p.point_code as device_code + FROM + SCH_BASE_Point p + WHERE + region_code = 'SSX01' + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java index 8730536..9554e22 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java @@ -29,13 +29,15 @@ public class PointUpdateUtil { JSONObject pointObj = deviceDatas.getJSONObject(j); String point_code = pointObj.getString("device_code"); JSONObject pointObj2 = pointTable.query("point_code = '" + point_code + "'").uniqueResult(0); - if (point_code.equals(RegionTypeEnum.DPJQB.getCode())) { // 碟盘机 + if (pointObj2.getString("region_code").equals(RegionTypeEnum.DPJQB.getCode())) { // 碟盘机 String vehicleNum = pointObj.getString("vehicle_num"); pointObj2.put("vehicle_qty", vehicleNum); pointTable.update(pointObj2); + } else if (pointObj2.getString("region_code").equals(RegionTypeEnum.SSX.getCode())) { + String move = pointObj.getString("move"); + pointObj2.put("point_status", Integer.getInteger(move) + 1); + pointTable.update(pointObj2); } - - } } } diff --git a/lms/nladmin-ui/public/config.js b/lms/nladmin-ui/public/config.js index c4d32ea..cd9be3f 100644 --- a/lms/nladmin-ui/public/config.js +++ b/lms/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://127.0.0.1:8010' + VUE_APP_BASE_API: 'http://192.168.4.117:8010' }, prod: { - VUE_APP_BASE_API: 'http://127.0.0.1:8010' + VUE_APP_BASE_API: 'http://192.168.4.117:8010' }