From 27ab23aff4162280378042d6df573de95a788dfa Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 21 十二月 2024 20:29:26 +0800
Subject: [PATCH] 优化库位查找逻辑及AGV工作处理
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index b4caa36..4e29def 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -133,12 +133,17 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
+ if (pltType == null) {
+ if (!this.updateSettle(order.getId(), 4L, 9528L)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+ }
+ } else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
if (pltType != null && pltType > 0) {
order.setPltType(pltType);
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
super.updateById(order);
}
//order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
--
Gitblit v1.9.1