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 | 170 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 41 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 e4049ed..aee47b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -1,31 +1,27 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
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.*;
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.ManLocDetlService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.NodeService;
+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;
@Service("nodeService")
public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements NodeService {
@@ -37,6 +33,16 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ 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));
@@ -79,7 +85,7 @@
}
@Override
- public R stockPakin(PakinParam param, Long userId, Long hostId) {
+ public R stockPakin(PakinParam param, Long userId, Long hostId, User user) {
Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
if (node == null) {
node = nodeService.selectById(param.getNodeId());
@@ -92,34 +98,56 @@
}
Date now = new Date();
for (MatnrDto dto : param.getMats()) {
+
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (mat == null) {
throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
}
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getUuid());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
- manLocDetl.setAnfme(dto.getCount());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setName(mat.getName());
- manLocDetl.setSpecs(mat.getSpecs());
- manLocDetl.setModel(mat.getModel());
- manLocDetl.setBatch(mat.getBeBatch() + "");
- manLocDetl.setCreateTime(now);
- manLocDetl.setModiTime(now);
- manLocDetl.setCreateBy(userId);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
- manLocDetlService.insert(manLocDetl);
-
+ ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", node.getUuid())
+ .eq("matnr", dto.getMatnr()));
+ if (check == null) {
+ ManLocDetl manLocDetl = new ManLocDetl();
+ manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setZpallet(node.getUuid());
+ manLocDetl.setAnfme(dto.getCount());
+ manLocDetl.setMatnr(mat.getMatnr());
+ manLocDetl.setMaktx(mat.getMaktx());
+ manLocDetl.setName(mat.getName());
+ manLocDetl.setBatch(null);
+ manLocDetl.setSpecs(mat.getSpecs());
+ manLocDetl.setModel(mat.getModel());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setModiTime(now);
+ manLocDetl.setCreateBy(userId);
+ manLocDetl.setStatus(1);
+ manLocDetl.setPayment(1);
+ 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());
+// manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+// .eq("loc_no", node.getUuid())
+// .eq("matnr", dto.getMatnr()));
+ return R.error("搴撲綅瀛樺湪鐗╂枡锛岃鍕块噸澶嶅叆搴�");
+ }
+ if (!Cools.isEmpty(dto.getOrderNo())) {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+ .eq("order_no", dto.getOrderNo())
+ .eq("matnr", dto.getMatnr()));
+ orderDetl.setQty(orderDetl.getQty() + dto.getCount());
+ orderDetlService.updateById(orderDetl);
+ orderService.checkSettleUpdate(orderDetl.getOrderId());
+ }
}
return R.ok("鍏ュ簱鎴愬姛");
}
@Transactional
@Override
- public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId) {
+ public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
if (!Cools.isEmpty(params)) {
Date now = new Date();
for (InitPakoutParam param : params) {
@@ -136,13 +164,20 @@
}
if (manLocDetl.getAnfme() - param.getCount() < 0) {
return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
- }else {
+ } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
+ 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()));
+ } else {
manLocDetl.setAnfme(manLocDetl.getAnfme() - param.getCount());
manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
+ null,null,null,null,null);
}
}
}
@@ -151,20 +186,73 @@
@Transactional
@Override
- public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
- List<ManLocDetl> targets = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
- .like("loc_no", sourceLocNo));
- for (ManLocDetl target : targets) {
- Node uuid = nodeService.selectOne(new EntityWrapper<Node>()
+ public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
+ List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", sourceLocNo));
+ for (ManLocDetl source : sourceManDetl) {
+ Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
.eq("uuid", targetLocNo));
- if (uuid == null || uuid.equals("")) {
+ Node sourceNode = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("uuid", sourceLocNo));
+ if (targetNode == null || targetNode.equals("")) {
throw new RuntimeException("鏃犳硶鏌ヨ鍒扮Щ搴撶殑鐩爣搴撲綅");
}
- manLocDetlService.deleteById(target);
- target.setLocNo(uuid.getUuid());
- target.setNodeId(uuid.getId());
- SaasUtils.insertLog(2,target.getLocNo(), target.getMatnr(), target.getAnfme());
- manLocDetlService.insert(target);
+ ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", targetNode.getUuid())
+ .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("batch",source.getBatch()));
+ source.setLocNo(targetNode.getUuid());
+ source.setNodeId(targetNode.getId());
+
+ 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());
+// 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("鐩爣搴撲綅鏈夌墿");
+ }
+
}
}
+
+ @Override
+ public Page<Node> getPage(Page<Node> page) {
+ Map<String, Object> condition = page.getCondition();
+ List<Node> manLocDetls = baseMapper.listByPage(condition);
+ page.setRecords(manLocDetls);
+ 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