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 | 23 +++++++++++++++++++++++
1 files changed, 23 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 009310e..e4049ed 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -17,6 +17,7 @@
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;
@@ -109,6 +110,7 @@
manLocDetl.setCreateTime(now);
manLocDetl.setModiTime(now);
manLocDetl.setCreateBy(userId);
+ SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
manLocDetlService.insert(manLocDetl);
}
@@ -135,13 +137,34 @@
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