From 672487e96667c7eef98b8208d64ab9bfcd48a1c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:04:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/utils/VersionUtils.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 -
src/main/resources/mapper/LocMastMapper.xml | 6 ------
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4 ++--
src/main/java/com/zy/common/model/LocTypeDto.java | 17 ++++++++---------
6 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index c30bea4..e34d937 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -20,7 +20,7 @@
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
- @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
- Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+ @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
+ Integer selectEmptyLocCount(@Param("crnNo") Integer crnNo);
}
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 19a6980..c139b03 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -53,7 +53,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2a8104d..df4d621 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -942,7 +942,6 @@
throw new CoolException("鍏ュ簱閫氱煡妗ｄ笉鑳戒负绌�");
}
LocTypeDto locTypeDto = new LocTypeDto();
- locTypeDto.setLocType1((short) 1);
return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list);
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index b61bfb3..6b46fa9 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -117,9 +117,9 @@
**/
public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
- return false;
- }
+// if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+// return false;
+// }
return true;
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 151dd75..2428548 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,7 +1,6 @@
package com.zy.common.model;
import com.alibaba.fastjson.JSON;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -26,14 +25,14 @@
}
public LocTypeDto(BasDevp basDevp) {
- if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
- }
- if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 浣庡簱浣�
- } else {
- this.locType1 = 2; // 楂樺簱浣�
- }
+// if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
+// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+// }
+// if (basDevp.getLocType1() == 1) {
+// this.locType1 = 1; // 浣庡簱浣�
+// } else {
+// this.locType1 = 2; // 楂樺簱浣�
+// }
log.info(JSON.toJSONString(this));
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index bc2f802..7320cf3 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -63,9 +63,6 @@
#{item}
</foreach>
and loc_sts = 'O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
and loc_no not in ('0100101', '0100201', '0100301')
and bay1 != 1 and lev1 != 1
group by ctn_no
@@ -80,9 +77,6 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
--
Gitblit v1.9.1