From aa360de4381100150d34a469ecc087a78cf1720e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 03 十二月 2025 16:44:10 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 ++--
src/main/resources/mapper/LocMastMapper.xml | 14 ++++++++++----
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4 ++--
src/main/java/com/zy/common/web/WcsController.java | 2 ++
src/main/webapp/views/pakStore/emptyOut.html | 2 +-
pom.xml | 2 +-
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
8 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a7119a..b8e82f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<build>
- <finalName>zjhlasrs</finalName>
+ <finalName>wms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index f6f76a1..fa4f25d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -47,7 +47,7 @@
LocMast selectByBarcode(@Param("zpallet")String zpallet);
- LocMast queryLocToOne(Short locType1);
+ LocMast queryLocToOne(@Param("locType2") Short locType2);
- LocMast queryLocToTwo(Short locType2);
+ LocMast queryLocToTwo(@Param("locType2") Short locType2);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 924ee52..1bfcb56 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -53,7 +53,7 @@
LocMast selectByBarcode(String zpallet);
- LocMast queryLocToOne(Short locType1);
+ LocMast queryLocToOne(Short locType2);
LocMast queryLocToTwo(Short locType2);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index c73ca94..62ca66e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -71,8 +71,8 @@
}
@Override
- public LocMast queryLocToOne(Short locType1) {
- return this.baseMapper.queryLocToOne(locType1);
+ public LocMast queryLocToOne(Short locType2) {
+ return this.baseMapper.queryLocToOne(locType2);
}
@Override
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b72676b..0b095ad 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -383,9 +383,9 @@
public StartupDto getLocNoToOne(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
//鐩爣搴撲綅
LocMast locMast = null;
- if (locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
+ if (locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6||locTypeDto.getLocType2()==4){
//1鍙峰贩閬� 3绉嶈揣鐗╃被鍨�
- locMast=locMastService.queryLocToOne(locTypeDto.getLocType1());
+ locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
}else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
//2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index df37d7b..f25d588 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -115,6 +115,8 @@
locTypeDto.setLocType2((short) 7);
}else if (param.getBarcode().startsWith("8")){
locTypeDto.setLocType2((short) 8);
+ }else if (param.getBarcode().startsWith("4")){
+ locTypeDto.setLocType2((short) 4);
}else {
return R.error("鏉＄爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 3584080..1b36b39 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -122,16 +122,22 @@
<select id="queryLocToOne" resultMap="BaseResultMap">
select top 1 * from asr_loc_mast
- where loc_status = 'O' and row1 in (1,2)
- <if test="locType1 ! = null">
- and loc_type1 = #{locType1}
+ where loc_sts = 'O' and row1 in (1,2)
+ <if test="locType2 == 4">
+ and lev1 in(1)
+ </if>
+ <if test="locType2 == 5">
+ and lev1 in(2,3)
+ </if>
+ <if test="locType2 == 6">
+ and lev1 in(4,5)
</if>
order by lev1 asc,bay1 asc
</select>
<select id="queryLocToTwo" resultMap="BaseResultMap">
select top 1 * from asr_loc_mast
- where loc_status = 'O' and row1 in (3,4)
+ where loc_sts = 'O' and row1 in (3,4)
<if test="locType2 == 7">
and lev1 in(1,2)
</if>
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 6a7872b..6b2af22 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -96,7 +96,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="loc_type2">
+ <select name="loc_type1">
<option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
<option value="4">1500*1500*870</option>
<option value="5">1500*1500*1670</option>
--
Gitblit v1.9.1