From c10d6eed67a1b4a91e52ff2fc41524962018a842 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 16:59:54 +0800
Subject: [PATCH] #订单上架优化
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 ++++-
src/main/resources/mapper/LocMastMapper.xml | 3 +++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 12 ++++++++++++
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 3 ++-
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +-
7 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index e22c119..0725d03 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -30,7 +30,7 @@
List<LocMast> selectNodeByLev(Integer lev);
-
+ LocMast selectLocStatus(@Param("locno") String locno);
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index b1a62a9..b0278df 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocDetlWarningDTO;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.result.StockVo;
import org.apache.ibatis.annotations.Mapper;
@@ -54,7 +55,7 @@
// -------------------------------------------------
- List<ManLocDetl> queryStock(@Param("matnr")String matnr);
+ List<ManLocDetl> queryStock(@Param("matnr") String matnr);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bd092ac..33a9aa6 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -43,7 +43,7 @@
List<LocMast> selectNodeLocByLev(Integer lev);
-
+ LocMast selectLocStatus(String locno);
List<LocMast> selectByLocNo(List<String> locNo);
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 268c5a9..b46836a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -65,7 +65,10 @@
return this.baseMapper.selectNodeByLev(lev);
}
-
+ @Override
+ public LocMast selectLocStatus(String locno) {
+ return this.baseMapper.selectLocStatus(locno);
+ }
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 4c78870..00888c8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -530,6 +530,11 @@
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index 31c7051..e99b217 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -42,6 +42,10 @@
private OrderService orderService;
@Autowired
private LocRuleService locRuleService;
+ @Autowired
+ private LocMastService locMastService;
+
+
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -234,6 +238,14 @@
return null;
}
List<String> list = this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
+ //鍒犻櫎鎺ㄨ崘搴撲綅涓鍐荤粨鐨勫簱浣�
+ list.stream().findFirst().map(e ->{
+ LocMast locMast = locMastService.selectLocStatus(e);
+ if (locMast.getLocSts().equals("X")){
+ list.remove(e);
+ }
+ return e;
+ });
return list;
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 3416797..6c8748f 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -91,6 +91,9 @@
SELECT * FROM asr_node_loc_view WHERE lev1 = #{lev}
</select>
+ <select id="selectLocStatus" resultMap="BaseResultMap">
+ SELECT * FROM asr_node_loc_view WHERE loc_no = #{locno}
+ </select>
--
Gitblit v1.9.1