From e0caa6730a116f82888cc6fe2c2c2717553d1150 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 13 九月 2022 12:49:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 115 insertions(+), 0 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 7bda2b3..e4049ed 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -2,16 +2,41 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.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.utils.SaasUtils;
+import com.zy.asrs.utils.VersionUtils;
+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;
@Service("nodeService")
public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements NodeService {
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -52,4 +77,94 @@
public Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId) {
return selectOne(new EntityWrapper<Node>().eq("host_id", hostId).eq("uuid", uuid).eq("type", type).eq("parent_id", parentId));
}
+
+ @Override
+ public R stockPakin(PakinParam param, Long userId, Long hostId) {
+ Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
+ if (node == null) {
+ node = nodeService.selectById(param.getNodeId());
+ }
+ if (node == null) {
+ return R.error("璐т綅涓嶅瓨鍦�");
+ }
+ if (Cools.isEmpty(param.getMats())) {
+ return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
+ }
+ 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);
+
+ }
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @Transactional
+ @Override
+ public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId) {
+ if (!Cools.isEmpty(params)) {
+ Date now = new Date();
+ for (InitPakoutParam param : params) {
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("node_id", param.getNodeId())
+ .eq("matnr", param.getMatnr()));
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("id", param.getNodeId()));
+ if (node == null) {
+ return R.error("鎵句笉鍒拌搴撲綅,璇疯仈绯荤鐞嗗憳:" + param.getNodeId() );
+ }
+ if (manLocDetl == null) {
+ return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�");
+ }
+ if (manLocDetl.getAnfme() - param.getCount() < 0) {
+ return R.error("鐗╂枡:"+ 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());
+ }
+ }
+ }
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @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>()
+ .eq("uuid", targetLocNo));
+ if (uuid == null || uuid.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);
+ }
+ }
}
--
Gitblit v1.9.1