From 43a40046a19a5e5c1b443017ce31ece34e1d7460 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 四月 2021 14:48:44 +0800
Subject: [PATCH] #批量审核盘点记录
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 e4f8b0c..66a60f2 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
@@ -549,7 +549,7 @@
// 澶�
- getOrderResult0.setNumber(order.getOrderNo());
+ getOrderResult0.setNumber(order.getUuid());
getOrderResult0.setVchType(11); // todo:luxiaotao
getOrderResult0.setBillDate(order.getOrderTime());
getOrderResult0.setBTypeID(order.getTel());
@@ -585,7 +585,7 @@
if (result.getCode() != 1) {
continue;
}
- if (!orderService.updateSettle(getOrderResult0.getNumber(), 6L)) {
+ if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
// // 杞巻鍙叉。
@@ -769,8 +769,13 @@
existNumbers.add(result0.getNumber());
}
for (String number : existNumbers) {
- if (!orderService.updateSettle(number, 5L)) {
+ Order order = orderService.selectByOrderNo(number);
+ if (order != null) {
+ if (order.getSettle() != 3L && order.getSettle() != 5L) {
+ if (!orderService.updateSettle(number, 5L)) {
// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
+ }
}
}
--
Gitblit v1.9.1