From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 329ceec..aee47b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -11,17 +11,14 @@
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
-import com.zy.asrs.entity.result.Pakin;
import com.zy.asrs.mapper.NodeMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.SaasUtils;
-import com.zy.asrs.utils.VersionUtils;
import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.beans.Transient;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -42,6 +39,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));
@@ -122,7 +123,8 @@
manLocDetl.setCreateBy(userId);
manLocDetl.setStatus(1);
manLocDetl.setPayment(1);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
manLocDetlService.insert(manLocDetl);
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
@@ -163,7 +165,8 @@
if (manLocDetl.getAnfme() - param.getCount() < 0) {
return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
} else if (manLocDetl.getAnfme() - param.getCount() == 0) {
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
+ null,null,null,null,null);
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
@@ -173,7 +176,8 @@
manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername());
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
+ null,null,null,null,null);
}
}
}
@@ -195,14 +199,16 @@
}
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());
- SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
manLocDetlService.insert(source);
}else {
// check.setAnfme(check.getAnfme() + source.getAnfme());
@@ -230,7 +236,23 @@
@Override
public List<String> getRemmendLoc(String matnr) {
LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
- this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
- return
+ 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