From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
index f93c977..defe85f 100644
--- a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
+++ b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
@@ -5,11 +5,9 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.controller.MobileController;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.RowLastno;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.CommonService;
import org.slf4j.Logger;
@@ -30,7 +28,7 @@
*/
@Component
public class AutoAssignAGVTasks {
- private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+ private static final Logger log = LoggerFactory.getLogger(AutoAssignAGVTasks.class);
@Autowired
private WaitPakinService waitPakinService;
@@ -46,12 +44,14 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
/**
* 鑷姩娲惧彂鍏ュ簱浠诲姟缁橝GV
*/
@Scheduled(cron = "0/3 * * * * ? ")
- private synchronized void execute(){
+ public synchronized void execute(){
/**
* agv鐘舵��
* be_batch
@@ -127,11 +127,19 @@
}else {
staNo = "101";
}
+
break;
}
}
}
}
+
+ //褰撶珯鐐规湁鍑哄簱浠诲姟鏃惰烦杩囨淳鍙戜换鍔�
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).lt("wrk_sts",33));
+ if(!Cools.isEmpty(wrkMasts1)){
+ continue;
+ }
+
if (Cools.isEmpty(staNo)) {
return;
}
@@ -140,12 +148,29 @@
if (!Cools.isEmpty(waitPakin1)) {
continue;
}
-
+ //鏌ョ湅璇ュ贩閬撳簱浣嶇┖搴撲綅鏁伴噺>3
+ Integer crnNo=1;
+ if(staNo.equals("103")){
+ crnNo=2;
+ }else if(staNo.equals("101")){
+ crnNo=3;
+ }
+ int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_sts", "O"));
+ if(i1<=3){
+ log.info("宸烽亾={}锛岀┖搴撲綅鏁伴噺灏忎簬3锛岃烦杩嘺gv鍏ュ簱鎼繍",crnNo);
+ continue;
+ }
+ R bind = mobileController.siteBindAndUnbind(waitPakin.getMemo(),waitPakin.getZpallet(), "BIND");
+// if (bind.get("code").equals(200)) {
+// }else {
+// log.info("WMS缁戝畾agv绔欑偣={},浠诲姟鍙蜂负={}------------澶辫触",wrkMast.getStaNo(),wrkMast.getWrkNo());
+// }
int workNo = commonService.getWorkNo(0);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String format = sdf.format(new Date());
String s = format+"-" + workNo;
log.info("缁檃gv涓嬪彂鍏ュ簱鎼繍浠诲姟={}",waitPakin);
+
R r = mobileController.SITESITEAGVMove(waitPakin.getMemo(), staNo,s);
if (r.get("code").equals(200)) {
waitPakin.setSupp(s);//鍙戠粰agv鐨勪换鍔″彿
@@ -161,7 +186,7 @@
* 鑷姩娲惧彂琛ョ┖鏉夸换鍔＄粰AGV
*/
@Scheduled(cron = "0/3 * * * * ? ")
- private synchronized void autoFillEmptyPallets(){
+ public synchronized void autoFillEmptyPallets(){
/**
* 璇ュ瓧娈垫槸缁勬墭鍏ュ簱鑷姩鍑哄彂琛ョ┖鎵樼洏鏍囪
* item_num
@@ -207,7 +232,7 @@
* 鑷姩娲惧彂鍑哄簱浠诲姟缁檃gv鎼繍
*/
@Scheduled(cron = "0/3 * * * * ? ")
- private synchronized void autoOut(){
+ public synchronized void autoOut(){
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 30));
if (wrkMasts.isEmpty()) {
return;
@@ -252,7 +277,7 @@
* 鍏ュ簱浠诲姟鑷姩瑙ｇ粦agv绔欑偣
*/
@Scheduled(cron = "0/3 * * * * ? ")
- private synchronized void UnbindTheSite(){
+ public synchronized void UnbindTheSite(){
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("io_type",1,53)
.ge("wrk_sts", 2)
--
Gitblit v1.9.1