From aeacc7f80e3ae74cc56be90bb761e9a6b935f643 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:31 +0800
Subject: [PATCH] 收货流程修改 质检流程修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 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 9d1b124..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,17 +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 com.baomidou.mybatisplus.annotation.*;
+
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 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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -19,9 +21,11 @@
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_qly_ispt_item")
public class QlyIsptItem implements Serializable {
@@ -33,43 +37,44 @@
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 涓诲崟ID
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long ispectId;
+ @ApiModelProperty("璐ㄦ鍗曠姸鎬�")
+ private String isptStatus;
+ @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+ private Long asnItemId;
+
+ @ApiModelProperty("鏀惰揣鏄庣粏ID")
+ private Long rcptId;
/**
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
private String matnrCode;
-
/**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
-
/**
* 鏍囩
*/
@ApiModelProperty(value= "鏍囩")
private String label;
-
- /**
+ /**鈭�
* 渚涘簲鍟嗗悕绉�
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
private String splrName;
-
/**
* 渚涘簲鍟嗘壒娆�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
private String splrBatch;
-
/**
* 搴撳瓨鎵规
*/
@@ -82,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;
/**
@@ -105,6 +122,9 @@
*/
@ApiModelProperty(value= "鍥剧墖璺緞")
private String picPath;
+
+ @ApiModelProperty("璐ㄦ缁撹")
+ private Short isptResult;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -116,7 +136,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -136,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;
/**
@@ -149,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;
/**
@@ -169,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;
@@ -205,6 +226,30 @@
// null // 澶囨敞
// );
+ public String getIsptStatus$() {
+ if (null == this.isptStatus) {return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS)
+ .eq(DictData::getValue, this.isptStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
+ public String getIsptResult$() {
+ if (null == this.isptResult) {return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+ .eq(DictData::getValue, this.isptResult));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1