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 | 140 ++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 36 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 9b7d133..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;
/**
@@ -552,8 +551,17 @@
&& (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()) {
- staProtocol.setStaNo((short) 341);//鍐欏叆鐩爣绔�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ if (wrkMast == null) {
+ 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));
+ }
}
}
@@ -655,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);
@@ -1192,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);
@@ -1379,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());
}
// 鍒犻櫎宸ヤ綔涓绘。
@@ -1669,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")) {
@@ -2806,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);
@@ -2816,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;
@@ -2843,17 +2887,17 @@
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());
- ledCommand.setBarcode(wrkMast.getBarcode());
- 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());
@@ -2884,16 +2928,29 @@
});
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());
// 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
@@ -2988,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());
@@ -3332,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();
@@ -3810,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());
}
// 鍒犻櫎宸ヤ綔涓绘。
--
Gitblit v1.9.1