From 7714207440d4774b84b6490406bdebf228c1fee6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 24 十二月 2025 16:01:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 ++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 015f2bd..a908e6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1250,9 +1250,8 @@
.eq("weight", param.getWeight());
if (param.getDevNo() == 536){
// .eq("model", param.getTaskNo())
- wrapper
- .eq("specs", param.getOrderNo())
- .orderBy("appe_time", true);
+// .eq("specs", param.getOrderNo())
+ wrapper.orderBy("appe_time", true);
} else {
wrapper.orderBy("batch", true);
}
@@ -1280,8 +1279,8 @@
.gt("weight", param.getWeight());
if (param.getDevNo() == 536){
// .eq("model", param.getTaskNo())
+// .eq("specs", param.getOrderNo())
locDetlWrapper
- .eq("specs", param.getOrderNo())
.orderBy("appe_time", true)
.orderBy("weight", true);
} else {
@@ -1311,8 +1310,8 @@
.lt("weight", param.getWeight());
if (param.getDevNo() == 536){
// .eq("model", param.getTaskNo())
+// .eq("specs", param.getOrderNo())
locDetlWrapper
- .eq("specs", param.getOrderNo())
.orderBy("appe_time", true)
.orderBy("weight", false);
} else {
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index d338db9..03a64ac 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
@@ -47,6 +48,9 @@
for (Order order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
+ if (!orderService.updateSettle(order.getId(), 7L, null)) {
+ throw new CoolException("涓婃姤澶辫触鏇存柊璁㈠崟鐘舵�佸紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
--
Gitblit v1.9.1