From fd8a1a2fe7c3d2541180b051c9dd6fa62429e3cb Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Wed, 12 Oct 2022 15:07:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pdm/service/impl/ProducetaskServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java index ea32306..7dd0e80 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java @@ -299,15 +299,17 @@ public class ProducetaskServiceImpl implements ProducetaskService { } else { taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0); } - taskObj.put("product_type", "wms"); WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class); JSONArray arr = new JSONArray(); arr.add(taskObj); wmsToAcsService.sendProduceTask(arr); - JSONObject map = new JSONObject(); - map.put("producetask_status", "02"); + String producetask_status = "02"; + if (StrUtil.equals(device_id, "1560189462410039296")) { + producetask_status = "04"; + } + map.put("producetask_status", producetask_status); map.put("update_optid", currentUserId); map.put("update_optname", nickName); map.put("update_time", now); From d74c2c4f24bccc5b0c331be080aeaaf849167d2a Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Wed, 12 Oct 2022 15:30:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=85=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=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/common/wql/QSTRUCT_RULE.wql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 2c7a621..41efb88 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -219,11 +219,10 @@ IF 输入.flag = "6" AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL ) AND task.task_code IS NULL AND point.point_status = '00' - and point.material_code<>'0' OPTION 输入.material_type <> "" point.material_type = 输入.material_type ENDOPTION - OPTION 输入.material_code <> "" + OPTION point.material_code <> "0" point.material_code = 输入.material_code ENDOPTION ENDSELECT