From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/controller/OutController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e222a56..5a603ab 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -232,12 +232,13 @@
i++;
//閰嶇洏鍑哄簱鍗曚娇鐢紝涓嬪彂闇�瑕佸嚭鐨勭┖鏉夸换鍔�
if (orderPakout.getDocType() == 11) {
- if (size<5&&i==size){
+ if (i==size){
for (;j<=orderPakout.getPayType();j++){
String bar="";
- if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
- bar = "A01";
- }
+ //鍏蜂綋寰呭畾
+// if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
+// bar = "A01";
+// }
LocMast locMast = new LocMast();
if(Cools.isEmpty(bar)){
locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
@@ -254,11 +255,17 @@
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(303);
emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});
- WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri);
+ String agvSta = "";
+ if(locMast.getLocType3()==2){
+
+ }else {
+ agvSta = orderPakout.getCstmrName();//agv鐩爣绔欑偣浣嶇疆
+ }
+ WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri,agvSta);
ioPri--;
}
- }else if(i == 5){
+ }else if(i == 4){
String bar="";
if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
bar = "A01";
@@ -279,7 +286,13 @@
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(303);
emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}});
- WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri);
+ String agvSta = "";
+ if(locMast.getLocType3()==2){
+
+ }else {
+ agvSta = orderPakout.getCstmrName();//agv鐩爣绔欑偣浣嶇疆
+ }
+ WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,ioPri,agvSta);
ioPri--;
}
}
--
Gitblit v1.9.1