From 44908c897902082d885e35b1240db22c715df937 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 18 十二月 2023 15:48:43 +0800
Subject: [PATCH] #map latest test
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 476 +++++++++++++++++++++++++++-------------------------------
1 files changed, 221 insertions(+), 255 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 613c020..6d0eab8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -37,8 +36,6 @@
import java.util.*;
import java.util.stream.Collectors;
-
-import static com.zy.asrs.utils.Utils.isJson;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -106,13 +103,15 @@
@Autowired
private RedisUtil redisUtil;
@Autowired
- private WrkMastLocMapper wrkMastLocMapper;
+ private WrkMastLogMapper wrkMastLogMapper;
@Autowired
private BasLiftOptService basLiftOptService;
@Autowired
private ConfigService configService;
@Autowired
private NavigateMapUtils navigateMapUtils;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
/**
@@ -409,10 +408,6 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
- if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
- continue;
- }
-
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -450,27 +445,27 @@
continue;
}
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
- boolean flag = false;
- String th = "";
- List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
- for (String loc : innerLoc) {
- LocMast locMast = locMastService.selectById(loc);
- if (locMast == null) {
- continue;
- }
-
- if (!locMast.getLocSts().equals("F")) {
- flag = true;
- th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
- break;
- }
- }
- if (flag) {
- News.info(th);
- continue;
- }
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
+// //*********************鍚屽簱浣嶇粍鏍￠獙*********************
+// boolean flag = false;
+// String th = "";
+// List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
+// for (String loc : innerLoc) {
+// LocMast locMast = locMastService.selectById(loc);
+// if (locMast == null) {
+// continue;
+// }
+//
+// if (!locMast.getLocSts().equals("F")) {
+// flag = true;
+// th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
+// break;
+// }
+// }
+// if (flag) {
+// News.info(th);
+// continue;
+// }
+// //*********************鍚屽簱浣嶇粍鏍￠獙*********************
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
@@ -478,35 +473,51 @@
continue;
}
- String sourceLocNo = wrkMast.getSourceLocNo().trim();
- LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
- if (liftStaProtocol == null) {
- continue;
- }
+ try {
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//婧愬簱浣�
+ SearchLocParam param = new SearchLocParam();
+ param.setWrkNo(wrkMast.getWrkNo());
+ param.setBarcode(wrkMast.getBarcode());
+ param.setIoType(wrkMast.getIoType());
+ param.setSourceStaNo(pickSta.getStaNo());
+ param.setLocType1(locMast.getLocType1());
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/pakin/loc/v2")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ StartupDto dto = jsonObject.getObject("data", StartupDto.class);
- // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(pickSta.getBackSta()); // 婧愮珯
-// wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
-// wrkMast.setCrnNo(dto.getCrnNo());
- wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
- wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
- wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
- continue;
- }
+ //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+ LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
+ if (liftStaProtocol == null) {
+ News.info(wrkMast.getWrkNo() + "鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯澶辫触");
+ continue;
+ }
- // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(sourceLocNo);
- locMast.setLocSts("Q");
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
- News.info("淇敼搴撲綅鐘舵�佸け璐�");
- continue;
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
+ wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+ wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+ wrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) == 0) {
+ News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ continue;
+ }
+ } else if (code == 500) {
+ News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
}
@@ -525,11 +536,7 @@
try {
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
- for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
- if (!(pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339)) {
- continue;
- }
-
+ for (DevpSlave.Sta pickSta : devp.getPickInSta2()) {
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -545,76 +552,16 @@
&& staProtocol.isPakMk()) {
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
- if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
+ if (wrkMast == null) {
continue;
}
-
- if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104)
- || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
- continue;
+ if (wrkMast.getSteNo() == null) {
+ wrkMast.setSteNo(1);
+ wrkMastMapper.updateById(wrkMast);
+ staProtocol.setStaNo((short) 341);//鍐欏叆鐩爣绔�
+ staProtocol.setPakMk(false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
-
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
- boolean flag = false;
- String th = "";
- List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
- for (String loc : innerLoc) {
- LocMast locMast = locMastService.selectById(loc);
- if (locMast == null) {
- continue;
- }
-
- if (!locMast.getLocSts().equals("F")) {
- flag = true;
- th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
- break;
- }
- }
- if (flag) {
- News.info(th);
- continue;
- }
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
- News.info(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
- continue;
- }
-
- String sourceLocNo = wrkMast.getSourceLocNo().trim();
- LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
- if (liftStaProtocol == null) {
- continue;
- }
-
- // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(pickSta.getBackSta()); // 婧愮珯
-// wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
-// wrkMast.setCrnNo(dto.getCrnNo());
- wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
- wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
- wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
- continue;
- }
-
- // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(sourceLocNo);
- locMast.setLocSts("Q");
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
- News.info("淇敼搴撲綅鐘舵�佸け璐�");
- continue;
- }
-
- staProtocol.setStaNo(pickSta.getBackSta().shortValue());//鍐欏叆鐩爣绔�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
}
@@ -633,10 +580,6 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
-// if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
-// continue;
-// }
-
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -648,10 +591,22 @@
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && (staProtocol.getWorkNo() > 0)
+// && (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()) {
- WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ continue;
+ }
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
+ continue;
+ }
+ WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);
if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
continue;
}
@@ -660,28 +615,6 @@
|| Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
continue;
}
-
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
- boolean flag = false;
- String th = "";
- List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
- for (String loc : innerLoc) {
- LocMast locMast = locMastService.selectById(loc);
- if (locMast == null) {
- continue;
- }
-
- if (!locMast.getLocSts().equals("F")) {
- flag = true;
- th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
- break;
- }
- }
- if (flag) {
- News.info(th);
- continue;
- }
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
@@ -696,11 +629,11 @@
param.setWrkNo(wrkMast.getWrkNo());
param.setBarcode(wrkMast.getBarcode());
param.setIoType(107);//鐩樼偣
- param.setSourceStaNo(wrkMast.getStaNo());
+ param.setSourceStaNo(pickSta.getStaNo());
param.setLocType1(locMast.getLocType1());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
- .setPath("/rpc/pakin/loc/v1")
+ .setPath("/rpc/pakin/loc/v2")
.setJson(JSON.toJSONString(param))
.build()
.doPost();
@@ -730,8 +663,8 @@
continue;
}
- staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
} else if (code == 500) {
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -1267,15 +1200,15 @@
return false;//鍑哄簱绔欑偣涓嶅瓨鍦�
}
- if (!basDevp.getAutoing().equals("Y")) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鏄嚜鍔ㄧ姸鎬�",wrkMast.getWrkNo(),basDevp.getDevNo());
- return false;//涓嶆槸鑷姩鐘舵��
- }
-
- if (!basDevp.getOutEnable().equals("Y")) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), basDevp.getDevNo());
- return false;//鍑哄簱绔欑偣涓嶅彲鍑�
- }
+// if (!basDevp.getAutoing().equals("Y")) {
+// News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鏄嚜鍔ㄧ姸鎬�",wrkMast.getWrkNo(),basDevp.getDevNo());
+// return false;//涓嶆槸鑷姩鐘舵��
+// }
+//
+// if (!basDevp.getOutEnable().equals("Y")) {
+// News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), basDevp.getDevNo());
+// return false;//鍑哄簱绔欑偣涓嶅彲鍑�
+// }
Integer liftNo = basDevp.getLiftNo();//鎼滅储鍑哄簱鎻愬崌鏈烘槸鍚﹀瓨鍦ㄥ叆搴撲换鍔★紝濡傚瓨鍦ㄧ姝㈠嚭搴�
List<WrkMast> liftWrkMasts = wrkMastMapper.selectInWrkMastByLiftNo(liftNo);
@@ -1306,7 +1239,7 @@
if (wrkMast.getStaNo() == 300) {
//鍑�300绔欙紝妫�娴�300绔欎换鍔℃暟閲�
List<WrkMast> wrkMasts = wrkMastMapper.select300Wrk();
- if (wrkMasts.size() >= 4) {
+ if (wrkMasts.size() >= 20) {
News.info("{}浠诲姟锛岃緭閫佺嚎浠诲姟杩囪浇{}", wrkMast.getWrkNo(), wrkMasts.size());
return false;
}
@@ -1454,7 +1387,7 @@
if (wrkMastMapper.updateById(wrkMast) > 0) {
if (wrkMast.getWrkSts() == 111) {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {
+ if (wrkMastLogMapper.save(wrkMast.getWrkNo()) <= 0) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
@@ -1744,6 +1677,16 @@
News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀湪杈撻�佺珯鐐硅皟搴﹀皬杞﹂伩璁╁け璐�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
+ }
+
+ if (!basDevp.getAutoing().equals("Y")) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夎嚜鍔ㄤ俊鍙凤紝绂佹娲惧彂", wrkMast.getWrkNo(), basDevp.getDevNo());
+ return false;//鍑哄簱绔欑偣涓嶅彲鍑�
+ }
+
+ if (basDevp.getLoading().equals("Y")) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屽瓨鍦ㄦ湁鐗╀俊鍙凤紝绂佹娲惧彂", wrkMast.getWrkNo(), basDevp.getDevNo());
+ return false;//鍑哄簱绔欑偣涓嶅彲鍑�
}
if (!basDevp.getOutEnable().equals("Y")) {
@@ -2881,6 +2824,7 @@
List<LedCommand> commands = new ArrayList<>();
// 宸ヤ綔妗ｉ泦鍚�
List<WrkMast> wrkMasts = new ArrayList<>();
+ List<WrkMastLog> wrkMastLogs = new ArrayList<>();
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
StaProtocol staProtocol = devpThread.getStation().get(staNo);
@@ -2891,16 +2835,41 @@
}
// 鑾峰彇宸ヤ綔妗ｆ暟鎹�
WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
- if (null == wrkMast || wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) {
- continue;
+ Integer wrkNo = staProtocol.getWorkNo().intValue();
+ Integer ioType = null;
+ String sourceLocNo = null;
+ String locNo = null;
+ Integer wrkStaNo = null;
+ String barcode = null;
+ if (wrkMast == null) {
+ //鏌ヨ鍘嗗彶妗�
+ WrkMastLog wrkMastLog = wrkMastLogMapper.selectLatestByWorkNo(staProtocol.getWorkNo().intValue());
+ if (wrkMastLog == null) {
+ continue;
+ }
+ ioType = wrkMastLog.getIoType();
+ sourceLocNo = wrkMastLog.getSourceLocNo();
+ locNo = wrkMastLog.getLocNo();
+ wrkStaNo = wrkMastLog.getStaNo();
+ barcode = wrkMastLog.getBarcode();
+ wrkMastLogs.add(wrkMastLog);
+ }else {
+ if (wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) {
+ continue;
+ }
+ ioType = wrkMast.getIoType();
+ sourceLocNo = wrkMast.getSourceLocNo();
+ locNo = wrkMast.getLocNo();
+ wrkStaNo = wrkMast.getStaNo();
+ barcode = wrkMast.getBarcode();
+ wrkMasts.add(wrkMast);
}
- wrkMasts.add(wrkMast);
// 缁勮鍛戒护
LedCommand ledCommand = new LedCommand();
- ledCommand.setWorkNo(wrkMast.getWrkNo());
- ledCommand.setIoType(wrkMast.getIoType());
+ ledCommand.setWorkNo(wrkNo);
+ ledCommand.setIoType(ioType);
// 鍑哄簱妯″紡
- switch (wrkMast.getIoType()) {
+ switch (ioType) {
case 101:
ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
break;
@@ -2918,22 +2887,22 @@
ledCommand.setEmptyMk(true);
break;
default:
- News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
+ News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkNo, ioType);
break;
}
- ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
- ledCommand.setLocNo(wrkMast.getLocNo());
- ledCommand.setStaNo(wrkMast.getStaNo());
- if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
+ ledCommand.setSourceLocNo(sourceLocNo);
+ ledCommand.setLocNo(locNo);
+ ledCommand.setStaNo(wrkStaNo);
+ ledCommand.setBarcode(barcode);
+ if (ioType != 110 && ioType != 10) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
locDetls.forEach(locDetl -> {
- Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkMast.getWrkNo());
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//鏂欑鐮�
- WrkDetl detl = wrkDetlService.selectOne(wrapper);
-
+ List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
if (Cools.isEmpty(detl)) {
String suppCode = "";
if (locDetl.getSuppCode() != null) {
@@ -2941,34 +2910,47 @@
}
ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
} else {
- String suppCode = "";
- String orderNo = detl.getOrderNo();
- if (detl.getSuppCode() != null) {
- suppCode = detl.getSuppCode();
+ //鍑哄簱鏁伴噺绱
+ Double conut = 0.0;
+ for (WrkDetl wrkDetl : detl) {
+ conut = conut + wrkDetl.getAnfme();
}
- try {
- JSONArray orders = JSON.parseArray(orderNo);
- for (Object order : orders) {
- JSONObject order1 = (JSONObject) order;
- ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), (Double) order1.get("anfme"), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode,(String) order1.get("orderNo")));
+
+ for (WrkDetl wrkDetl : detl) {
+ String suppCode = "";
+ if (wrkDetl.getSuppCode() != null) {
+ suppCode = wrkDetl.getSuppCode();
}
- } catch (Exception e) {
- ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode,detl.getOrderNo()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
}
}
+
});
if (locDetls.isEmpty()) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
wrkDetls.forEach(wrkDetl -> {
ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
});
+
+ if (wrkDetls.isEmpty()) {//浠庡巻鍙叉。鏌ヨ
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
+ for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+ }
+
+ }
}
}
commands.add(ledCommand);
}
- Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
+ Set<Integer> workNos = null;
+ if (!wrkMasts.isEmpty()) {
+ workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
+ }else {
+ workNos = wrkMastLogs.stream().map(WrkMastLog::getWrkNo).collect(Collectors.toSet());
+ }
// 鑾峰彇LED绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
@@ -3063,7 +3045,7 @@
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
- if (reset && !ledThread.isLedMk()) {
+ if (reset) {
ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
@@ -3407,6 +3389,17 @@
//鑾峰彇灏忚溅鍒拌緭閫佺珯鐐硅璧板懡浠�
NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), liftSta.getLocNo(), NavigationMapType.NORMAL.id);
+ if (result == null) {
+ //璺緞鑾峰彇澶辫触锛岄渶瑕佽В閿佷笂闈㈤攣瀹氱殑璺緞
+ //灏濊瘯瑙ｉ攣鐩爣绔欒矾寰�
+ boolean result3 = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(wrkMast.getLocNo()), targetNodes, false);//鎵�浣跨敤鐨勮矾寰勮繘琛岃В閿�
+ if (!result3) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勮В閿佸け璐�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
+ return false;//璺緞瑙ｉ攣澶辫触
+ }
+ News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勮绠楀け璐�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
+ return false;//璺緞瑙ｉ攣澶辫触
+ }
List<NyShuttleHttpCommand> commands = result.getCommands();
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
@@ -3885,7 +3878,7 @@
if (wrkMast.getWrkSts() == 111) {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {
+ if (wrkMastLogMapper.save(wrkMast.getWrkNo()) <= 0) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
@@ -3963,63 +3956,36 @@
return true;
}
- /**
- * 鍑哄叆搴撴ā寮忓垏鎹�
- */
- public synchronized void outAndIn() {
- try {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- Thread.sleep(500);
- boolean a=true,b=true;
- List<WrkMast> wrkMasts = wrkMastMapper.selectAll(inSta.getStaNo());
- if (Cools.isEmpty(wrkMasts)){
- b=false;
- }else {
- for (WrkMast wrkMast:wrkMasts){
- if (wrkMast.getSourceStaNo() > wrkMast.getStaNo()){
- a=false;
- break;
- }
- }
- }
- switch (inSta.getStaNo()) {
- case 102://1F
- if (a && b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 11));
- }else if (b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 12));
- }else {
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 10));
- }
- break;
- case 202://2F
- if (a && b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 21));
- }else if (b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 22));
- }else {
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 20));
- }
- break;
- case 302://3F
- if (a && b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 31));
- }else if (b){
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 32));
- }else {
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 30));
- }
- break;
- }
- }
+ //鎵弿璁惧PakMk鏍囪鏄惁瓒呮椂
+ public synchronized void scanDevicePakMk() {
+ //鎵弿灏忚溅
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
}
- } catch (Exception e) {
- e.printStackTrace();
+ if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000*60*5)) && shuttleProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ shuttleProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
}
- }
+ //鎵弿鎻愬崌鏈�
+ for (LiftSlave slave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
+
+ if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000*60*5)) && liftProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ liftProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
+ }
+
+ }
}
--
Gitblit v1.9.1