From b4ec8b4cc3476b49b9bc47e11ec03c4eecaba880 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 06 三月 2025 19:27:52 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 ddb7f00..2cba774 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -516,7 +516,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
mast.setAppeUser(userId);
mast.setAppeTime(now);
@@ -666,7 +666,7 @@
throw new CoolException("闈炴墜鍔ㄨ皟鎷ㄤ换鍔★紝涓嶆敮鎸佹鍔熻兘");
}
if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
- throw new CoolException("褰撳墠璐ф灦鐮佷换鏈夋簮搴撲綅锛岃纭");
+ throw new CoolException("褰撳墠璐ф灦鐮佹湁婧愬簱浣嶏紝璇风‘璁�");
}
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(param.getDevNo());
if (Cools.isEmpty(agvWrkMast)) {
@@ -864,7 +864,7 @@
// TODO: 鍥涙湡
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("supp_code", param.getBarcode()));
String factory = param.getFactory();
- AgvLocMast newLocMast = agvCommonService.getLocByLocRule(3, 1, factory);
+ AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory,false);
if (newLocMast == null) {
throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
}
@@ -880,7 +880,7 @@
if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
agvWrkMast.setCtnNo("1");
} else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
- agvWrkMast.setCtnNo("1");
+ 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