From b187814d7cfa5ace1ed9c203372524c69fe56553 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:11:44 +0800
Subject: [PATCH] 1.完善AGV任务任务下发 2.拣料回库数据更新维护
---
src/main/java/com/zy/common/web/WcsController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9196aa2..24bb2f0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -89,6 +89,13 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+ //鍏ュ簱鏃跺绌烘澘鍑哄簱浠诲姟杩涜瀹屾垚
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()).eq("wrk_sts",110));
+ if (!Cools.isEmpty(wrkMast)) {
+ wrkMast.setWrkSts(15L);//绌烘澘鍑哄簱浠诲姟杞巻鍙叉。
+ wrkMastService.updateById(wrkMast);
+ }
+
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
@@ -311,23 +318,31 @@
if (!tasks.isEmpty()){
return R.error("鏈夊鍫嗗灈鏈烘帴椹崇珯鐐圭殑AGV鎼繍浠诲姟,鏆傛椂鏃犳硶鐢熸垚AGV鎼繍浠诲姟");
}
+ String sourceStaNo = "Q-";
+ if(wrkMast.getStaNo().equals("401")){
+ sourceStaNo = sourceStaNo + "E3";
+ }else if(wrkMast.getStaNo().equals("402")){
+ sourceStaNo = sourceStaNo + "E2";
+ }else if(wrkMast.getStaNo().equals("307")){
+ sourceStaNo = sourceStaNo + "E1";
+ }
//鐢熸垚AGV鎼繍绌烘枡鏋朵换鍔�
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
Date date = new Date();
- String TaskNo = wrkMast.getWrkNo()+"-"+date.getTime();
+ String TaskNo = wrkMast.getWrkNo()+"aa"+date.getTime();
task.setWrkNo(wrkMast.getWrkNo())
.setTaskNo(TaskNo)
.setIoTime(date)
.setWrkSts(301L) // 宸ヤ綔鐘舵�侊細301.浠诲姟涓嬪彂
.setIoType(5) // 鍏ュ嚭搴撶姸鎬侊細 5.鍖哄煙鍒扮珯
- .setTaskType("agv")
+ .setTaskType("AGV琛ョ┖鏂欐灦")
.setIoPri(10D)
.setFullPlt("N") // 婊℃澘锛歒
.setPicking("N") // 鎷ｆ枡
.setExitMk("N")// 閫�鍑�
.setStaNo(wrkMast.getStaNo())
- .setSourceStaNo("E1")//绌烘枡鏋剁紦瀛樺尯E1
+ .setSourceStaNo(sourceStaNo)//绌烘枡鏋剁紦瀛樺尯
.setEmptyMk("Y")// 绌烘澘
.setBarcode("")// 鎵樼洏鐮�
.setLinkMis("N")
--
Gitblit v1.9.1