From 45dd167e12e11af8dc7929ff1475623c80fc3578 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 30 十月 2024 13:59:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 1dd5e23..1cb8241 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -165,23 +165,22 @@
}
}
// 纭鏄惁鍏ㄩ儴鍑哄簱
- int sameNumber = 0;
+ double totleWrkdetl = 0.0;
+ double totleLocdetl = 0.0;
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", pickParams.getWrkNo()));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
- if (agvLocDetl.getMatnr().equals(agvWrkDetl.getMatnr())
- && agvLocDetl.getThreeCode().equals(agvWrkDetl.getThreeCode())
- && agvLocDetl.getSuppCode().equals(agvWrkDetl.getSuppCode())
- && agvLocDetl.getAnfme().equals(agvWrkDetl.getAnfme())) {
- sameNumber++;
- }
- }
+ totleLocdetl = totleLocdetl + agvLocDetl.getAnfme();
}
- if (agvLocDetls.size() == sameNumber || agvLocDetls.size() == 1) {
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+ totleWrkdetl = totleWrkdetl + agvWrkDetl.getAnfme();
+ }
+ if (totleWrkdetl >= totleLocdetl) {
agvWrkMast.setIoType(101);
agvWrkMast.setModiTime(new Date());
agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));
+
}
+// agvLocDetls.size() == 1
return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�";
--
Gitblit v1.9.1