From 0b4036950ca61835a29ed0a13379a68af652fa59 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 十二月 2023 10:30:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 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 3ebd76a..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));
@@ -104,13 +107,13 @@
throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
}
ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", node.getName())
+ .eq("loc_no", node.getUuid())
.eq("matnr", dto.getMatnr()));
if (check == null) {
ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getName());
+ manLocDetl.setLocNo(node.getUuid());
manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(node.getName());
+ manLocDetl.setZpallet(node.getUuid());
manLocDetl.setAnfme(dto.getCount());
manLocDetl.setMatnr(mat.getMatnr());
manLocDetl.setMaktx(mat.getMaktx());
@@ -128,7 +131,7 @@
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
// manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
-// .eq("loc_no", node.getName())
+// .eq("loc_no", node.getUuid())
// .eq("matnr", dto.getMatnr()));
return R.error("搴撲綅瀛樺湪鐗╂枡锛岃鍕块噸澶嶅叆搴�");
}
@@ -185,7 +188,7 @@
@Override
public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
- .like("loc_no", sourceLocNo));
+ .eq("loc_no", sourceLocNo));
for (ManLocDetl source : sourceManDetl) {
Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
.eq("uuid", targetLocNo));
@@ -196,22 +199,25 @@
}
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.deleteById(source);
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
+ .eq("matnr", source.getMatnr()).eq("batch",source.getBatch()));
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
manLocDetlService.insert(source);
}else {
- check.setAnfme(check.getAnfme() + source.getAnfme());
- manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", targetNode.getUuid())
- .eq("matnr", check.getMatnr()));
- manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", sourceNode.getUuid())
- .eq("matnr", source.getMatnr()));
+// check.setAnfme(check.getAnfme() + source.getAnfme());
+// manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+// .eq("loc_no", targetNode.getUuid())
+// .eq("matnr", check.getMatnr()));
+// manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
+// .eq("loc_no", sourceNode.getUuid())
+// .eq("matnr", source.getMatnr()));
+ throw new RuntimeException("鐩爣搴撲綅鏈夌墿");
}
}
@@ -225,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