root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:修改深坑相关任务

Browse Source
This commit is contained in:
zhangzhiqiang
2023-10-19 16:04:40 +08:00
parent 75fc9bddc9
commit 05bf2e296b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java
View File

@@ -87,7 +87,7 @@ public class AgvInstService {
collect = deviceService.workproceduceDevicesQty(query); collect = deviceService.workproceduceDevicesQty(query);
} }
log.info("调度任务分配点位信息：", JSON.toJSONString(collect)); log.info("调度任务分配点位信息:{}", JSON.toJSONString(collect));
List<Map<String, String>> list = collect.stream().filter(stringStringMap -> stringStringMap.get("tasks") == null || stringStringMap.get("materials").contains(task.getString("material_id"))).collect(Collectors.toList()); List<Map<String, String>> 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("acs_task_type",AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode());
task.put("is_send","1"); task.put("is_send","1");

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
View File

@@ -64,7 +64,7 @@
and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null) and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null)
</if> </if>
GROUP BY pdm_bi_device.device_code 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
</select> </select>
<select id="getDeviceByPoint" resultType="org.nl.wms.product_manage.service.device.dao.PdmBiDevice"> <select id="getDeviceByPoint" resultType="org.nl.wms.product_manage.service.device.dao.PdmBiDevice">