From fa5b8238f31749cc4b0469df317b5849da08a419 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期日, 30 三月 2025 14:53:15 +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 | 82 +++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 43 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 2d29b4a..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
@@ -10,6 +10,7 @@
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;
@@ -17,6 +18,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_qly_inspect")
public class QlyInspect implements Serializable {
@@ -35,29 +37,15 @@
@ApiModelProperty(value= "缂栫爜")
private String code;
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
- /**
- * 鏍囩鐮�
- */
- @ApiModelProperty(value= "鏍囩鐮�")
- private String barcode;
-
- /**
- * 閫氱煡鍗曟槑缁嗘爣璇�
- */
- @ApiModelProperty(value= "閫氱煡鍗曟槑缁嗘爣璇�")
+ @ApiModelProperty("閫氱煡鍗曟槑缁咺D")
private Long asnItemId;
/**
- * PO鍗曟槑缁嗘爣璇�
+ * 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "PO鍗曟槑缁嗘爣璇�")
- private Long poItemId;
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ private String wkType;
/**
* 鍚堟牸鏁伴噺
@@ -66,15 +54,27 @@
private Double safeQty;
/**
- * 涓嶅悎鏍兼暟閲�
+ * 閫佽揣鏁伴噺
*/
- @ApiModelProperty(value= "涓嶅悎鏍兼暟閲�")
- private Double disQty;
+ @ApiModelProperty(value= "閫佽揣鏁伴噺")
+ private Double dlyQty;
/**
- * 鐘舵�� 3: 閮ㄥ垎鍚堟牸 2: 涓嶅悎鏍� 1: 鍚堟牸 0: 鏈鏌�
+ * 鏀惰揣鏁伴噺
*/
- @ApiModelProperty(value= "鐘舵�� 3: 閮ㄥ垎鍚堟牸 2: 涓嶅悎鏍� 1: 鍚堟牸 0: 鏈鏌� ")
+ @ApiModelProperty(value= "鏀惰揣鏁伴噺")
+ private Double rcptQty;
+
+ /**
+ * 璐ㄦ鏁伴噺
+ */
+ @ApiModelProperty(value= "璐ㄦ鏁伴噺")
+ private Double isptQty;
+
+ /**
+ * 鐘舵�� 1: 璐ㄦ瀹屾垚 0: 寰呰川妫� 2: 璐ㄦ涓� 3: 鍏抽棴
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 璐ㄦ瀹屾垚 0: 寰呰川妫� 2: 璐ㄦ涓� 3: 鍏抽棴 ")
private Integer status;
/**
@@ -124,14 +124,13 @@
public QlyInspect() {}
- 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) {
+ 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.barcode = barcode;
- this.asnItemId = asnItemId;
- this.poItemId = poItemId;
+ this.wkType = wkType;
this.safeQty = safeQty;
- this.disQty = disQty;
+ this.dlyQty = dlyQty;
+ this.rcptQty = rcptQty;
+ this.isptQty = isptQty;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -144,12 +143,11 @@
// QlyInspect qlyInspect = new QlyInspect(
// null, // 缂栫爜[闈炵┖]
-// null, // 鍚嶇О
-// null, // 鏍囩鐮�
-// null, // 閫氱煡鍗曟槑缁嗘爣璇�
-// null, // PO鍗曟槑缁嗘爣璇�
+// null, // 涓氬姟绫诲瀷
// null, // 鍚堟牸鏁伴噺
-// null, // 涓嶅悎鏍兼暟閲�
+// null, // 閫佽揣鏁伴噺
+// null, // 鏀惰揣鏁伴噺
+// null, // 璐ㄦ鏁伴噺
// null, // 鐘舵�乕闈炵┖]
// null, // 鏄惁鍒犻櫎[闈炵┖]
// null, // 绉熸埛
@@ -163,14 +161,14 @@
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
- case 3:
- return " 閮ㄥ垎鍚堟牸";
+ case 1:
+ return "璐ㄦ瀹屾垚";
+ case 0:
+ return "寰呰川妫�";
case 2:
- return "涓嶅悎鏍�";
- case 1:
- return "鍚堟牸";
- case 0:
- return "鏈鏌�";
+ return "璐ㄦ涓�";
+ case 3:
+ return "鍏抽棴";
default:
return String.valueOf(this.status);
}
@@ -207,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