From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版
---
src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
index 9d8031e..5f57130 100644
--- a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignInTasksToRCSScheduler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.NewWay;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.controller.MobileController;
import com.zy.asrs.entity.WaitPakin;
@@ -9,6 +10,9 @@
import com.zy.asrs.service.impl.WaitPakinServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.common.service.CommonService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,15 +38,26 @@
private WaitPakinServiceImpl waitPakinService;
@Autowired
private MobileController mobileController;
+ @Autowired
+ private ConfigService configService;
/**
* 鑷姩娲惧彂鍏ュ簱浠诲姟缁橰CS
*/
@Scheduled(cron = "0/3 * * * * ? ")
private synchronized void execute(){
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "Instatus").eq("value", "Y"));
+ if(Cools.isEmpty(config)){
+ return;
+ }
//鏌ョ湅鏄惁鏈塧gv鍦ㄥ仛鐨勪换鍔�
- WaitPakin waitPakin1=waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("be_batch",1));
+ WaitPakin waitPakin1=waitPakinService.selectOne(new EntityWrapper<WaitPakin>().ge("be_batch",1));
if(waitPakin1!=null){
+ return;
+ }
+ //鏌ョ湅鏄惁鏈夌┖鏉胯ˉ鍒颁骇绾跨殑浠诲姟
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110));
+ if (!Cools.isEmpty(wrkMast)){
return;
}
//鎵惧埌姝ｅ湪绛夊緟鐨勭粍鎵樻暟鎹�
@@ -51,13 +66,40 @@
if(waitPakin!=null){
R r=mobileController.AGVMove(waitPakin.getMemo(),6001+"",1);
if (r.get("code").equals(200)){
- R r1=mobileController.AGVMove(6001+"",waitPakin.getMemo(),2);
- if (r1.get("code").equals(200)){
+// R r1=mobileController.AGVMove(6001+"",waitPakin.getMemo(),2);
+// if (r1.get("code").equals(200)){
waitPakin.setItemNum(r.get("msg")+"");
waitPakin.setBeBatch(1);//0杞�1
- waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("manu",waitPakin.getManu()));
- }
+ waitPakin.setModiTime(new Date());
+ config.setValue("N");//N鏄叆搴撳悗鍒囨崲鎴愮┖鏉垮嚭搴�
+ configService.updateById(config);
+ waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("zpallet",waitPakin.getZpallet()));
+// }
}
}
}
+
+ /**
+ * 鑷姩娲惧彂绌烘墭鐩樺洖搴撲换鍔�
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private synchronized void execute1(){
+ //wrk_sts 32.绛夊緟AGV鎼繍绌烘澘鍥炲簱
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 101).eq("wrk_sts", 32));
+ if (Cools.isEmpty(wrkMast)){
+ return;
+ }
+
+ R r=mobileController.AGVMove(wrkMast.getMemo(),6002+"",1);
+ if (r.get("code").equals(200)){
+// R r1=mobileController.AGVMove(6001+"",waitPakin.getMemo(),2);
+// if (r1.get("code").equals(200)){
+ wrkMast.setPacked(r.get("msg")+"");
+ wrkMast.setWrkSts(33L);//33.AGV鎼繍绌烘墭鐩樺洖搴撲笅鍙戞垚鍔�
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+// }
+ }
+
+ }
}
--
Gitblit v1.9.1