From d8f361c9d69271aaa58ba19e75f38e0fee00f3bb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 08:36:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 411 +++++++++++++++++++++-------------------------------------
1 files changed, 150 insertions(+), 261 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 0fd45f1..0d32709 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
@@ -36,7 +33,6 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -55,11 +51,7 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -93,10 +85,6 @@
@Autowired
private ErpService erpService;
@Autowired
- private OrderMapper orderMapper;
- @Autowired
- private OrderDetlMapper orderDetlMapper;
- @Autowired
private BasLiftService basLiftService;
@Autowired
private ShuttleDispatchUtils shuttleDispatchUtils;
@@ -110,10 +98,6 @@
private ConfigService configService;
@Autowired
private NavigateMapUtils navigateMapUtils;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private MatService matService;
@Autowired
private NavigateMapData navigateMapData;
@@ -2375,259 +2359,164 @@
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
public void ledExecute() {
- try {
- for (LedSlave led : slaveProperties.getLed()) {
- // 鑾峰彇杈撻�佺嚎plc绾跨▼
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
- // 鍛戒护闆嗗悎
- 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);
- if (null == staProtocol || null == staProtocol.getWorkNo() || 0 == staProtocol.getWorkNo() || !staProtocol.isLoading()) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- // 鑾峰彇宸ヤ綔妗ｆ暟鎹�
- WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
- 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);
- }
- // 缁勮鍛戒护
- LedCommand ledCommand = new LedCommand();
- ledCommand.setWorkNo(wrkNo);
- ledCommand.setIoType(ioType);
- // 鍑哄簱妯″紡
- switch (ioType) {
- case 101:
- ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
- break;
- case 103:
- ledCommand.setTitle("鎷ｆ枡鍑哄簱");
- break;
- case 104:
- ledCommand.setTitle("骞舵澘鍑哄簱");
- break;
- case 107:
- ledCommand.setTitle("鐩樼偣鍑哄簱");
- break;
- case 110:
- ledCommand.setTitle("绌烘澘鍑哄簱");
- ledCommand.setEmptyMk(true);
- break;
- default:
- News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkNo, ioType);
- break;
- }
- ledCommand.setSourceLocNo(sourceLocNo);
- ledCommand.setLocNo(locNo);
- ledCommand.setStaNo(wrkStaNo);
- ledCommand.setBarcode(barcode);
- if (ioType != 110 && ioType != 10) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
- if (!wrkDetls.isEmpty()) {
- wrkDetls.forEach(wrkDetl -> {
- double remainNum = wrkDetl.getStock() - wrkDetl.getAnfme();//鍓╀綑鏁伴噺
- if (remainNum < 0) {
- remainNum = 0;
- }
- String matnr = wrkDetl.getMatnr();
- Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
- if (mat != null) {
- if (!mat.getMatnr().equals(mat.getMatnr2())) {
- matnr += " - " + mat.getMatnr2();
- }
- }
- ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
- });
- }else {
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
- for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
- double remainNum = wrkDetlLog.getStock() - wrkDetlLog.getAnfme();//鍓╀綑鏁伴噺
- if (remainNum < 0) {
- remainNum = 0;
- }
- String matnr = wrkDetlLog.getMatnr();
- Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
- if (mat != null) {
- if (!mat.getMatnr().equals(mat.getMatnr2())) {
- matnr += " - " + mat.getMatnr2();
- }
- }
- ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
- }
- }
-
-// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
-// if (ioType == 101) {
-// 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(), 0D, wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
-// });
-//// locDetls.forEach(locDetl -> {
-//// 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());//鏂欑鐮�
-//// List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
-//// if (Cools.isEmpty(detl)) {
-//// String suppCode = "";
-//// if (locDetl.getSuppCode() != null) {
-//// suppCode = locDetl.getSuppCode();
-//// }
-//// ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
-//// } else {
-//// //鍑哄簱鏁伴噺绱
-//// Double conut = 0.0;
-//// for (WrkDetl wrkDetl : detl) {
-//// conut = conut + wrkDetl.getAnfme();
-//// }
-////
-//// for (WrkDetl wrkDetl : detl) {
-//// String suppCode = "";
-//// if (wrkDetl.getSuppCode() != null) {
-//// suppCode = wrkDetl.getSuppCode();
-//// }
-//// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
-//// }
-//// }
-////
-//// });
-// } else {
-// locDetls.forEach(locDetl -> {
-// 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());//鏂欑鐮�
-// List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
-// if (Cools.isEmpty(detl)) {
-// String suppCode = "";
-// if (locDetl.getSuppCode() != null) {
-// suppCode = locDetl.getSuppCode();
-// }
-// ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
-// } else {
-// //鍑哄簱鏁伴噺绱
-// Double conut = 0.0;
-// for (WrkDetl wrkDetl : detl) {
-// conut = conut + wrkDetl.getAnfme();
-// }
-//
-// for (WrkDetl wrkDetl : detl) {
-// String suppCode = "";
-// if (wrkDetl.getSuppCode() != null) {
-// suppCode = wrkDetl.getSuppCode();
-// }
-// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (wrkDetl.getStock() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
-// }
-// }
-//
-// });
+// try {
+// for (LedSlave led : slaveProperties.getLed()) {
+// // 鑾峰彇杈撻�佺嚎plc绾跨▼
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
+// // 鍛戒护闆嗗悎
+// 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);
+// if (null == staProtocol || null == staProtocol.getWorkNo() || 0 == staProtocol.getWorkNo() || !staProtocol.isLoading()) {
+// continue;
+// } else {
+// staProtocol = staProtocol.clone();
+// }
+// // 鑾峰彇宸ヤ綔妗ｆ暟鎹�
+// WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
+// 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;
// }
-//
-//
-// if (ioType == 107) {
-// locDetls = new ArrayList<>();
-// ledCommand.setMatDtos(new ArrayList<>());
+// 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;
// }
-//
-// if (locDetls.isEmpty() && ioType != 101) {
-// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+// ioType = wrkMast.getIoType();
+// sourceLocNo = wrkMast.getSourceLocNo();
+// locNo = wrkMast.getLocNo();
+// wrkStaNo = wrkMast.getStaNo();
+// barcode = wrkMast.getBarcode();
+// wrkMasts.add(wrkMast);
+// }
+// // 缁勮鍛戒护
+// LedCommand ledCommand = new LedCommand();
+// ledCommand.setWorkNo(wrkNo);
+// ledCommand.setIoType(ioType);
+// // 鍑哄簱妯″紡
+// switch (ioType) {
+// case 101:
+// ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
+// break;
+// case 103:
+// ledCommand.setTitle("鎷ｆ枡鍑哄簱");
+// break;
+// case 104:
+// ledCommand.setTitle("骞舵澘鍑哄簱");
+// break;
+// case 107:
+// ledCommand.setTitle("鐩樼偣鍑哄簱");
+// break;
+// case 110:
+// ledCommand.setTitle("绌烘澘鍑哄簱");
+// ledCommand.setEmptyMk(true);
+// break;
+// default:
+// News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkNo, ioType);
+// break;
+// }
+// ledCommand.setSourceLocNo(sourceLocNo);
+// ledCommand.setLocNo(locNo);
+// ledCommand.setStaNo(wrkStaNo);
+// ledCommand.setBarcode(barcode);
+// if (ioType != 110 && ioType != 10) {
+// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+// if (!wrkDetls.isEmpty()) {
// wrkDetls.forEach(wrkDetl -> {
-// if (wrkDetl.getAnfme() > 0D) {
-// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
+// double remainNum = wrkDetl.getStock() - wrkDetl.getAnfme();//鍓╀綑鏁伴噺
+// if (remainNum < 0) {
+// remainNum = 0;
// }
-// });
-//
-// if (wrkDetls.isEmpty()) {//浠庡巻鍙叉。鏌ヨ
-// List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
-// for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
-// if (wrkDetlLog.getAnfme() > 0D) {
-// ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+// String matnr = wrkDetl.getMatnr();
+// Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+// if (mat != null) {
+// if (!mat.getMatnr().equals(mat.getMatnr2())) {
+// matnr += " - " + mat.getMatnr2();
// }
// }
+// ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
+// });
+// }else {
+// List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
+// for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
+// double remainNum = wrkDetlLog.getStock() - wrkDetlLog.getAnfme();//鍓╀綑鏁伴噺
+// if (remainNum < 0) {
+// remainNum = 0;
+// }
+// String matnr = wrkDetlLog.getMatnr();
+// Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+// if (mat != null) {
+// if (!mat.getMatnr().equals(mat.getMatnr2())) {
+// matnr += " - " + mat.getMatnr2();
+// }
+// }
+// ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
// }
// }
- }
-
- commands.add(ledCommand);
- }
- 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());
- // 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
- if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
- continue;
- }
- // 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
- if (!commands.isEmpty()) {
- if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
- log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- continue;
- } else {
- ledThread.setLedMk(false);
- }
- }
-
- try {
- // 淇敼涓绘。led鏍囪
- for (WrkMast wrkMast : wrkMasts) {
- wrkMast.setOveMk("Y");
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
- }
- }
-
- // 鏇存柊绾跨▼褰撳墠宸ヤ綔鍙烽泦鍚�
- ledThread.setWorkNos(workNos);
-
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
-
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+// commands.add(ledCommand);
+// }
+// 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());
+// // 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
+// if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
+// continue;
+// }
+// // 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
+// if (!commands.isEmpty()) {
+// if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
+// log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+// continue;
+// } else {
+// ledThread.setLedMk(false);
+// }
+// }
+//
+// try {
+// // 淇敼涓绘。led鏍囪
+// for (WrkMast wrkMast : wrkMasts) {
+// wrkMast.setOveMk("Y");
+// wrkMast.setModiTime(new Date());
+// if (wrkMastMapper.updateById(wrkMast) == 0) {
+// throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
+// }
+// }
+//
+// // 鏇存柊绾跨▼褰撳墠宸ヤ綔鍙烽泦鍚�
+// ledThread.setWorkNos(workNos);
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// }
+//
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
}
/**
--
Gitblit v1.9.1