From c0b3ad18633abfabd96b70bb2de7c8b3095cd48b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 17:36:30 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 3b7d24a..85b1c07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -31,10 +31,8 @@
 @Data
 @Accessors(chain = true)
 @TableName("man_task_item")
+@ApiModel(value = "TaskItem", description = "浠诲姟妗f槑缁�")
 public class TaskItem implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
     /**
      * ID
      */
@@ -69,6 +67,9 @@
     @ApiModelProperty("鍗曟嵁绫诲瀷")
     private String orderType;
 
+    @ApiModelProperty("涓氬姟绫诲瀷")
+    private Short wkType;
+
     @ApiModelProperty("鍗曟嵁鏄庣粏ID")
     private Long orderItemId;
     /**
@@ -76,6 +77,9 @@
      */
     @ApiModelProperty("鐗╂枡璺熻釜鐮�")
     private String trackCode;
+
+    @ApiModelProperty("渚涘簲鍟嗘尝娆�")
+    private String splrBatch;
     /**
      * 鐗╂枡缂栫爜
      */
@@ -95,6 +99,12 @@
     private Double anfme;
 
     /**
+     * 搴撳瓨鏁伴噺
+     */
+    @ApiModelProperty("搴撳瓨鏁伴噺")
+    private Double stockQty;
+
+    /**
      * 搴撳瓨鎵规
      */
     @ApiModelProperty(value= "搴撳瓨鎵规")

--
Gitblit v1.9.1