From 605be0c8702fc7bfe4f7fcdd397c9f0d40722b69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 09 四月 2026 15:19:43 +0800
Subject: [PATCH] 1.商品档案新增最大限制和最小限制 2.mes空桶/余料回库修复
---
src/main/java/com/zy/asrs/entity/Mat.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..c5b3db5 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.enums.ContainerType;
+import com.zy.asrs.service.BasContainerService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -77,6 +79,21 @@
@ApiModelProperty(value= "鍒悕")
@ExcelProperty(value = "鍒悕")
private String name;
+
+ /**
+ * 褰掗浂闃堝��
+ */
+ @ApiModelProperty(value= "褰掗浂闃堝��")
+ @ExcelProperty(value = "褰掗浂闃堝��")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "姣忓叕鏂ら暱搴�")
+ private Double volume;
/**
* 瑙勬牸
@@ -164,20 +181,13 @@
private String manuDate;
/**
- * 鍝侀」鏁�
+ * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
- @TableField("safe_qty")
- private Double safeQty;
/**
* 閲嶉噺
@@ -186,19 +196,17 @@
@ExcelProperty(value = "閲嶉噺")
private Double weight;
+ @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+ @TableField("up_qty")
+ private Double upQty;
+
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- @ExcelProperty(value = "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
- private Double volume;
+ @TableField("man_length")
+ private Double manLength;
/**
* 涓夋柟缂栫爜
@@ -300,6 +308,11 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ @TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private Long locType;
+
/**
* 澶囨敞
*/
@@ -310,12 +323,16 @@
/**
* 搴撳瓨棰勮鏁伴噺涓婇檺
*/
+ @ApiModelProperty(value= "搴撳瓨棰勮鏁伴噺涓婇檺")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓婇檺")
@TableField("store_max")
private Double storeMax;
/**
* 搴撳瓨棰勮鏁伴噺涓嬮檺
*/
+ @ApiModelProperty(value= "搴撳瓨棰勮鏁伴噺涓嬮檺")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓嬮檺")
@TableField("store_min")
private Double storeMin;
@@ -327,7 +344,7 @@
public Mat() {}
- 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) {
+ 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 manLength,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) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -348,7 +365,7 @@
this.itemNum = itemNum;
this.safeQty = safeQty;
this.weight = weight;
- this.length = length;
+ this.manLength = manLength;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
@@ -416,6 +433,20 @@
return null;
}
+ public String getLocType$(){
+ if (Cools.isEmpty(locType)) {
+ return "鏂欑";
+ }
+ if (locType.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+ return ContainerType.CONTAINER_TYPE_BOX.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ return ContainerType.CONTAINER_TYPE_SALVER.desc;
+ } else if (locType.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ return ContainerType.CONTAINER_TYPE_CAGE.desc;
+ }
+ return null;
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1