From b6681bc12173c1179d0185805ba461211472ac18 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 04 一月 2026 09:31:16 +0800
Subject: [PATCH] 1.完善出库任务呼叫agv 2.完善agv任务下发 3.等等
---
src/main/java/com/zy/common/web/WcsController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bcad0a9..5166311 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -66,6 +66,9 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getSourceStaNo())||param.getBarcode().length()==8) {
+ return R.error("鎵樼洏涓嶈兘涓虹┖鎴栬�呮墭鐩樼爜涓嶄负鍏綅");
+ }
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
if (Cools.isEmpty(param.getBarcode())) {
@@ -89,10 +92,17 @@
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.setLocType2(param.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto();
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ sourceStaNo.setLocType1(param.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo,param.getBarcode());
StartupDto dto = null;
switch (param.getIoType()) {
@@ -156,7 +166,7 @@
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(12);
emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
- WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,50);
+ WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam,50,"");
return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
@@ -250,7 +260,7 @@
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
- StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
+ StartupDto dto =commonService.getLocNoNew(10,devpNo,locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -311,23 +321,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