From cf18470cf429a992da434b8b4eb22c30d849c66a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 02 六月 2023 09:41:16 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 31 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..81546df 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -9,14 +9,13 @@
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.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 org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +36,10 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderService orderService;
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -92,27 +95,45 @@
}
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(mat.getBarcode());
+ 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);
+ SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
+ 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()));
+ }
+ 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("鍏ュ簱鎴愬姛");
}
@@ -136,13 +157,18 @@
}
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());
+ 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());
}
}
}
@@ -152,19 +178,36 @@
@Transactional
@Override
public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
- List<ManLocDetl> targets = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
+ List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
.like("loc_no", sourceLocNo));
- for (ManLocDetl target : targets) {
- Node uuid = nodeService.selectOne(new EntityWrapper<Node>()
+ 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()));
+ if (check == null) {
+ manLocDetlService.deleteById(source);
+ source.setLocNo(targetNode.getUuid());
+ source.setNodeId(targetNode.getId());
+
+ SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
+ 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()));
+ }
+
}
}
}
--
Gitblit v1.9.1