From e223a9800b822c4fdb4cfd84911838b5dd1042e5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 四月 2021 11:46:14 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 1ee65f0..f0c48c5 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -769,9 +769,13 @@
                         existNumbers.add(result0.getNumber());
                     }
                     for (String number : existNumbers) {
-                        if (!orderService.updateSettle(number, 5L)) {
+                        Order order = orderService.selectByOrderNo(number);
+                        if (order.getSettle() != 3L && order.getSettle() != 5L) {
+                            if (!orderService.updateSettle(number, 5L)) {
 //                            throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+                            }
                         }
+
                     }
 
                 }

--
Gitblit v1.9.1