From e8be12f73d66be96241656c30dcac1f757889b87 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 15 十月 2025 08:40:41 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/entity/Mat.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 989e678..989462c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -191,14 +191,14 @@
*/
@ApiModelProperty(value= "闀垮害")
@ExcelProperty(value = "闀垮害")
- private Double length;
+ private String length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
@ExcelProperty(value = "浣撶Н")
- private Double volume;
+ private String volume;
/**
* 涓夋柟缂栫爜
@@ -328,39 +328,40 @@
/**
* 澶栭儴涓婚敭
*/
- @TableField("auto_id")
- private Integer autoId;
- /**
- * 璁㈠崟鍙�
- */
- @TableField("out_order_no")
- private String outOrderNo;
+// @TableField("auto_id")
+// private Integer autoId;
+// /**
+// * 璁㈠崟鍙�
+// */
+// @TableField("out_order_no")
+// private String outOrderNo;
+//
+// /**
+// * 鐐夊彿\瀹㈡埛鍥惧彿
+// */
+// @TableField("lu_hao")
+// private String luHao;
+//
+// /**
+// * 宸ュ崟鍙�
+// */
+// @TableField("pg_no")
+// private String sPgNO;
- /**
- * 鐐夊彿\瀹㈡埛鍥惧彿
- */
- @TableField("lu_hao")
- private String luHao;
-
- /**
- * 宸ュ崟鍙�
- */
- @TableField("pg_no")
- private String sPgNO;
-
-
+ @TableField("temp1")
private String temp1;
-
+ @TableField("temp2")
private String temp2;
+ @TableField("temp3")
private String temp3;
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,String length,String 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;
--
Gitblit v1.9.1