From 5d69d40253e6ab640d09319074dbccdc43bd2eb3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 十月 2023 15:52:51 +0800
Subject: [PATCH] #组托限制平库托盘码
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 3ebd76a..f1a2e5d 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -104,13 +104,13 @@
throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
}
ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", node.getName())
+ .eq("loc_no", node.getUuid())
.eq("matnr", dto.getMatnr()));
if (check == null) {
ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getName());
+ manLocDetl.setLocNo(node.getUuid());
manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(node.getName());
+ manLocDetl.setZpallet(node.getUuid());
manLocDetl.setAnfme(dto.getCount());
manLocDetl.setMatnr(mat.getMatnr());
manLocDetl.setMaktx(mat.getMaktx());
@@ -128,7 +128,7 @@
}else {
// check.setAnfme(dto.getCount() + check.getAnfme());
// manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
-// .eq("loc_no", node.getName())
+// .eq("loc_no", node.getUuid())
// .eq("matnr", dto.getMatnr()));
return R.error("搴撲綅瀛樺湪鐗╂枡锛岃鍕块噸澶嶅叆搴�");
}
@@ -185,7 +185,7 @@
@Override
public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
- .like("loc_no", sourceLocNo));
+ .eq("loc_no", sourceLocNo));
for (ManLocDetl source : sourceManDetl) {
Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
.eq("uuid", targetLocNo));
@@ -198,20 +198,22 @@
.eq("loc_no", targetNode.getUuid())
.eq("matnr", source.getMatnr()));
if (check == null) {
- manLocDetlService.deleteById(source);
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", source.getLocNo())
+ .eq("matnr", source.getMatnr()));
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
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()));
+// 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("鐩爣搴撲綅鏈夌墿");
}
}
--
Gitblit v1.9.1