From d509f946b890d64f5b0733c99d8c516c70a654f9 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Wed, 28 Sep 2022 21:39:30 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E7=89=A9=E6=96=99=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB=EF=BC=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=202=20=E7=A0=81=E5=9E=9B=E6=9C=BA=E6=A2=B0?= =?UTF-8?q?=E6=89=8B=E4=B8=8A=E6=96=99=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E6=96=AD=E4=B8=A4=E4=B8=AA=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=83=BD=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=203=20=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E7=82=B9=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D=E5=B8=A6=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BB=93=E4=BD=8D=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sch/manage/buss/CallMaterialTask.java | 42 ++++++++++++------- .../nl/wms/sch/service/wql/SCH_Point_01.wql | 8 ++-- .../java/org/nl/wms/st/ivt/wql/QIVT_001.wql | 8 ++-- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index c91f0fd..e8efa0e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -11,6 +11,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; import org.nl.utils.SpringContextHolder; import org.nl.wms.WorkProcedureEnum; +import org.nl.wms.common.PointUpdateUtil; import org.nl.wms.common.SortingUtil; import org.nl.wms.common.StructFindUtil; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; @@ -330,24 +331,37 @@ public class CallMaterialTask extends AbstractAcsTask { JSONObject outStructObj = StructFindUtil.getOutStruct(param); if (ObjectUtil.isEmpty(outStructObj)) { //假如没有货，且下料位两个都为空下发acs动作信号 + WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl(); + //更新分拣机械手 上下料位置的点位状态 + JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0); + PointUpdateUtil.updatePoint(parr); if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) { - JSONObject jo = new JSONObject(); - JSONArray arr = new JSONArray(); - jo.put("device_code", "FJJXS1"); - jo.put("code", "to_feedback"); - jo.put("value", "10"); - arr.add(jo); - wmsToAcsService.action(arr); + String point_status01 = point_table.query("point_code ='FJJXSSLW101'").uniqueResult(0).getString("point_status"); + String point_status02 = point_table.query("point_code ='FJJXSSLW102'").uniqueResult(0).getString("point_status"); + if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) { + JSONObject jo = new JSONObject(); + JSONArray arr = new JSONArray(); + jo.put("device_code", "FJJXS1"); + jo.put("code", "to_feedback"); + jo.put("value", "10"); + arr.add(jo); + wmsToAcsService.action(arr); + } } if (StrUtil.equals(next_point_code, "FJJXSSLW301") || StrUtil.equals(next_point_code, "FJJXSSLW301")) { - JSONObject jo = new JSONObject(); - JSONArray arr = new JSONArray(); - jo.put("device_code", "FJJXS3"); - jo.put("code", "to_feedback"); - jo.put("value", "10"); - arr.add(jo); - wmsToAcsService.action(arr); + String point_status01 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status"); + String point_status02 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status"); + if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) { + JSONObject jo = new JSONObject(); + JSONArray arr = new JSONArray(); + jo.put("device_code", "FJJXS3"); + jo.put("code", "to_feedback"); + jo.put("value", "10"); + arr.add(jo); + wmsToAcsService.action(arr); + } + } throw new BadRequestException("未找到合适的出库仓位！"); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql index 0ec66f5..0868d50 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql @@ -95,7 +95,7 @@ IF 输入.flag = "3" PAGEQUERY SELECT DISTINCT - structattr.struct_id, + structattr.struct_id, structattr.struct_code, structattr.struct_name, point.area_type, @@ -103,14 +103,12 @@ FROM st_ivt_structattr structattr LEFT JOIN sch_base_point point ON point.point_id = structattr.struct_id - LEFT JOIN ST_IVT_StructRelaMaterial rule ON rule.struct_id = structattr.struct_id LEFT JOIN ST_IVT_StructRelaVehicleType rulevehicle ON rulevehicle.struct_id = structattr.struct_id - left join st_rule_IOdisStruct ruledis on ruledis.struct_uuid = structattr.struct_id + LEFT JOIN st_rule_IOdisStruct ruledis ON ruledis.struct_uuid = structattr.struct_id WHERE point.lock_type = '00' - AND (point.vehicle_code = '' or point.vehicle_code is null) + AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL ) AND point.point_status = '00' - AND rule.material_id = 输入.material_id AND point.area_type = 输入.area_type AND rulevehicle.vehicle_type = 输入.vehicle_type OPTION 输入.search <> "" diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql index 6d4fb2a..0ab21ec 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql @@ -75,13 +75,13 @@ WHERE 1=1 OPTION 输入.material_name <> "" - (material.material_name like "%"输入.material_name"%" or - material.material_code like "%"输入.material_name"%") + (material.material_name like "%" 输入.material_name "%" or + material.material_code like "%" 输入.material_name "%") ENDOPTION OPTION 输入.struct_name <> "" - (point.point_code like "%"输入.struct_name"%" or - point.point_name like "%"输入.struct_name"%") + (point.point_code like "%" 输入.struct_name "%" or + point.point_name like "%" 输入.struct_name "%") ENDOPTION OPTION 输入.storagevehicle_code <> "" ivt.vehicle_code like "%"输入.storagevehicle_code"%"