From 3edce29be0469ac174df5ebc475293aee1b556a5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 23 四月 2023 14:15:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f92cbe4..fa334c9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -146,7 +146,7 @@
LocMast locMast = null;
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
+ if (!Cools.isEmpty(matNos) && (whsType==2 || whsType==4)) {
List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
@@ -168,7 +168,7 @@
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
+ if (staDescId == 10 && (whsType==2 || whsType==4)) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
@@ -257,7 +257,7 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
- if (Utils.isShallowLoc(slaveProperties, curRow)) {
+ if ((whsType==2 || whsType==4) && Utils.isShallowLoc(slaveProperties, curRow)) {
Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
// todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
@@ -273,14 +273,14 @@
locMast = null;
}
// 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+ if ((whsType==2 || whsType==4) && null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
locMast = null;
}
}
// 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+ if ((whsType==2 || whsType==4) && null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
if (!shallowLoc.getLocSts().equals("O")) {
locMast = null;
@@ -292,16 +292,18 @@
if (!Cools.isEmpty(locMast) && locMast.getCrnNo()<5){
int wrkMastsC0 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", locMast.getCrnNo()).eq("io_type",1));
if (wrkMastsC0>3 && times < rowCount){
+ int locO1 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 1));
BasCrnp basCrnp1 = basCrnpService.selectById(1);
- if (basCrnp1.getInEnable().equals("Y") && basCrnp1.getCrnSts().equals(3)){
+ if (!Cools.isEmpty(locO1) && basCrnp1.getInEnable().equals("Y") && basCrnp1.getCrnSts().equals(3)){
int wrkMastsC1 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 1).eq("io_type",1));
if (wrkMastsC0>wrkMastsC1){
locMast=null;
}
}
if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
BasCrnp basCrnp2 = basCrnpService.selectById(2);
- if (basCrnp2.getInEnable().equals("Y") && basCrnp2.getCrnSts().equals(3)){
+ if (!Cools.isEmpty(locO1) && basCrnp2.getInEnable().equals("Y") && basCrnp2.getCrnSts().equals(3)){
int wrkMastsC2 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 2).eq("io_type",1));
if (wrkMastsC0>wrkMastsC2){
locMast=null;
@@ -309,8 +311,9 @@
}
}
if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
BasCrnp basCrnp3 = basCrnpService.selectById(3);
- if (basCrnp3.getInEnable().equals("Y") && basCrnp3.getCrnSts().equals(3)){
+ if (!Cools.isEmpty(locO1) && basCrnp3.getInEnable().equals("Y") && basCrnp3.getCrnSts().equals(3)){
int wrkMastsC3 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 3).eq("io_type",1));
if (wrkMastsC0>wrkMastsC3){
locMast=null;
@@ -318,8 +321,9 @@
}
}
if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
BasCrnp basCrnp4 = basCrnpService.selectById(4);
- if (basCrnp4.getInEnable().equals("Y") && basCrnp4.getCrnSts().equals(3)){
+ if (!Cools.isEmpty(locO1) && basCrnp4.getInEnable().equals("Y") && basCrnp4.getCrnSts().equals(3)){
int wrkMastsC4 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 4).eq("io_type",1));
if (wrkMastsC0>wrkMastsC4){
locMast=null;
--
Gitblit v1.9.1