From d4633ae0282a7a3f8af135fc2a1d6a6c7b656dbb Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 06 十二月 2021 19:27:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 20f2d7c..3753ebd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -24,6 +24,7 @@
import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,7 @@
/**
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class WorkServiceImpl implements WorkService {
static int i =1;
@@ -221,18 +223,20 @@
}
int workNo = commonService.getWorkNo(rok);
- // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
boolean reduce = false;
- if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
- String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
- if (locNos.contains(shallowLoc)) {
- reduce = true;
+ if(locMast.getCrnNo().equals(1) && dto.getLocNo().substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
+ if (locNos.contains(shallowLoc)) {
+ reduce = true;
+ }
}
- }
- // 娣卞簱浣嶇Щ搴�
- if (!reduce) {
- moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
+ // 娣卞簱浣嶇Щ搴�
+ if (!reduce) {
+ moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
+ }
}
// 鐢熸垚宸ヤ綔妗�
@@ -241,7 +245,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(reduce?13D:15D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -403,10 +407,27 @@
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(1);
+
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
+ }
+
+ boolean reduce = false;
+ if(locMast.getCrnNo().equals(1) && locNo.substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, locNo)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locNo);
+ if (param.getLocNos().contains(shallowLoc)) {
+ reduce = true;
+ }
+ }
+
+ // 娣卞簱浣嶇Щ搴�
+ if (!reduce) {
+ moveLocForDeepLoc(locMast.getCrnNo(), locNo);
+ }
}
// 鑾峰彇婧愮珯
@@ -425,7 +446,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(reduce?13D:15D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -497,6 +518,18 @@
}
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+
+ if(loc.getCrnNo().equals(1) && sourceLocNo.substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, sourceLocNo)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, sourceLocNo);
+ LocMast locShallow = locMastService.selectById(shallowLoc);
+ if(!Cools.isEmpty(locShallow) && (locShallow.getLocSts().equals("F") || locShallow.getLocSts().equals("D"))){
+ moveLocForDeepLoc(loc.getCrnNo(), sourceLocNo);
+ }
+ }
+ }
+
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -858,14 +891,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
if (null != loc) { break; }
}
}
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
if (null != loc) { break; }
}
}
--
Gitblit v1.9.1