From b25fc15afed603c0c874e77d37bf93f08d5398c9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 13 二月 2025 12:18:34 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 41dc775..ececff1 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -876,11 +876,11 @@
agvWrkMast.setModiTime(now);
agvWrkMast.setIoTime(now);
// 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭ｄ箞闇�瑕佽法灞傜Щ搴�
- if (!Cools.isEmpty(factory)){
- if (newLocMast.getLev1() == 1 && factory.equals(AsrsConstants.SANCHANG)) {
- agvWrkMast.setPacked("1");
- } else if (newLocMast.getLev1() == 2 && factory.equals(AsrsConstants.ERCHANG)) {
- agvWrkMast.setPacked("1");
+ if (!Cools.isEmpty(factory)) {
+ if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
+ agvWrkMast.setCtnNo("1");
+ } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
+ agvWrkMast.setCtnNo("2");
}
}
if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) {
@@ -977,7 +977,8 @@
} else {
orderDetl = orderDetls.get(0);
}
- orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
+ double v = orderDetl.getQty() - agvWrkDetl.getAnfme();
+ orderDetl.setQty(v < 0 ? 0 : v);
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + orderDetl.getOrderNo() + orderDetl.getMatnr());
}
--
Gitblit v1.9.1