From 57975f00790aea9ffea369c0c68b55137bf4123e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 09:03:36 +0800
Subject: [PATCH] #成品原材料放货区域划分
---
src/main/java/com/zy/asrs/mapper/MatMapper.java | 2 ++
src/main/resources/mapper/MatMapper.xml | 6 ++++++
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 5 +++++
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/MatService.java | 2 ++
5 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index c8457c2..111bec9 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -27,4 +27,6 @@
Integer getStockOutPageCount(Map<String, Object> map);
+ Integer getTagIdByMatnr(String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index dd30afd..498171e 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -18,4 +18,6 @@
Mat selectNewUpdateTime();
+ Integer getTagIdByMatnr(String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8ab8e75..cd7f91b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -45,6 +45,11 @@
return page;
};
+ @Override
+ public Integer getTagIdByMatnr(String matnr) {
+ return this.baseMapper.getTagIdByMatnr(matnr);
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0697a08..6eeffa5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
@@ -52,6 +53,8 @@
private LocDetlService locDetlService;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MatServiceImpl matService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -157,6 +160,7 @@
int eRow = rowLastno.geteRow();
int crnNumber = rowLastno.getCrnQty();
+ int tagId = matService.getTagIdByMatnr(matnr);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -362,6 +366,26 @@
// }
if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(whsType)){
+ if(tagId == 226){
+ List<LocMast> filteredLocMasts = new ArrayList<>();
+ for (LocMast loc : locMasts) {
+ Integer lev = loc.getLev1();
+ if (lev != null && lev >= 6 && lev <= 10) {
+ filteredLocMasts.add(loc);
+ }
+ }
+ locMasts = filteredLocMasts;
+ }
+// if(tagId == 226){ //鍘熸潗鏂欐瘺鑳氱瓑
+// List<LocMast> filteredLocMasts = new ArrayList<>();
+// for (LocMast loc : locMasts) {
+// Integer lev = loc.getLev1();
+// if (lev != null && lev >= 1 && lev <= 5) {
+// filteredLocMasts.add(loc);
+// }
+// }
+// locMasts = filteredLocMasts;
+// }
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index b7157a6..6cc8de5 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -141,4 +141,10 @@
and a.matnr = #{matnr}
</if>
</select>
+
+ <select id="getTagIdByMatnr" resultType="java.lang.Integer">
+ select tag_id
+ from man_mat
+ where matnr = #{matnr}
+ </select>
</mapper>
--
Gitblit v1.9.1