From 544e94379a8ed544e98fe4160f1fb7113987ca34 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 二月 2025 17:07:55 +0800
Subject: [PATCH] #新增 1. 添加库存信息页面 2. 添加库存信息明细页面 3. 添加质检信息页面 4. 添加合信息页面 5. 添加库位信息页面 6. 添加容器管理界面
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 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..7e6e58b 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,6 +1,7 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -11,10 +12,7 @@
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;
@@ -24,9 +22,11 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_matnr")
+@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@
* 瑙勫垯浠ｇ爜
*/
@ApiModelProperty(value= "瑙勫垯浠ｇ爜")
- private Long batchRegularId;
+ private Long rglarId;
/**
* ERP缂栫爜
@@ -126,7 +126,7 @@
* 閲囪喘鍗曚綅
*/
@ApiModelProperty(value= "閲囪喘鍗曚綅")
- private String purchaseUnit;
+ private String purUnit;
/**
* 搴撲綅鍗曚綅
@@ -138,19 +138,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 +168,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;
/**
* 鏄惁鍏嶆
@@ -239,14 +245,21 @@
@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 erpCode,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.rglarId = rglarId;
this.erpCode = erpCode;
this.spec = spec;
this.model = model;
@@ -256,16 +269,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;
@@ -331,9 +344,9 @@
return null;
}
- public String getBatchRegularId$(){
+ public String getRglarId(){
BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
- BatchRegular batchRegular = service.getById(this.batchRegularId);
+ BatchRegular batchRegular = service.getById(this.rglarId);
if (!Cools.isEmpty(batchRegular)){
return String.valueOf(batchRegular.getCode());
}
@@ -341,8 +354,8 @@
}
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 +363,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){
+ 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