From 891fa06cf39c457a07214f1c82efc0b12b4c1d43 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期六, 30 十一月 2024 10:41:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 47d85bf..a8e9ebf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -536,7 +536,7 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
@@ -567,15 +567,6 @@
continue;
}
for (LocMast locMastGro1 : locMasts) {
- if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
- if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
- continue;
- }
- }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
- if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
- continue;
- }
- }
if (locMastGro1.getBay1() == 2){ //wcs闂闄愬埗
continue;
@@ -674,6 +665,15 @@
continue;
}
for (LocMast locMastGro1 : locMasts1) {
+ if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
+ if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
+ continue;
+ }
+ }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
+ if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
+ continue;
+ }
+ }
if (locMastGro1.getLocSts().equals("F")){
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){
--
Gitblit v1.9.1