From ed42667ad21a93337fc910b657703e9ece378481 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 17 三月 2025 08:00:04 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 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..95c8d3b 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,27 +1,24 @@
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 lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_qly_inspect")
public class QlyInspect implements Serializable {
@@ -40,16 +37,44 @@
@ApiModelProperty(value= "缂栫爜")
private String code;
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
+
+ @ApiModelProperty("閫氱煡鍗曟槑缁咺D")
+ private Long asnItemId;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ private String wkType;
+
+ /**
+ * 鍚堟牸鏁伴噺
+ */
+ @ApiModelProperty(value= "鍚堟牸鏁伴噺")
+ private Double safeQty;
+
+ /**
+ * 閫佽揣鏁伴噺
+ */
+ @ApiModelProperty(value= "閫佽揣鏁伴噺")
+ private Double dlyQty;
+
+ /**
+ * 鏀惰揣鏁伴噺
+ */
+ @ApiModelProperty(value= "鏀惰揣鏁伴噺")
+ private Double rcptQty;
+
+ /**
+ * 璐ㄦ鏁伴噺
+ */
+ @ApiModelProperty(value= "璐ㄦ鏁伴噺")
+ private Double isptQty;
+
+ /**
+ * 鐘舵�� 1: 璐ㄦ瀹屾垚 0: 寰呰川妫� 2: 璐ㄦ涓� 3: 鍏抽棴
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 璐ㄦ瀹屾垚 0: 寰呰川妫� 2: 璐ㄦ涓� 3: 鍏抽棴 ")
private Integer status;
/**
@@ -99,9 +124,13 @@
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 wkType, Double safeQty, Double dlyQty, Double rcptQty, Double isptQty, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
- this.name = name;
+ this.wkType = wkType;
+ this.safeQty = safeQty;
+ this.dlyQty = dlyQty;
+ this.rcptQty = rcptQty;
+ this.isptQty = isptQty;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -114,7 +143,11 @@
// QlyInspect qlyInspect = new QlyInspect(
// null, // 缂栫爜[闈炵┖]
-// null, // 鍚嶇О
+// null, // 涓氬姟绫诲瀷
+// null, // 鍚堟牸鏁伴噺
+// null, // 閫佽揣鏁伴噺
+// null, // 鏀惰揣鏁伴噺
+// null, // 璐ㄦ鏁伴噺
// null, // 鐘舵�乕闈炵┖]
// null, // 鏄惁鍒犻櫎[闈炵┖]
// null, // 绉熸埛
@@ -129,9 +162,13 @@
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return "璐ㄦ瀹屾垚";
case 0:
- return "鍐荤粨";
+ return "寰呰川妫�";
+ case 2:
+ return "璐ㄦ涓�";
+ case 3:
+ return "鍏抽棴";
default:
return String.valueOf(this.status);
}
@@ -168,8 +205,6 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
-
public Boolean getStatusBool(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1