From 870eb7cb47e510594d5d0937f14e5a3f7739cd77 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 19:28:51 +0800
Subject: [PATCH] # 库位状态
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 51b9d57..d89f61f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -600,14 +600,30 @@
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
// 绉诲簱鍙栨秷
- }else if(wrkMast.getIoType() == 108) {
+ } else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
//婧愬簱浣�
String locNo = wrkMast.getSourceLocNo();
- //鐩爣绔欑偣
- String devNo = wrkMast.getLocNo();
+
+ // 鐩爣搴撲綅
+ String targetLocNo = wrkMast.getLocNo();
agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
- if(devNo.contains("@")){
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ // 鑷姩璋冩嫧鍑哄簱鍙栨秷
+ } else if(wrkMast.getIoType() == 108 ) {
+ // 婧愬簱浣�
+ String locNo = wrkMast.getSourceLocNo();
+ // 鐩爣搴撲綅
+ String targetLocNo = wrkMast.getLocNo();
+ agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
+ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ // 鏇存柊璁㈠崟
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ }
}
//鍑哄簱鍙栨秷
} else {
@@ -616,9 +632,7 @@
//鐩爣绔欑偣
String devNo = wrkMast.getLocNo();
agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
- if(devNo.contains("@")){
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
- }
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
}
if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){
--
Gitblit v1.9.1