From 05bf2e296b973a4381c38b9c494152215526a3e9 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 19 Oct 2023 16:04:40 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E6=B7=B1=E5=9D=91?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java | 2 +- .../service/device/dao/mapper/PdmBiDeviceMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java index 350865aa..e929d2c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java @@ -87,7 +87,7 @@ public class AgvInstService { collect = deviceService.workproceduceDevicesQty(query); } - log.info("调度任务分配点位信息：", JSON.toJSONString(collect)); + log.info("调度任务分配点位信息:{}", JSON.toJSONString(collect)); List> list = collect.stream().filter(stringStringMap -> stringStringMap.get("tasks") == null || stringStringMap.get("materials").contains(task.getString("material_id"))).collect(Collectors.toList()); task.put("acs_task_type",AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); task.put("is_send","1"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml index 3286477d..3ff3ff76 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml @@ -64,7 +64,7 @@ and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null) GROUP BY pdm_bi_device.device_code - HAVING currentQty > #{qty} and pdm_bi_device.inupperlimit_qty > currentQty + HAVING currentQty > #{qty} and pdm_bi_device.inupperlimit_qty >= currentQty