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/WaitPakinItemLog.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
index 3a3cefe..bd1b29f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
@@ -4,6 +4,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import lombok.experimental.Accessors;
@@ -38,6 +39,9 @@
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ @ApiModelProperty("鏃ュ織涓诲崟ID")
+ private Long logId;
/**
* 涓诲崟ID
@@ -159,6 +163,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -172,6 +177,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
--
Gitblit v1.9.1