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/AutomaticallyAssignOutTasksToRCSScheduler.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignOutTasksToRCSScheduler.java b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignOutTasksToRCSScheduler.java
index e670647..da83863 100644
--- a/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignOutTasksToRCSScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NewWay/AutomaticallyAssignOutTasksToRCSScheduler.java
@@ -4,16 +4,23 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.controller.MobileController;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.impl.BasDevpServiceImpl;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.service.impl.WaitPakinServiceImpl;
import com.zy.asrs.task.handler.WorkMastHandler;
+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;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.Date;
/**
* Created by vincent on 2020/7/7
@@ -27,27 +34,55 @@
private WrkMastService wrkMastService;
@Autowired
private MobileController mobileController;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+ @Autowired
+ private BasDevpServiceImpl basDevpService;
+ @Autowired
+ private ConfigService configService;
/**
- * 鑷姩娲惧彂鍏ュ簱浠诲姟缁橰CS
+ * 鑷姩娲惧彂鍑哄簱浠诲姟缁橰CS
*/
@Scheduled(cron = "0/3 * * * * ? ")
private synchronized void execute(){
+ Config config = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "Instatus")
+ .eq("value", "N"));
+ if(Cools.isEmpty(config)){
+ return;
+ }
//鏌ョ湅鏄惁鏈塧gv鍦ㄥ仛鐨勪换鍔�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 15));
if(!Cools.isEmpty(wrkMast)){
return;
}
- //鎵惧埌鍑哄簱浠诲姟
+ //鎵惧埌鍑哄簱浠诲姟---绌烘澘鍑哄簱鍜屽叏鏉垮嚭搴�
//灏嗕换鍔℃。鐘舵�佷粠30杞�15
WrkMast wrkMast1 =wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 30));
if(wrkMast1!=null){
- R r=mobileController.AGVMove(wrkMast1.getMemo()+"","6002",3);
+ String sourceSite="6002";
+ if (wrkMast1.getStaNo()==102){
+ sourceSite="6001";
+ }
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("autoing","Y").eq("loading","Y").gt("wrk_no",0));
+ if(Cools.isEmpty(basDevp)){
+ return;
+ }
+ log.info("缁橝GV涓嬪彂ioType={}鍑哄簱浠诲姟锛屾簮绔欑偣={}锛岀洰鏍囩珯鐐�={}",wrkMast1.getIoType(),sourceSite,wrkMast1.getMemo());
+ R r=mobileController.AGVMove(sourceSite,wrkMast1.getMemo(),3);
if (r.get("code").equals(200)){
- R r1=mobileController.AGVMove("6002",wrkMast1.getMemo()+"",4);
- if (r1.get("code").equals(200)){
- wrkMast1.setWrkSts(15L);
- wrkMast1.setPacked(r.get("msg")+"");//RCS 宸ヤ綔鍙�
+// R r1=mobileController.AGVMove("6002",wrkMast1.getMemo(),4);
+ if (r.get("code").equals(200)){
+ if(wrkMast1.getIoType()==110){
+ wrkMast1.setWrkSts(41L);//涓嬪彂agv鎼繍浠诲姟瀹屾垚--銆嬩骇绾胯ˉ绌烘澘
+ wrkMast1.setPacked(r.get("msg")+"");//RCS 宸ヤ綔鍙�
+ config.setValue("Y");//Y鏄┖鏉垮嚭搴撳簱鍚庡垏鎹㈡垚缁勬墭鍏ュ簱
+ configService.insert(config);
+ }else{
+ wrkMast1.setWrkSts(31L);//涓嬪彂缁檃gv鎼繍浠诲姟瀹屾垚-->鍑哄簱鍒板垎鎷ｅ尯
+ }
+ wrkMast1.setModiTime(new Date());
wrkMastService.updateById(wrkMast1);
}
}
--
Gitblit v1.9.1