From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 08:33:24 +0800 Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段:执行数量,完成数量, 源单据号,源单据ID --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 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 85b1c07..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 @@ -60,6 +55,12 @@ @ApiModelProperty("婧愮紪鐮�") private Long source; + + @ApiModelProperty("婧愬崟鍙�") + private String sourceCode; + + @ApiModelProperty("婧愪富鍗旾D") + private Long sourceId; @ApiModelProperty("鍗曟嵁ID") private Long orderId; @@ -99,10 +100,16 @@ private Double anfme; /** - * 搴撳瓨鏁伴噺 + * 鎵ц鏁伴噺 */ @ApiModelProperty("搴撳瓨鏁伴噺") - private Double stockQty; + private Double workQty; + + /** + * 瀹屾垚鏁伴噺 + */ + @ApiModelProperty("瀹屾垚鏁伴噺") + private Double qty; /** * 搴撳瓨鎵规 -- Gitblit v1.9.1