From 83b2c23efd1c1ba3d995193b3240f3d868f4d592 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 22 八月 2023 16:28:34 +0800
Subject: [PATCH] AGV出入库作业 库存汇总页面 库存规则 分析页加上AGV数据 AGV库存明细统计 AGV库位地图
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 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 8084635..c49c3ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -46,11 +46,16 @@
String barcode = agvWrkMast.getBarcode();
String orderNo = getOrderNoByWrkNo(wrkNo);
- //淇敼宸ヤ綔妗ｇ姸鎬佷负206.搴撳瓨鏇存柊瀹屾垚
- agvWrkMast.setWrkSts(206L);
+ //淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
+ agvWrkMast.setWrkSts(207L);
agvWrkMastService.updateById(agvWrkMast);
- //淇敼鐩爣搴撲綅鐘舵�佷负F.鍦ㄥ簱
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F");
+ if(agvWrkMast.getIoType() == 10){
+ // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D");
+ }else{
+ //淇敼鐩爣搴撲綅鐘舵�佷负F.鍦ㄥ簱
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F");
+ }
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
agvWrkMastLogService.save(wrkNo);
//鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
@@ -59,6 +64,7 @@
agvWrkMastService.deleteById(wrkNo);
//鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
+ //绫诲瀷涓哄嚭搴撴椂
if(agvWrkMast.getIoType() == 1){
//鏇存柊鐩爣搴撲綅鏄庣粏
agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo);
@@ -66,7 +72,13 @@
agvWaitPakinLogService.save(barcode);
//鍒犻櫎鍏ュ簱閫氱煡妗�
agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("zpallet",barcode));
-
+ }
+ //绫诲瀷涓哄簱浣嶇Щ杞椂
+ if(agvWrkMast.getIoType() == 11){
+ //鏇存柊搴撳瓨鏄庣粏
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+ //淇敼婧愬簱浣嶇姸鎬佷负O
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O");
}
if(!isJSON(orderNo)){
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
@@ -82,17 +94,21 @@
return SUCCESS;
}
+
@Transactional
public ReturnT<String> completedCarryWrk(AgvWrkMast agvWrkMast) {
int wrkNo = agvWrkMast.getWrkNo();
String orderNo = getOrderNoByWrkNo(wrkNo);
- //淇敼宸ヤ綔妗ｇ姸鎬佷负206.搴撳瓨鏇存柊瀹屾垚
- agvWrkMast.setWrkSts(206L);
+ //淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
+ agvWrkMast.setWrkSts(207L);
agvWrkMastService.updateById(agvWrkMast);
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O");
- //鏇存柊鐩爣搴撲綅鏄庣粏
- agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+ if(agvWrkMast.getIoType() == 101){
+ //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
+ agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
+ }
+
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
agvWrkMastLogService.save(wrkNo);
//鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
@@ -124,7 +140,7 @@
if(code == 0){
agvWrkMastList.forEach(agvWrkMast -> {
//202.RCS鍙栬揣涓�
- agvWrkMast.setWrkSts((long)202);
+ agvWrkMast.setWrkSts(202L);
agvWrkMastService.updateById(agvWrkMast);
if(agvWrkMast.getIoType() == 1){
//淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
@@ -146,7 +162,7 @@
if(code == 0){
agvWrkMastList.forEach(agvWrkMast -> {
//202.RCS鍙栬揣涓�
- agvWrkMast.setWrkSts((long)202);
+ agvWrkMast.setWrkSts(202L);
agvWrkMastService.updateById(agvWrkMast);
});
//agvWrkMastService.updateBatchById(agvWrkMastList);
@@ -159,16 +175,10 @@
private String getOrderNoByWrkNo(int wrkNo){
AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
+ if(Cools.isEmpty(agvWrkDetl)){
+ return null;
+ }
return agvWrkDetl.getOrderNo();
- }
-
- public static void main(String[] args) {
- String order = "[{\"anfme\":50.0,\"orderNo\":\"CS110011001111\"},{\"anfme\":50.0,\"orderNo\":\"CS110011001110\"}]";
- List<Map> maps = JSONArray.parseArray(order, Map.class);
- maps.forEach(map -> {
- Object orderNo = map.get("orderNo");
- System.out.println(orderNo );
- });
}
private boolean isJSON(String str) {
--
Gitblit v1.9.1