From e2e642848e9a75cd5915cf349453d71d31838b68 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 13:40:53 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一
---
src/main/java/com/zy/asrs/entity/Mat.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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..53bba2a 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -124,7 +124,7 @@
* sku
*/
@ApiModelProperty(value= "sku")
- @ExcelProperty(value = "sku")
+ @ExcelProperty(value = "宸ュ簭")
private String sku;
/**
@@ -191,7 +191,22 @@
*/
@ApiModelProperty(value= "闀垮害")
@ExcelProperty(value = "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "瀹藉害")
+ @ExcelProperty(value = "瀹藉害")
+ private Double width;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "楂樺害")
+ @ExcelProperty(value = "楂樺害")
+ private Double height;
/**
* 浣撶Н
@@ -327,7 +342,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 +363,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;
--
Gitblit v1.9.1