From 9bc4c5f02cc53961725af9683b75899ac22a6720 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 12 十一月 2025 12:32:22 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 +-
src/main/webapp/views/pakStore/clampDetlQuery.html | 12 +++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 +-
src/main/resources/mapper/LocMastMapper.xml | 14 ++-----
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2
src/main/java/com/zy/common/web/WcsController.java | 4 -
src/main/webapp/views/pakStore/emptyOut.html | 10 ++--
src/main/java/com/zy/asrs/entity/LocMast.java | 10 ++--
src/main/java/com/zy/asrs/service/LocMastService.java | 2
src/main/java/com/zy/common/service/CommonService.java | 9 ++--
10 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 3491c2b..01cf33b 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -231,15 +231,15 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 4:
- return "绗竴绉嶆墭鐩�";
+ return "1500*1500*870";
case 5:
- return "绗簩绉嶆墭鐩�";
+ return "1500*1500*1670";
case 6:
- return "绗笁绉嶆墭鐩�";
+ return "2000*1500*2170";
case 7:
- return "绗洓绉嶆墭鐩�";
+ return "2600*1500*660";
case 8:
- return "绗簲绉嶆墭鐩�";
+ return "1300*1500*1460";
default:
return String.valueOf(this.locType2);
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index b20d55e..f6f76a1 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 locType2);
+ LocMast queryLocToOne(Short locType1);
LocMast queryLocToTwo(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 1bfcb56..924ee52 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 locType2);
+ LocMast queryLocToOne(Short locType1);
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 62ca66e..c73ca94 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 locType2) {
- return this.baseMapper.queryLocToOne(locType2);
+ public LocMast queryLocToOne(Short locType1) {
+ return this.baseMapper.queryLocToOne(locType1);
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 85c5753..e7dccc5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -111,7 +111,7 @@
locDetl.setAppeTime(now);
locDetl.setModel(wrkDetl.getModel());
- locDetl.setTemp1(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
+ locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -228,7 +228,7 @@
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
- locDetl.setTemp1(wrkDetl.getZpallet().substring(0,1));//骞舵澘鍑哄簱鏍规嵁鎵樼洏绫诲瀷鍘婚�夋嫨
+ locDetl.setTemp1(locMast.getLocType2().toString());//骞舵澘鍑哄簱鏍规嵁璐х墿绫诲瀷鍘婚�夋嫨
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3950ae3..b72676b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -383,11 +383,12 @@
public StartupDto getLocNoToOne(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
//鐩爣搴撲綅
LocMast locMast = null;
- //1鍙峰贩閬� 3绉嶆墭鐩樼被鍨�
- if (locTypeDto.getLocType2()==4||locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
- locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
+ if (locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
+ //1鍙峰贩閬� 3绉嶈揣鐗╃被鍨�
+ locMast=locMastService.queryLocToOne(locTypeDto.getLocType1());
+
}else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
- //2鍙峰贩閬� 2绉嶇被鍨嬫墭鐩�
+ //2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
}else {
throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅绫诲瀷:"+locTypeDto.getLocType2());
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b525134..a18172b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -107,9 +107,7 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- if (param.getBarcode().startsWith("4")){
- locTypeDto.setLocType2((short) 4);
- }else if (param.getBarcode().startsWith("5")){
+ if (param.getBarcode().startsWith("5")){
locTypeDto.setLocType2((short) 5);
}else if (param.getBarcode().startsWith("6")){
locTypeDto.setLocType2((short) 6);
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index da60f3c..3584080 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -121,22 +121,16 @@
</select>
<select id="queryLocToOne" resultMap="BaseResultMap">
- select top 1 loc_no as locNo,crn_no as crnNo from asr_loc_mast
+ select top 1 * from asr_loc_mast
where loc_status = 'O' and row1 in (1,2)
- <if test="locType2 == 4">
- and lev1 = 1
- </if>
- <if test="locType2 == 5">
- and lev1 in(2,3)
- </if>
- <if test="locType2 == 6">
- and lev1 in(4,5)
+ <if test="locType1 ! = null">
+ and loc_type1 = #{locType1}
</if>
order by lev1 asc,bay1 asc
</select>
<select id="queryLocToTwo" resultMap="BaseResultMap">
- select top 1 loc_no as locNo,crn_no as crnNo from asr_loc_mast
+ select top 1 * from asr_loc_mast
where loc_status = 'O' and row1 in (3,4)
<if test="locType2 == 7">
and lev1 in(1,2)
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery.html b/src/main/webapp/views/pakStore/clampDetlQuery.html
index f23376f..6618a4a 100644
--- a/src/main/webapp/views/pakStore/clampDetlQuery.html
+++ b/src/main/webapp/views/pakStore/clampDetlQuery.html
@@ -79,13 +79,13 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <select name="temp1" type="text">
+ <select name="temp1">
<option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
- <option value="4">绗竴绉�</option>
- <option value="5">绗簩绉�</option>
- <option value="6">绗笁绉�</option>
- <option value="7">绗洓绉�</option>
- <option value="8">绗簲绉�</option>
+ <option value="4">1500*1500*870</option>
+ <option value="5">1500*1500*1670</option>
+ <option value="6">2000*1500*2170</option>
+ <option value="7">2600*1500*660</option>
+ <option value="8">1300*1500*1460</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 8ecc016..6a7872b 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -98,11 +98,11 @@
<div class="layui-input-inline">
<select name="loc_type2">
<option value="">璇烽�夋嫨鎵樼洏绫诲瀷</option>
- <option value="4">绗竴绉�</option>
- <option value="5">绗簩绉�</option>
- <option value="6">绗笁绉�</option>
- <option value="7">绗洓绉�</option>
- <option value="8">绗簲绉�</option>
+ <option value="4">1500*1500*870</option>
+ <option value="5">1500*1500*1670</option>
+ <option value="6">2000*1500*2170</option>
+ <option value="7">2600*1500*660</option>
+ <option value="8">1300*1500*1460</option>
</select>
</div>
</div>
--
Gitblit v1.9.1