From cb98548ecc0fa2d4388eb67528b98be39670bc0c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 20 七月 2023 10:05:02 +0800
Subject: [PATCH] agv 有单入库功能
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 1be3b40..a0c3d12 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -34,11 +34,14 @@
AgvWaitPakinService agvWaitPakinService;
@Autowired
AgvWaitPakinLogService agvWaitPakinLogService;
+ @Autowired
+ OrderService orderService;
@Transactional
public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
int wrkNo = agvWrkMast.getWrkNo();
String barcode = agvWrkMast.getBarcode();
+ String orderNo = getOrderNoByWrkNo(wrkNo);
//淇敼宸ヤ綔妗ｇ姸鎬佷负206.搴撳瓨鏇存柊瀹屾垚
agvWrkMast.setWrkSts(206L);
@@ -60,6 +63,9 @@
//鍒犻櫎鍏ュ簱閫氱煡妗�
agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("zpallet",barcode));
+ //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
+ orderService.checkComplete(orderNo);
+
return SUCCESS;
}
@@ -75,12 +81,18 @@
agvWrkMast.setWrkSts((long)202);
//淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
+ agvWrkMastService.updateById(agvWrkMast);
});
- agvWrkMastService.updateBatchById(agvWrkMastList);
+ //agvWrkMastService.updateBatchById(agvWrkMastList);
return SUCCESS;
}
return FAIL;
}
+
+ private String getOrderNoByWrkNo(int wrkNo){
+ AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
+ return agvWrkDetl.getOrderNo();
+ }
}
--
Gitblit v1.9.1