From 9bd709ba929ca4885e2c118039d70f5268cc1e31 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 28 四月 2021 08:58:04 +0800
Subject: [PATCH] 发货通知逻辑调整

---
 src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java |   18 +++++++++---------
 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java        |    4 ++--
 src/main/java/com/zy/common/service/erp/entity/OutStockBill.java      |   18 +++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/common/service/erp/entity/OutStockBill.java b/src/main/java/com/zy/common/service/erp/entity/OutStockBill.java
index 8fedbde..4122e2a 100644
--- a/src/main/java/com/zy/common/service/erp/entity/OutStockBill.java
+++ b/src/main/java/com/zy/common/service/erp/entity/OutStockBill.java
@@ -35,7 +35,7 @@
     private Integer FCustID;
     /*鏃ユ湡*/
     @TableField("FDate")
-    private Date FDate;
+    private String FDate;
     /*鏀惰揣浠撳簱*/
     @TableField("FStockID")
     private Integer FStockID;
@@ -83,7 +83,7 @@
     private Short FStatus;
     /*浣滃簾*/
     @TableField("FCancellation")
-    private Long FCancellation;
+    private String FCancellation;
     /*涓�瀹�*/
     @TableField("FMultiCheckLevel1")
     private Integer FMultiCheckLevel1;
@@ -104,22 +104,22 @@
     private Integer FMultiCheckLevel6;
     /*涓�绾у鏍告棩鏈�*/
     @TableField("FMultiCheckDate1")
-    private Date FMultiCheckDate1;
+    private String FMultiCheckDate1;
     /*浜岀骇瀹℃牳鏃ユ湡*/
     @TableField("FMultiCheckDate2")
-    private Date FMultiCheckDate2;
+    private String FMultiCheckDate2;
     /*涓夌骇瀹℃牳鏃ユ湡*/
     @TableField("FMultiCheckDate3")
-    private Date FMultiCheckDate3;
+    private String FMultiCheckDate3;
     /*鍥涚骇瀹℃牳鏃ユ湡*/
     @TableField("FMultiCheckDate4")
-    private Date FMultiCheckDate4;
+    private String FMultiCheckDate4;
     /*浜旂骇瀹℃牳鏃ユ湡*/
     @TableField("FMultiCheckDate5")
-    private Date FMultiCheckDate5;
+    private String FMultiCheckDate5;
     /*鍏骇瀹℃牳鏃ユ湡*/
     @TableField("FMultiCheckDate6")
-    private Date FMultiCheckDate6;
+    private String FMultiCheckDate6;
     @TableField("FCurCheckLevel")
     private Integer FCurCheckLevel;
     /*璁㈣揣鏈烘瀯*/
@@ -127,7 +127,7 @@
     private Integer FRelateBrID;
     /*瀹℃牳鏃ユ湡*/
     @TableField("FCheckDate")
-    private Date FCheckDate;
+    private String FCheckDate;
     @TableField("FExplanation")
     private String FExplanation;
     @TableField("FFetchAdd")
diff --git a/src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java b/src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java
index 9e941bc..0d58e51 100644
--- a/src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java
+++ b/src/main/java/com/zy/common/service/erp/entity/OutStockBillEntry.java
@@ -51,7 +51,7 @@
     private Integer FOrderInterID;
     /*鏃ユ湡*/
     @TableField("FDate")
-    private Date FDate;
+    private String FDate;
     /*澶囨敞*/
     @TableField("FNote")
     private String FNote;
@@ -93,25 +93,25 @@
     @TableField("FBatchNo")
     private String FBatchNo;
     @TableField("FCheckDate")
-    private Date FCheckDate;
+    private String FCheckDate;
     @TableField("FExplanation")
     private String FExplanation;
     @TableField("FFetchAdd")
     private String FFetchAdd;
     @TableField("FFetchDate")
-    private Date FFetchDate;
+    private String FFetchDate;
     @TableField("FMultiCheckDate1")
-    private Date FMultiCheckDate1;
+    private String FMultiCheckDate1;
     @TableField("FMultiCheckDate2")
-    private Date FMultiCheckDate2;
+    private String FMultiCheckDate2;
     @TableField("FMultiCheckDate3")
-    private Date FMultiCheckDate3;
+    private String FMultiCheckDate3;
     @TableField("FMultiCheckDate4")
-    private Date FMultiCheckDate4;
+    private String FMultiCheckDate4;
     @TableField("FMultiCheckDate5")
-    private Date FMultiCheckDate5;
+    private String FMultiCheckDate5;
     @TableField("FMultiCheckDate6")
-    private Date FMultiCheckDate6;
+    private String FMultiCheckDate6;
     @TableField("FSecCoefficient")
     private BigDecimal FSecCoefficient;
     @TableField("FSecQty")
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index 0ae5cf1..c103a4e 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -194,7 +194,7 @@
     /**
      * 鎴愬搧鍑哄簱-鍙戣揣閫氱煡鍗曡〃澶�
      */
-    @Scheduled(cron = "0/30 * * * * ? ")
+    @Scheduled(cron = "0/15 * * * * ? ")
     public void syncOutStock(){
         List<OutStockBill> result = erpService.syncOutStock();
         for (Integer i = 0; i < result.size(); i++) {
@@ -210,7 +210,7 @@
     /**
      * 鎴愬搧鍑哄簱-鍙戣揣閫氱煡鍗曡〃浣�
      */
-    @Scheduled(cron = "0/30 * * * * ? ")
+    @Scheduled(cron = "0/15 * * * * ? ")
     public void syncOutStockDetail(){
         List<OutStockBillEntry> result = erpService.syncOutStockDetail();
         for (Integer i = 0; i < result.size(); i++) {

--
Gitblit v1.9.1