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