From dd9636f6dbbc8bb0013e13e2a77acdde62b2695d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 九月 2023 16:18:42 +0800
Subject: [PATCH] #pda物料列表
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
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 f1a2e5d..5e4e901 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -7,10 +7,7 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Node;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
@@ -43,6 +40,12 @@
private OrderDetlService orderDetlService;
@Autowired
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));
@@ -196,10 +199,11 @@
}
ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
.eq("loc_no", targetNode.getUuid())
- .eq("matnr", source.getMatnr()));
+ .eq("matnr", source.getMatnr())
+ .eq("batch",source.getBatch()));
if (check == null) {
manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
- .eq("matnr", source.getMatnr()));
+ .eq("matnr", source.getMatnr()).eq("batch",source.getBatch()));
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
@@ -227,4 +231,27 @@
page.setTotal(baseMapper.listByPageCount(page.getCondition()));
return page;
}
+
+ @Override
+ public List<String> getRemmendLoc(String matnr) {
+ LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
+ if (locRule == null){
+ 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;
+ }
+
+ @Override
+ public int updateStockFreeze(String name, Integer status) {
+ return this.baseMapper.updateStockFreeze(name, status);
+ }
}
--
Gitblit v1.9.1