From 0430c84aa26eaaad039803dad9c24d55f36b3050 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 20:29:28 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 9c211bd..4612333 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.zy.asrs.common.wms.service.TagService;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -143,19 +144,19 @@
      * 閲嶉噺
      */
     @ApiModelProperty(value= "閲嶉噺")
-    private Double weight;
+    private String weight;
 
     /**
      * 闀垮害
      */
     @ApiModelProperty(value= "闀垮害")
-    private Double length;
+    private String length;
 
     /**
      * 浣撶Н
      */
     @ApiModelProperty(value= "浣撶Н")
-    private Double volume;
+    private String volume;
 
     /**
      * 涓夋柟缂栫爜
@@ -301,7 +302,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, String units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
+    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, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId, String mainHost, String mainSource, String cyclePickCode, String locationStock, String material, String decrees, String imgNum, String purchasingUnits, String processNumber, String bom, String safeNum, String miniCount, String replenishmentNum, String tmp1, String tmp2, String tmp3, String restockDemand, String lapse, String shortcuts, String width, String height, String accountingClass, String batch, String inventoryAccount) {
         this.uuid = uuid;
         this.tagId = tagId;
         this.matnr = matnr;
@@ -334,6 +335,30 @@
         this.updateTime = updateTime;
         this.memo = memo;
         this.hostId = hostId;
+        this.mainHost = mainHost;
+        this.mainSource = mainSource;
+        this.cyclePickCode = cyclePickCode;
+        this.locationStock = locationStock;
+        this.material = material;
+        this.decrees = decrees;
+        this.imgNum = imgNum;
+        this.purchasingUnits = purchasingUnits;
+        this.processNumber = processNumber;
+        this.bom = bom;
+        this.safeNum = safeNum;
+        this.miniCount = miniCount;
+        this.replenishmentNum = replenishmentNum;
+        this.tmp1 = tmp1;
+        this.tmp2 = tmp2;
+        this.tmp3 = tmp3;
+        this.restockDemand = restockDemand;
+        this.lapse = lapse;
+        this.shortcuts = shortcuts;
+        this.width = width;
+        this.height = height;
+        this.accountingClass = accountingClass;
+        this.batch = batch;
+        this.inventoryAccount = inventoryAccount;
     }
 
     //    Mat manMat = new Mat(

--
Gitblit v1.9.1