From 2898bc675629c6b76e07cf89b0a55dc8b4514c28 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 13:39:13 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainScheduler.java | 10 ++++++++++
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 4 +++-
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 6 ++++++
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainScheduler.java b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
index 0bdff18..3cbc29a 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
@@ -55,4 +55,14 @@
}
+ // 澶勭悊寰呭彇娑堣鍗�
+ // @Scheduled(cron = "0/5 * * * * ? ")
+ public void cancelOrderExecute(){
+ List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 5));
+ if (Cools.isEmpty(custOrders)){
+ return;
+ }
+
+ }
+
}
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 a844e3c..2b94282 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
@@ -503,6 +503,12 @@
boolean complete = true;
Set<String> existNumbers = new HashSet<>();
+ String cancelNumber = "";
+ if (!custOrderService.updateStatus(cancelNumber, 5)) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
+
+
}
}
} catch (IOException e) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
index c805435..2d06e94 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -89,7 +89,7 @@
/**
* 鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父
*/
- @ApiModelProperty(value= "鐘舵�� 0: 杞藉叆涓� 1: 寰呭鐞� 2: 鏈嫞璐� 3: 鍙栨秷 4: 宸插畬鎴� ")
+ @ApiModelProperty(value= "鐘舵�� 0: 杞藉叆涓� 1: 寰呭鐞� 2: 鏈嫞璐� 3: 鍙栨秷 4: 宸插畬鎴� 5: 鍑嗗鍙栨秷 ")
private Integer status;
/**
@@ -244,6 +244,8 @@
return "鍙栨秷";
case 4:
return "宸插畬鎴�";
+ case 5:
+ return "鍑嗗鍙栨秷";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1