From cc490f6c02f994cfec1028de342e410f3aa2bc82 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 17 八月 2022 17:02:40 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 23 ++---------------------
src/main/java/com/zy/common/service/CommonService.java | 9 +++++++--
2 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 47f8d6c..bd83b19 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -113,12 +113,16 @@
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
+ int start = 2;
+ int end = 30;
switch (sourceStaNo) {
case 107:
whsType = 2;
+ end = 17;
break;
case 118:
whsType = 3;
+ start = 18;
break;
default:
whsType = 1;
@@ -140,9 +144,10 @@
// 鐩爣搴撲綅
LocMast locMast = null;
+
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetl(matNos.get(0), 2, 30);
+ List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
for (String locNo : locNos) {
List<String> groupLoc = Utils.getGroupLoc(locNo);
locMast = locMastService.findOutMost(groupLoc);
@@ -161,7 +166,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", 2).le("row1", 30));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", start).le("row1", end));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 6c081b5..d4ea587 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -196,10 +196,10 @@
select a.*
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
- left join asr_bas_crnp c on b.crn_no = c.crn_no
+-- left join asr_bas_crnp c on b.crn_no = c.crn_no
where 1=1
and b.loc_sts = 'F'
- and c.out_enable = 'Y'
+-- and c.out_enable = 'Y'
and a.matnr = #{matnr}
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
@@ -228,7 +228,6 @@
desc,
a.loc_no,
case
- when (left(a.loc_no, 2) = '01') then 0
when (left(a.loc_no, 2) = '02') then 1
when (left(a.loc_no, 2) = '03') then 1
when (left(a.loc_no, 2) = '04') then 0
@@ -258,24 +257,6 @@
when (left(a.loc_no, 2) = '28') then 0
when (left(a.loc_no, 2) = '29') then 0
when (left(a.loc_no, 2) = '30') then 1
- when (left(a.loc_no, 2) = '31') then 1
- when (left(a.loc_no, 2) = '32') then 0
- when (left(a.loc_no, 2) = '33') then 0
- when (left(a.loc_no, 2) = '34') then 1
- when (left(a.loc_no, 2) = '35') then 1
- when (left(a.loc_no, 2) = '36') then 0
- when (left(a.loc_no, 2) = '37') then 0
- when (left(a.loc_no, 2) = '38') then 1
- when (left(a.loc_no, 2) = '39') then 1
- when (left(a.loc_no, 2) = '40') then 0
- when (left(a.loc_no, 2) = '41') then 0
- when (left(a.loc_no, 2) = '42') then 1
- when (left(a.loc_no, 2) = '43') then 1
- when (left(a.loc_no, 2) = '44') then 0
- when (left(a.loc_no, 2) = '45') then 0
- when (left(a.loc_no, 2) = '46') then 1
- when (left(a.loc_no, 2) = '47') then 1
- when (left(a.loc_no, 2) = '48') then 0
else 0
end
desc
--
Gitblit v1.9.1