From 11fd05e1166655d009274127d89231fd8c9eacbc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 07 六月 2023 08:50:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 c3852ac..79f8526 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1207,6 +1207,7 @@
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
*/
public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
+ Collections.shuffle(slave.getCrnOutStn());
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
@@ -1310,7 +1311,36 @@
for (String shallowLocNo : shallowLocs) {
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+ if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+ if (Cools.isEmpty(waitWrkMast)){
+ News.error("搴撲綅寮傚父");
+ }else {
+ if (waitWrkMast.getIoType() != 11 || waitWrkMast.getWrkSts() != 17){
+ if(waitWrkMast.getIoPri()<=9980.0){
+ waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10.0);
+ }else {
+ waitWrkMast.setIoPri(9999d);
+ }
+ if(wrkMast.getIoPri()>=9000.0){
+ wrkMast.setIoPri(9999d);
+ }else if (wrkMast.getIoPri()>20.0){
+ wrkMast.setIoPri(waitWrkMast.getIoPri()-10.0);
+ }else {
+ wrkMast.setIoPri(13.0d);
+ }
+ if (wrkMastMapper.updateById(wrkMast)==0){
+ News.error("璋冩暣浼樺厛绾уけ璐�");
+ }
+ if (wrkMastMapper.updateById(waitWrkMast)==0){
+ News.error("璋冩暣浼樺厛绾уけ璐�");
+ }else if (waitWrkMast.getWrkSts() != 17){
+ flag = true;
+ }
+
+ break;
+ }
+ }
+ }else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
if (null == waitWrkMast) {
// 鐢熸垚涓�绗旂Щ搴撲换鍔″伐浣滄。銆佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵��
// 娌℃湁浣滀笟涓殑鍑哄簱浠诲姟鏃讹紝鎵嶈兘鐢熸垚绉诲簱浠诲姟
@@ -3860,13 +3890,13 @@
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
wrkDetls.forEach(wrkDetl -> {
if (wrkMast.getIoType() == 101) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
}
if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
}
if (wrkMast.getIoType() == 107) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
}
});
}
--
Gitblit v1.9.1