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/api/controller/erp/params/SyncOrderParams.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
index 5d8cc09..2573e5e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.controller.erp.params;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,17 +28,27 @@
@ApiModelProperty("鍗曞彿")
private String orderNo;
+ @ApiModelProperty("鍗曟嵁鍐呯爜锛屽敮涓�鏍囪瘑")
+ private String orderInternalCode;
+
+ @ApiModelProperty("鍏�/鍑哄簱鎺ラ┏绔欑偣")
+ private String stationId;
+
@ApiModelProperty("鍘熷簱浣�")
private String orgLoc;
@ApiModelProperty("璁㈠崟ID")
private Long orderId;
+ @ApiModelProperty("鎿嶄綔绫诲瀷锛�1 鏂板锛�2 淇敼锛�3 鍙栨秷")
+ private Integer operateType;
+
@ApiModelProperty("鏁伴噺")
private Double anfme;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonDeserialize(using = FlexibleDateDeserializer.class)
private Date arrTime;
@ApiModelProperty("鍗曟嵁鏄庣粏淇℃伅")
--
Gitblit v1.9.1