From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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/Matnr.java | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 90 insertions(+), 53 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 20e800b..f9e7fa6 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
@@ -1,20 +1,23 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.BatchRegularService;
+import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
+import lombok.experimental.Accessors;
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;
@@ -27,6 +30,8 @@
@Data
@TableName("man_matnr")
+@Accessors(chain = true)
+@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
private static final long serialVersionUID = 1L;
@@ -41,38 +46,53 @@
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String name;
/**
* 缂栫爜
*/
- @ApiModelProperty(value= "缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
private String code;
/**
* 璐т富ID
*/
- @ApiModelProperty(value= "璐т富ID")
+ @ApiModelProperty(value= "璐т富鏍囪瘑")
private Long shipperId;
+
+// @ApiModelProperty(value = "璐т富缂栫爜")
+// private String shipperCode;
/**
* 鍒嗙粍ID(*)
*/
- @ApiModelProperty(value= "鍒嗙粍ID(*)")
+ @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
private Long groupId;
+
+ /**
+ * 瀛楁鏍囪瘑
+ */
+ @ApiModelProperty(value = "瀛楁鏍囪瘑")
+ private String fieldsIndex;
+
+ /**
+ * 鍒嗙粍鍔╄鐮�
+ */
+ @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+ private String groupCode;
/**
* 瑙勫垯浠ｇ爜
*/
- @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
- private Long batchRegularId;
+ @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
+ private Long rglarId;
/**
* ERP缂栫爜
*/
@ApiModelProperty(value= "ERP缂栫爜")
- private String erpCode;
+ private String platCode;
/**
* 瑙勬牸
@@ -101,7 +121,7 @@
/**
* 闀�*瀹�*楂�(m)
*/
- @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+ @ApiModelProperty(value= "灏哄(m)")
private String size;
/**
@@ -126,7 +146,7 @@
* 閲囪喘鍗曚綅
*/
@ApiModelProperty(value= "閲囪喘鍗曚綅")
- private String purchaseUnit;
+ private String purUnit;
/**
* 搴撲綅鍗曚綅
@@ -138,19 +158,19 @@
* 鍑哄叆搴撲紭鍏堢骇鍒� 0: A 1: B 2: C
*/
@ApiModelProperty(value= "鍑哄叆搴撲紭鍏堢骇鍒� 0: A 1: B 2: C ")
- private Short stockLeval;
+ private Short stockLevel;
/**
* 鏄惁鏍囩绠＄悊(*) 0: 鍚� 1: 鏄�
*/
@ApiModelProperty(value= "鏄惁鏍囩绠＄悊(*) 0: 鍚� 1: 鏄� ")
- private Short isLabelMange;
+ private Short flagLabelMange;
/**
* 瀹夊叏搴撳瓨
*/
@ApiModelProperty(value= "瀹夊叏搴撳瓨")
- private Double safetyQty;
+ private Double safeQty;
/**
* 鏈�灏忓簱瀛橀璀﹀��
@@ -168,19 +188,25 @@
* 鍋滄粸澶╂暟
*/
@ApiModelProperty(value= "鍋滄粸澶╂暟")
- private Integer stagnate;
+ private Integer stagn;
/**
* 淇濊川鏈熷ぉ鏁�
*/
@ApiModelProperty(value= "淇濊川鏈熷ぉ鏁�")
- private Integer validity;
+ private Integer valid;
+
+ /**
+ * 鏉″舰鐮�
+ */
+ @ApiModelProperty(value = "鏉″舰鐮�")
+ private String barcode;
/**
* 鏁堟湡棰勮闃堝��
*/
@ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
- private Integer validityWarr;
+ private Integer validWarn;
/**
* 鏄惁鍏嶆
@@ -198,8 +224,11 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
+
+ @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
/**
* 绉熸埛
@@ -218,6 +247,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;
/**
@@ -231,6 +261,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;
/**
@@ -239,15 +270,22 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "鍒嗙被鍒楄〃")
+ @TableField(exist = false)
+ private List<Matnr> children;
+
public Matnr() {}
- 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) {
+ public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String platCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,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.rglarId = rglarId;
+ this.platCode = platCode;
this.spec = spec;
this.model = model;
this.weight = weight;
@@ -256,16 +294,16 @@
this.describle = describle;
this.nromNum = nromNum;
this.unit = unit;
- this.purchaseUnit = purchaseUnit;
+ this.purUnit = purUnit;
this.stockUnit = stockUnit;
- this.stockLeval = stockLeval;
- this.isLabelMange = isLabelMange;
- this.safetyQty = safetyQty;
+ this.stockLevel = stockLevel;
+ this.flagLabelMange = flagLabelMange;
+ this.safeQty = safeQty;
this.minQty = minQty;
this.maxQty = maxQty;
- this.stagnate = stagnate;
- this.validity = validity;
- this.validityWarr = validityWarr;
+ this.stagn = stagn;
+ this.valid = valid;
+ this.validWarn = validWarn;
this.flagCheck = flagCheck;
this.status = status;
this.deleted = deleted;
@@ -314,10 +352,10 @@
// );
public String getShipperId$(){
- ShipperService service = SpringUtils.getBean(ShipperService.class);
- Shipper shipper = service.getById(this.shipperId);
- if (!Cools.isEmpty(shipper)){
- return String.valueOf(shipper.getName());
+ CompanysService service = SpringUtils.getBean(CompanysService.class);
+ Companys companys = service.getById(this.shipperId);
+ if (!Cools.isEmpty(companys)){
+ return String.valueOf(companys.getName());
}
return null;
}
@@ -326,23 +364,22 @@
MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
MatnrGroup matnrGroup = service.getById(this.groupId);
if (!Cools.isEmpty(matnrGroup)){
- return String.valueOf(matnrGroup.getCode());
+ return String.valueOf(matnrGroup.getName());
}
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 getRglarId$(){
+// SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
+// SerialRule batchRegular = service.getById(this.rglarId);
+// if (!Cools.isEmpty(batchRegular)){
+// return String.valueOf(batchRegular.getCode());
+// }
+// return null;
+// }
public String getStockLeval$(){
- if (null == this.stockLeval){ return null; }
- switch (this.stockLeval){
+ if (null == this.stockLevel){ return null; }
+ switch (this.stockLevel){
case 0:
return " A";
case 1:
@@ -350,19 +387,19 @@
case 2:
return "C";
default:
- return String.valueOf(this.stockLeval);
+ return String.valueOf(this.stockLevel);
}
}
- public String getIsLabelMange$(){
- if (null == this.isLabelMange){ return null; }
- switch (this.isLabelMange){
+ public String getFlagLabelMange$(){
+ if (null == this.flagLabelMange){ return null; }
+ switch (this.flagLabelMange){
case 0:
return " 鍚�";
case 1:
return " 鏄�";
default:
- return String.valueOf(this.isLabelMange);
+ return String.valueOf(this.flagLabelMange);
}
}
--
Gitblit v1.9.1