From d87f68eb535935814f287b3740474e7eb24b3643 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 22 十一月 2023 09:10:23 +0800 Subject: [PATCH] 自动补货流程更新 --- src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java index ff1c6b5..c98b79c 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java @@ -45,6 +45,9 @@ @Value("${agv.containerArrivedPath}") private String containerArrivedPath; + @Value("${agvBasDev.maxWorkNum}") + private int maxWrokNum; + @Autowired AgvWrkMastMapper agvWrkMastMapper; @Autowired @@ -73,6 +76,9 @@ } public int startWrk(List<AgvWrkMast> agvWrkMastList, String taskType) throws IOException { + + //浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗� + agvWrkMastList = filter(agvWrkMastList); AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam(); agvTaskCreateParam.setTaskType(taskType); @@ -148,6 +154,13 @@ return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)); } + private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){ + return agvWrkMastList.stream().filter(agvWrkMast -> { + int num = this.selectCount(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvWrkMast.getLocNo())); + return num <= maxWrokNum; + }).collect(Collectors.toList()); + } + private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){ //寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆 for(AgvWrkMast agvWrkMast : agvWrkMastList){ -- Gitblit v1.9.1