From b60d6c1abc9a41456c683a79d4ee27e7bdf7071b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 13 五月 2025 14:23:38 +0800
Subject: [PATCH] #Agv启动入库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index f2104be..ff43690 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -1,19 +1,19 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
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 io.swagger.annotations.Api;
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.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -21,6 +21,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.util.Map;
import java.util.Objects;
@Data
@@ -46,6 +47,9 @@
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long asnItemId;
+
+ @ApiModelProperty("鏀惰揣鏄庣粏ID")
+ private Long rcptId;
/**
* 缂栧彿
*/
@@ -83,22 +87,34 @@
@ApiModelProperty(value= "鏀惰揣鏁伴噺")
private Double rcptQty;
+ @ApiModelProperty("璐ㄦ鏁伴噺")
+ private Double anfme;
+
/**
* 閫佽揣鏁伴噺
*/
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double dlyQty;
+ @ApiModelProperty("鎵╁睍瀛楁")
+ private String fieldsIndex;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
/**
* 涓嶅悎鏁伴噺
*/
@ApiModelProperty(value= "涓嶅悎鏁伴噺")
+ @TableField(exist = false)
private Double disQty;
/**
* 鍚堟牸鏁伴噺
*/
@ApiModelProperty(value= "鍚堟牸鏁伴噺")
+ @TableField(exist = false)
private Double safeQty;
/**
@@ -108,7 +124,7 @@
private String picPath;
@ApiModelProperty("璐ㄦ缁撹")
- private String isptResult;
+ private Short isptResult;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -120,7 +136,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -140,6 +155,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;
/**
@@ -153,6 +169,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;
/**
@@ -173,8 +190,8 @@
this.stockBatch = stockBatch;
this.rcptQty = rcptQty;
this.dlyQty = dlyQty;
- this.disQty = disQty;
- this.safeQty = safeQty;
+// this.disQty = disQty;
+// this.safeQty = safeQty;
this.picPath = picPath;
this.status = status;
this.deleted = deleted;
--
Gitblit v1.9.1