From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/asrs/entity/Mat.java | 353 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 282 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index ecd9b5f..7a187c2 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,10 +8,12 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -20,8 +22,6 @@
@Data
@TableName("man_mat")
public class Mat implements Serializable {
-
- private static final long serialVersionUID = 1L;
@TableField(exist = false)
private Double stock;
@@ -33,6 +33,8 @@
public void setStock(Double stock) {
this.stock = stock;
}
+
+ private static final long serialVersionUID = 1L;
/**
* ID
@@ -48,13 +50,6 @@
private String uuid;
/**
- * 鎵�灞炲尯鍩�
- */
- @ApiModelProperty(value= "鎵�灞炲尯鍩�")
- @TableField("node_id")
- private Long nodeId;
-
- /**
* 鎵�灞炲綊绫�
*/
@ApiModelProperty(value= "鎵�灞炲綊绫�")
@@ -64,107 +59,215 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
+
/**
* 鍟嗗搧鍚嶇О
*/
- @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ExcelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
- * 鍚嶇О
+ * 鍒悕
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "鍒悕")
+ @ExcelProperty(value = "鍒悕")
private String name;
/**
* 瑙勬牸
*/
- @ExcelProperty(index = 4, value = "瑙勬牸")
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ExcelProperty(index = 5, value = "鍨嬪彿")
@ApiModelProperty(value= "鍨嬪彿")
+ @ExcelProperty(value = "鍨嬪彿")
private String model;
/**
- * 鎵瑰彿
+ * 棰滆壊
*/
- @ExcelProperty(index = 6, value = "鎵瑰彿")
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value= "棰滆壊")
+ @ExcelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ @ExcelProperty(value = "鍝佺墝")
+ private String brand;
/**
* 鍗曚綅
*/
- @ExcelProperty(index = 7, value = "鍗曚綅")
@ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty(value = "鍗曚綅")
private String unit;
/**
- * SKC
+ * 鍗曚环
*/
- @ExcelProperty(index = 8, value = "SKC")
- @ApiModelProperty(value= "SKC")
+ @ApiModelProperty(value= "鍗曚环")
+ @ExcelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ @ExcelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ @ExcelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @ExcelProperty(value = "鏉＄爜")
private String barcode;
/**
- * 鍗曟嵁绫诲瀷
+ * 浜у湴
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @TableField("doc_id")
- private Long docId;
+ @ApiModelProperty(value= "浜у湴")
+ @ExcelProperty(value = "浜у湴")
+ private String origin;
/**
- * 鍗曟嵁缂栧彿
+ * 鍘傚
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("doc_num")
- private String docNum;
+ @ApiModelProperty(value= "鍘傚")
+ @ExcelProperty(value = "鍘傚")
+ private String manu;
/**
- * 瀹㈡埛鍚嶇О
+ * 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- @TableField("cust_name")
- private String custName;
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ExcelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ @ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
- private Integer itemNum;
+ private String itemNum;
/**
- * 搴撳瓨浣欓噺
+ * 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "搴撳瓨浣欓噺")
- private Integer count;
-
- /**
- * 鍗曚环
- */
- @ExcelProperty(index = 9, value = "鍗曚环")
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
/**
* 閲嶉噺
*/
- @ExcelProperty(index = 10, value = "閲嶉噺")
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "")
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ @ExcelProperty(value = "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ExcelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ @ExcelProperty(value = "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ @ExcelProperty(value = "棰勮澶╂暟")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
@@ -179,6 +282,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -193,62 +297,107 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ExcelProperty(index = 11, value = "澶囨敞")
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty(value = "澶囨敞")
private String memo;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_max")
+ private Integer inventoryMax;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_min")
+ private Integer inventoryMin;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_age_max")
+ private Integer inventoryAgeMax;
+
public Mat() {}
- public Mat(String uuid,Long nodeId,Long tagId,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer inventoryMin,Integer inventoryMax,Integer inventoryAgeMax) {
this.uuid = uuid;
- this.nodeId = nodeId;
this.tagId = tagId;
this.matnr = matnr;
this.maktx = maktx;
this.name = name;
this.specs = specs;
this.model = model;
- this.batch = batch;
+ this.color = color;
+ this.brand = brand;
this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
this.barcode = barcode;
- this.docId = docId;
- this.docNum = docNum;
- this.custName = custName;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
this.itemNum = itemNum;
- this.count = count;
+ this.safeQty = safeQty;
this.weight = weight;
+ this.length = length;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
this.status = status;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.inventoryAgeMax = inventoryAgeMax;
+ this.inventoryMax = inventoryMax;
+ this.inventoryMin = inventoryMin;
}
// Mat mat = new Mat(
// null, // 缂栧彿
-// null, // 鎵�灞炲尯鍩�
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿
// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
+// null, // 鍒悕
// null, // 瑙勬牸
// null, // 鍨嬪彿
-// null, // 鎵瑰彿
+// null, // 棰滆壊
+// null, // 鍝佺墝
// null, // 鍗曚綅
-// null, // SKC
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁缂栧彿
-// null, // 瀹㈡埛鍚嶇О
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍗曚綅閲�
+// null, // 鏉＄爜
+// null, // 浜у湴
+// null, // 鍘傚
+// null, // 鐢熶骇鏃ユ湡
// null, // 鍝侀」鏁�
-// null, // 搴撳瓨浣欓噺
+// null, // 瀹夊叏搴撳瓨閲�
// null, // 閲嶉噺
-// null, //
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null, // 鏄惁鎵规
+// null, // 淇濊川鏈�
+// null, // 棰勮澶╂暟
+// null, // 鍒惰喘
+// null, // 瑕佹眰妫�楠�
+// null, // 鍗遍櫓鍝�
+// null, // 鐘舵�乕闈炵┖]
// null, // 娣诲姞浜哄憳
// null, // 娣诲姞鏃堕棿
// null, // 淇敼浜哄憳
@@ -265,11 +414,73 @@
return null;
}
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -281,15 +492,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public Long getUpdateBy() {
- return updateBy;
- }
-
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -301,4 +508,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
--
Gitblit v1.9.1