From df702972ff8ae890991021663d919f47dc864606 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 24 十二月 2024 10:35:23 +0800
Subject: [PATCH] 优化ReportDataHandler响应处理逻辑
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 d456053..9de9ce6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -133,15 +133,20 @@
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.yyyyMMddHHmmsssss_F))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
if (pltType != null && pltType > 0) {
order.setPltType(pltType);
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ this.baseMapper.updateById(order);
}
//order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
- super.updateById(order);
}
--
Gitblit v1.9.1