From 45d602719964509214d06ec5173f23e5307d5dfe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:10 +0800
Subject: [PATCH] 无空库位时，不做空板入库操作
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 171 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index ef79460..e809dfa 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -3,44 +3,52 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.AgvWaitPakin;
-import com.zy.asrs.entity.AgvWrkDetl;
-import com.zy.asrs.entity.AgvWrkMast;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Slf4j
@Service
public class AgvWrkMastHandler extends AbstractHandler<String> {
+ @Value("${agvBasDev.maxWorkNum}")
+ private int maxWrokNum;
+
@Autowired
- AgvWrkMastService agvWrkMastService;
+ private AgvWrkMastService agvWrkMastService;
@Autowired
- AgvLocMastService agvLocMastService;
+ private AgvLocMastService agvLocMastService;
@Autowired
- AgvLocDetlService agvLocDetlService;
+ private AgvLocDetlService agvLocDetlService;
@Autowired
- AgvWrkMastLogService agvWrkMastLogService;
+ private AgvWrkMastLogService agvWrkMastLogService;
@Autowired
- AgvWrkDetlService agvWrkDetlService;
+ private AgvWrkDetlService agvWrkDetlService;
@Autowired
- AgvWrkDetlLogService agvWrkDetlLogService;
+ private AgvWrkDetlLogService agvWrkDetlLogService;
@Autowired
- AgvWaitPakinService agvWaitPakinService;
+ private AgvWaitPakinService agvWaitPakinService;
@Autowired
- AgvWaitPakinLogService agvWaitPakinLogService;
+ private AgvWaitPakinLogService agvWaitPakinLogService;
@Autowired
- OrderService orderService;
+ private OrderService orderService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvWorkService agvWorkService;
@Transactional
public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -51,13 +59,9 @@
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
agvWrkMast.setWrkSts(207L);
agvWrkMastService.updateById(agvWrkMast);
- if(agvWrkMast.getIoType() == 10){
- // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D");
- }else{
- //淇敼鐩爣搴撲綅鐘舵�佷负F.鍦ㄥ簱
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F");
- }
+ // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
+ String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F";
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),locSts,agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
agvWrkMastLogService.save(agvWrkMast);
//鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
@@ -78,8 +82,14 @@
//鏇存柊搴撳瓨鏄庣粏
agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O");
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
}
+
+ //鍒犻櫎AGV宸ヤ綔妗�
+ agvWrkMastService.deleteById(wrkNo);
+ //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
+ agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
+
if(!isJSON(orderNo)){
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
orderService.checkComplete(orderNo);
@@ -90,11 +100,6 @@
orderService.checkComplete(o);
});
}
-
- //鍒犻櫎AGV宸ヤ綔妗�
- agvWrkMastService.deleteById(wrkNo);
- //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
- agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
return SUCCESS;
}
@@ -108,10 +113,18 @@
agvWrkMast.setWrkSts(207L);
agvWrkMastService.updateById(agvWrkMast);
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O");
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
if(agvWrkMast.getIoType() == 101){
//鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+ //鐢熸垚绌烘澘鍏ュ簱浠诲姟
+ Short containerType = Short.valueOf(agvWrkMast.getBarcode().substring(0, 2));
+ try {
+ agvWorkService.emptyPlateIn(agvWrkMast.getLocNo(),agvWrkMast.getBarcode(),containerType,9527L,true);
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error(e.getMessage());
+ }
}
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
@@ -136,46 +149,75 @@
}
@Transactional
- public ReturnT<String> startPutWayWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
+ @Synchronized
+ public ReturnT<String> startPutWayWrk(AgvWrkMast agvWrkMast) throws IOException {
- int startWwrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
-
- int code = agvWrkMastService.containerMove(agvWrkMastList);
-
- if(code == 0){
- agvWrkMastList.forEach(agvWrkMast -> {
- //202.RCS鍙栬揣涓�
- agvWrkMast.setWrkSts(202L);
- agvWrkMastService.updateById(agvWrkMast);
- if(agvWrkMast.getIoType() == 1){
- //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
- agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
- }
-
- });
- //agvWrkMastService.updateBatchById(agvWrkMastList);
-
- return SUCCESS;
+ //涓嬪彂浠诲姟
+ int startWrkCode = agvWrkMastService.startWrk(agvWrkMast);
+ if(startWrkCode != 0){
+ throw new CoolException("浠诲姟涓嬪彂澶辫触");
}
- return FAIL;
+ agvWrkMast.setWrkSts(202L);
+ agvWrkMastService.updateById(agvWrkMast);
+ if(agvWrkMast.getIoType() == 1){
+ //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
+ agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
+ }
+ return SUCCESS;
+
}
+// @Transactional
+// public ReturnT<String> startCarryWrk(AgvWrkMast agvWrkMast) throws IOException {
+// //log.info(agvWrkMastList.toString());
+// //浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗�
+// //agvWrkMastList = filter(agvWrkMastList);
+// int code = agvWrkMastService.startWrk(agvWrkMast);
+// //log.info(agvWrkMastList.toString());
+// if (Cools.isEmpty(agvWrkMastList)){
+// return SUCCESS;
+// }
+// if(code == 0){
+// agvWrkMastList.forEach(agvWrkMast -> {
+// //202.RCS鍙栬揣涓�
+// agvWrkMast.setWrkSts(202L);
+// agvWrkMastService.updateById(agvWrkMast);
+// });
+// //agvWrkMastService.updateBatchById(agvWrkMastList);
+//
+// return SUCCESS;
+// }
+//
+// return FAIL;
+// }
+
+ @Synchronized
@Transactional
- public ReturnT<String> startCarryWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
- int code = agvWrkMastService.startWrk(agvWrkMastList,"carry");
- if(code == 0){
- agvWrkMastList.forEach(agvWrkMast -> {
- //202.RCS鍙栬揣涓�
- agvWrkMast.setWrkSts(202L);
+ public ReturnT<String> dealWatiWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
+
+ agvWrkMastList.forEach(agvWrkMast -> {
+ //鏌ヨ璇ョ珯鐐规墍鏈夋殏瀛樹綅鍦ㄥ伐浣滄。涓嚭鐜扮殑娆℃暟
+ List<Map<String, Object>> devNoMaps = agvBasDevpService.selectDevNoAndNumBystationCode(agvWrkMast.getLocNo());
+ //鍙栫涓�涓殏瀛樹綅锛屽苟鏌ヨ鍏舵鏁颁笌閰嶇疆鐨勬鏁板仛姣旇緝
+ Map<String, Object> devNoMap = devNoMaps.get(0);
+ if((int)devNoMap.get("num") < maxWrokNum){
+ agvWrkMast.setLocNo(devNoMap.get("dev_no").toString());
agvWrkMastService.updateById(agvWrkMast);
- });
- //agvWrkMastService.updateBatchById(agvWrkMastList);
+ log.info("after锛�" + devNoMap.toString() + ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
+ }
+ });
- return SUCCESS;
- }
+ return SUCCESS;
+ }
- return FAIL;
+ @Synchronized
+ @Transactional
+ public ReturnT<String> autoEmptyOut(AgvBasDevp agvBasDevp) {
+
+ agvWorkService.emptyPlateOut(agvBasDevp.getDevNo(),0,9527L);
+
+ return SUCCESS;
}
private String getOrderNoByWrkNo(int wrkNo){
@@ -200,4 +242,17 @@
}
}
}
+
+ private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){
+ return agvWrkMastList.stream().filter(agvWrkMast -> {
+ AgvWrkMast agvWrkMastWroking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", agvWrkMast.getLocNo()));
+ if(!Cools.isEmpty(agvWrkMastWroking) && agvWrkMastWroking.getWrkSts()<=202){
+ System.out.println("source_loc_no > 1");
+ return false;
+ }
+ log.info(agvWrkMast.toString());
+ int num = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvWrkMast.getLocNo()));
+ return num <= maxWrokNum;
+ }).collect(Collectors.toList());
+ }
}
--
Gitblit v1.9.1