From afd021e2e0312582c27caf905dc278f79af3ef59 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 15 七月 2023 09:19:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 +++++++
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 15 ++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index bbc9838..c1605a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -762,6 +762,13 @@
} else if (waitPakins.get(0).getIoStatus() == "Y") {
return R.error("缁勬墭宸茬粡鐢熸垚宸ヤ綔妗�");
}
+
+ for (WaitPakin waitPakin: waitPakins) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", waitPakin.getZpallet()));
+ if (Cools.isEmpty(manLocDetls) || manLocDetls.size()>0){
+ return R.error("鎵�鍦ㄥ簱浣嶅凡瀛樺湪鏄庣粏");
+ }
+ }
//鍒ゆ柇璁㈠崟鏄惁瀹屾垚
boolean log =true;
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 0dafa15..3ebd76a 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.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>()
--
Gitblit v1.9.1