From ad5fef776eb9d66a0fcfc2ddf89698c5642e0eec Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:36:24 +0800
Subject: [PATCH] 增加一个定时任务。如果拣货出库过程中，相同料箱号，存在(199 ，200)的任务 并且同时存在 101,196的任务 则101和196的任务会 自动变成199
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
index aeaf704..f86e9de 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.Date;
@Data
@ExcelAutoColumnSize
@@ -16,8 +17,8 @@
private static final long serialVersionUID = 1L;
- @Excel(name = "*PO鍗曞彿")
- @ApiModelProperty(value= "*PO鍗曞彿")
+ @Excel(name = "*鍗曟嵁鍐呯爜")
+ @ApiModelProperty(value= "*鍗曟嵁鍐呯爜")
@ExcelComment(value = "poCode", example = "PO25413975")
private String poCode;
@@ -29,13 +30,13 @@
@Excel(name = "鍗曟嵁绫诲瀷")
@ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @ExcelComment(value = "type", example = "閲囪喘鍏ュ簱鍗�")
+ @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
private String type;
@Excel(name = "涓氬姟绫诲瀷")
@ApiModelProperty(value= "涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "澶栬喘鏀惰揣")
+ @ExcelComment(value = "wkType", example = "閲囪喘鍏ュ簱鍗�")
private String wkType;
@Excel(name = "椤圭洰鍚嶇О")
@@ -131,10 +132,11 @@
@ExcelComment(value = "splrBatch", example = "20250401")
private String splrBatch;
+
@Excel(name = "棰勮閫佽揪鏃堕棿")
@ApiModelProperty("棰勮閫佽揪鏃堕棿")
@ExcelComment(value = "arrTime", example = "2025-05-21")
- private String arrTime;
+ private Date arrTime;
@Excel(name = "澶囨敞")
--
Gitblit v1.9.1