From cc79183af9dda2e2e983ad9915d41f9c3fe2ed11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 15 七月 2023 15:29:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 c9671a6..3ebd76a 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -85,7 +85,7 @@
}
@Override
- public R stockPakin(PakinParam param, Long userId, Long hostId , User user) {
+ 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());
@@ -104,13 +104,13 @@
throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
}
ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", node.getUuid())
+ .eq("loc_no", node.getName())
.eq("matnr", dto.getMatnr()));
if (check == null) {
ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setLocNo(node.getName());
manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
+ manLocDetl.setZpallet(node.getName());
manLocDetl.setAnfme(dto.getCount());
manLocDetl.setMatnr(mat.getMatnr());
manLocDetl.setMaktx(mat.getMaktx());
@@ -126,10 +126,11 @@
SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
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()));
+// check.setAnfme(dto.getCount() + check.getAnfme());
+// manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+// .eq("loc_no", node.getName())
+// .eq("matnr", dto.getMatnr()));
+ return R.error("搴撲綅瀛樺湪鐗╂枡锛岃鍕块噸澶嶅叆搴�");
}
if (!Cools.isEmpty(dto.getOrderNo())) {
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
@@ -145,7 +146,7 @@
@Transactional
@Override
- public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId, User user) {
+ public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
if (!Cools.isEmpty(params)) {
Date now = new Date();
for (InitPakoutParam param : params) {
@@ -182,7 +183,7 @@
@Transactional
@Override
- public void locMove(String sourceLocNo, String targetLocNo, Long userId, User user) {
+ public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
.like("loc_no", sourceLocNo));
for (ManLocDetl source : sourceManDetl) {
--
Gitblit v1.9.1