From c46d1d8c3b9875f051a6ec3c4a1d3fa7bd32e5db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:21 +0800
Subject: [PATCH] 新增库存管理 新增库存明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 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 8d6420f..34fb5c3 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,15 +1,19 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
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;
@@ -19,14 +23,14 @@
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.Map;
+import java.util.Objects;
@Data
+@Accessors(chain = true)
@TableName("man_task_item")
+@ApiModel(value = "TaskItem", description = "浠诲姟妗ｆ槑缁�")
public class TaskItem implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
/**
* ID
*/
@@ -52,6 +56,34 @@
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
+ @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;
+ /**
+ * 鐗╂枡璺熻釜鐮�
+ */
+ @ApiModelProperty("鐗╂枡璺熻釜鐮�")
+ private String trackCode;
+
+ @ApiModelProperty("渚涘簲鍟嗘尝娆�")
+ private String splrBatch;
/**
* 鐗╂枡缂栫爜
*/
@@ -71,6 +103,18 @@
private Double anfme;
/**
+ * 鎵ц鏁伴噺
+ */
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ */
+ @ApiModelProperty("瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
* 搴撳瓨鎵规
*/
@ApiModelProperty(value= "搴撳瓨鎵规")
@@ -88,11 +132,18 @@
@ApiModelProperty(value= "鍨嬪彿")
private String model;
+ @ApiModelProperty("璐ㄦ鐘舵��")
+ private Short isptResult;
+
/**
* 瀛楁绱㈠紩
*/
@ApiModelProperty(value= "瀛楁绱㈠紩")
private String fieldsIndex;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -104,7 +155,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -124,6 +174,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;
/**
@@ -137,6 +188,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;
/**
@@ -189,6 +241,32 @@
// null // 澶囨敞
// );
+ public String getOrderType$(){
+ if (null == this.orderType) {return null;}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+ .eq(DictData::getValue, this.orderType));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
+ public String getIsptResult$(){
+ if (Cools.isEmpty(this.isptResult)){
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+ .eq(DictData::getValue, this.isptResult));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1