From a662099c1fdd8d3e6da2d6b167758a4bc548ccff Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 07 四月 2025 17:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4bed00e..381cb5d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,10 +10,7 @@
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.wms.StorageEscalationParam;
-import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.StaDescMapper;
-import com.zy.asrs.mapper.TaskWrkMapper;
-import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.core.CrnThread;
@@ -67,6 +64,9 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private TaskWrkMapper taskWrkMapper;
+
+ @Autowired
+ private DevpTaskMapper devpTaskMapper;
@Autowired
private TaskWrkService taskWrkService;
@@ -84,9 +84,6 @@
@Autowired
private CrnController crnController;
-
- @Autowired
- private TransferTaskService transferTaskService;
public void generateStoreWrkFile1() throws IOException, InterruptedException {
@@ -420,6 +417,15 @@
if (flag) {
LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("row1", (locMast.getRow1() - 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ } else {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
.eq("bay1", locMast.getBay1())
.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast1)) {
@@ -830,9 +836,6 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId() == 2) {
- continue;
- }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
@@ -993,6 +996,71 @@
/**
+ * 鐙珛杈撻�佺嚎
+ */
+ public void onlyDevp() {
+ DevpSlave devpSlave = slaveProperties.getDevp().get(1);
+ List<DevpSlave.Sta> inSta = devpSlave.getInSta();
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
+ for (DevpSlave.Sta sta : inSta) {
+ try {
+ StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ // 鏌ヨ宸ヤ綔妗�
+// TaskWrk taskWrk = devpTaskMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
+// if (taskWrk == null) {
+// continue;
+// }
+// log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+// staProtocol.setStaNo(staDesc.getStnNo().shortValue());
+// boolean offer = false;
+// try {
+// offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+// } catch (Exception e) {
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
+// }
+// if (offer) {
+// log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// taskWrk.setStatus(5);
+// taskWrk.setWrkSts(14);
+// taskWrkService.updateById(taskWrk);
+//
+// } else {
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// }
+ }
+ } catch (Exception e) {
+ log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e);
+ }
+ }
+
+ }
+
+
+ /**
+ * 璺戝簱绋嬪簭
+ */
+ public void debug() {
+ //棣栧厛搴撲綅鏈変竴涓湪搴撶殑搴撲綅
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F"));
+ if (locMast != null) {
+ // 鍐嶇敓鎴愪竴涓Щ搴撲换鍔�
+ LocMast mk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O").ne("mk", 1));
+
+ }
+
+ }
+
+
+ /**
* 杞Щ浠诲姟涓嬪彂
*/
public void transferTaskStart() {
--
Gitblit v1.9.1