From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 30 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 4d61ab1..20e800b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -4,6 +4,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.vincent.rsf.server.manager.service.BatchRegularService;
+import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -37,18 +39,6 @@
private Long id;
/**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String uuid;
-
- /**
- * 璐т富ID
- */
- @ApiModelProperty(value= "璐т富ID")
- private Long shipperId;
-
- /**
* 鍚嶇О
*/
@ApiModelProperty(value= "鍚嶇О")
@@ -61,10 +51,22 @@
private String code;
/**
- * 鍒嗙粍ID
+ * 璐т富ID
*/
- @ApiModelProperty(value= "鍒嗙粍ID")
+ @ApiModelProperty(value= "璐т富ID")
+ private Long shipperId;
+
+ /**
+ * 鍒嗙粍ID(*)
+ */
+ @ApiModelProperty(value= "鍒嗙粍ID(*)")
private Long groupId;
+
+ /**
+ * 瑙勫垯浠ｇ爜
+ */
+ @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+ private Long batchRegularId;
/**
* ERP缂栫爜
@@ -106,7 +108,7 @@
* 鎻忚堪
*/
@ApiModelProperty(value= "鎻忚堪")
- private String desc;
+ private String describle;
/**
* 鏍囧寘鏁伴噺
@@ -143,6 +145,48 @@
*/
@ApiModelProperty(value= "鏄惁鏍囩绠＄悊(*) 0: 鍚� 1: 鏄� ")
private Short isLabelMange;
+
+ /**
+ * 瀹夊叏搴撳瓨
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨")
+ private Double safetyQty;
+
+ /**
+ * 鏈�灏忓簱瀛橀璀﹀��
+ */
+ @ApiModelProperty(value= "鏈�灏忓簱瀛橀璀﹀��")
+ private Double minQty;
+
+ /**
+ * 鏈�澶у簱瀛橀璀﹀��
+ */
+ @ApiModelProperty(value= "鏈�澶у簱瀛橀璀﹀��")
+ private Double maxQty;
+
+ /**
+ * 鍋滄粸澶╂暟
+ */
+ @ApiModelProperty(value= "鍋滄粸澶╂暟")
+ private Integer stagnate;
+
+ /**
+ * 淇濊川鏈熷ぉ鏁�
+ */
+ @ApiModelProperty(value= "淇濊川鏈熷ぉ鏁�")
+ private Integer validity;
+
+ /**
+ * 鏁堟湡棰勮闃堝��
+ */
+ @ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
+ private Integer validityWarr;
+
+ /**
+ * 鏄惁鍏嶆
+ */
+ @ApiModelProperty(value= "鏄惁鍏嶆")
+ private Short flagCheck;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -197,25 +241,32 @@
public Matnr() {}
- public Matnr(String uuid,Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String desc,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.shipperId = shipperId;
+ public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarr,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
+ this.shipperId = shipperId;
this.groupId = groupId;
+ this.batchRegularId = batchRegularId;
this.erpCode = erpCode;
this.spec = spec;
this.model = model;
this.weight = weight;
this.color = color;
this.size = size;
- this.desc = desc;
+ this.describle = describle;
this.nromNum = nromNum;
this.unit = unit;
this.purchaseUnit = purchaseUnit;
this.stockUnit = stockUnit;
this.stockLeval = stockLeval;
this.isLabelMange = isLabelMange;
+ this.safetyQty = safetyQty;
+ this.minQty = minQty;
+ this.maxQty = maxQty;
+ this.stagnate = stagnate;
+ this.validity = validity;
+ this.validityWarr = validityWarr;
+ this.flagCheck = flagCheck;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -227,11 +278,11 @@
}
// Matnr matnr = new Matnr(
-// null, // 鏍囪瘑
-// null, // 璐т富ID
// null, // 鍚嶇О
// null, // 缂栫爜
-// null, // 鍒嗙粍ID
+// null, // 璐т富ID
+// null, // 鍒嗙粍ID(*)
+// null, // 瑙勫垯浠ｇ爜
// null, // ERP缂栫爜
// null, // 瑙勬牸
// null, // 鍨嬪彿
@@ -245,6 +296,13 @@
// null, // 搴撲綅鍗曚綅
// null, // 鍑哄叆搴撲紭鍏堢骇鍒玔闈炵┖]
// null, // 鏄惁鏍囩绠＄悊(*)[闈炵┖]
+// null, // 瀹夊叏搴撳瓨
+// null, // 鏈�灏忓簱瀛橀璀﹀��
+// null, // 鏈�澶у簱瀛橀璀﹀��
+// null, // 鍋滄粸澶╂暟
+// null, // 淇濊川鏈熷ぉ鏁�
+// null, // 鏁堟湡棰勮闃堝��
+// null, // 鏄惁鍏嶆
// null, // 鐘舵�乕闈炵┖]
// null, // 鏄惁鍒犻櫎[闈炵┖]
// null, // 绉熸埛
@@ -264,14 +322,23 @@
return null;
}
-// public String getGroupId$(){
-// MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
-// MatnrGroup matnrGroup = service.getById(this.groupId);
-// if (!Cools.isEmpty(matnrGroup)){
-// return String.valueOf(matnrGroup.getCode());
-// }
-// return null;
-// }
+ public String getGroupId$(){
+ MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
+ MatnrGroup matnrGroup = service.getById(this.groupId);
+ if (!Cools.isEmpty(matnrGroup)){
+ return String.valueOf(matnrGroup.getCode());
+ }
+ return null;
+ }
+
+ public String getBatchRegularId$(){
+ BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
+ BatchRegular batchRegular = service.getById(this.batchRegularId);
+ if (!Cools.isEmpty(batchRegular)){
+ return String.valueOf(batchRegular.getCode());
+ }
+ return null;
+ }
public String getStockLeval$(){
if (null == this.stockLeval){ return null; }
--
Gitblit v1.9.1