From d25c8fa670a8fea0977c85f67b13917b3bdefa89 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 14 三月 2025 17:01:24 +0800
Subject: [PATCH] fix:增加datagrid
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index afcf43c..2d29b4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -1,24 +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.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;
-import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
-import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Data
@@ -47,9 +42,39 @@
private String name;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鏍囩鐮�
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value= "鏍囩鐮�")
+ private String barcode;
+
+ /**
+ * 閫氱煡鍗曟槑缁嗘爣璇�
+ */
+ @ApiModelProperty(value= "閫氱煡鍗曟槑缁嗘爣璇�")
+ private Long asnItemId;
+
+ /**
+ * PO鍗曟槑缁嗘爣璇�
+ */
+ @ApiModelProperty(value= "PO鍗曟槑缁嗘爣璇�")
+ private Long poItemId;
+
+ /**
+ * 鍚堟牸鏁伴噺
+ */
+ @ApiModelProperty(value= "鍚堟牸鏁伴噺")
+ private Double safeQty;
+
+ /**
+ * 涓嶅悎鏍兼暟閲�
+ */
+ @ApiModelProperty(value= "涓嶅悎鏍兼暟閲�")
+ private Double disQty;
+
+ /**
+ * 鐘舵�� 3: 閮ㄥ垎鍚堟牸 2: 涓嶅悎鏍� 1: 鍚堟牸 0: 鏈鏌�
+ */
+ @ApiModelProperty(value= "鐘舵�� 3: 閮ㄥ垎鍚堟牸 2: 涓嶅悎鏍� 1: 鍚堟牸 0: 鏈鏌� ")
private Integer status;
/**
@@ -99,9 +124,14 @@
public QlyInspect() {}
- public QlyInspect(String code,String name,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public QlyInspect(String code, String name, String barcode, Long asnItemId, Long poItemId, Double safeQty, Double disQty, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
this.name = name;
+ this.barcode = barcode;
+ this.asnItemId = asnItemId;
+ this.poItemId = poItemId;
+ this.safeQty = safeQty;
+ this.disQty = disQty;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -115,6 +145,11 @@
// QlyInspect qlyInspect = new QlyInspect(
// null, // 缂栫爜[闈炵┖]
// null, // 鍚嶇О
+// null, // 鏍囩鐮�
+// null, // 閫氱煡鍗曟槑缁嗘爣璇�
+// null, // PO鍗曟槑缁嗘爣璇�
+// null, // 鍚堟牸鏁伴噺
+// null, // 涓嶅悎鏍兼暟閲�
// null, // 鐘舵�乕闈炵┖]
// null, // 鏄惁鍒犻櫎[闈炵┖]
// null, // 绉熸埛
@@ -128,10 +163,14 @@
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "鍐荤粨";
+ case 3:
+ return " 閮ㄥ垎鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
+ case 1:
+ return "鍚堟牸";
+ case 0:
+ return "鏈鏌�";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1