From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 acbbbd4..976a609 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
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -10,12 +9,9 @@
import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +21,6 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
import java.util.Objects;
@Data
@@ -61,11 +56,20 @@
@ApiModelProperty("婧愮紪鐮�")
private Long source;
+ @ApiModelProperty("婧愬崟鍙�")
+ private String sourceCode;
+
+ @ApiModelProperty("婧愪富鍗旾D")
+ private Long sourceId;
+
@ApiModelProperty("鍗曟嵁ID")
private Long orderId;
@ApiModelProperty("鍗曟嵁绫诲瀷")
private String orderType;
+
+ @ApiModelProperty("涓氬姟绫诲瀷")
+ private Short wkType;
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long orderItemId;
@@ -74,6 +78,9 @@
*/
@ApiModelProperty("鐗╂枡璺熻釜鐮�")
private String trackCode;
+
+ @ApiModelProperty("渚涘簲鍟嗘尝娆�")
+ private String splrBatch;
/**
* 鐗╂枡缂栫爜
*/
@@ -93,6 +100,18 @@
private Double anfme;
/**
+ * 鎵ц鏁伴噺
+ */
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ */
+ @ApiModelProperty("瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
* 搴撳瓨鎵规
*/
@ApiModelProperty(value= "搴撳瓨鎵规")
--
Gitblit v1.9.1