From f2eebff1b85e3b44bdc00dcd5eb00127edef617f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 15:31:05 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
similarity index 92%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 93f6194..767a28c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -5,14 +5,10 @@
import com.zy.asrs.common.wms.service.ManTagService;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -21,11 +17,10 @@
import com.zy.asrs.common.sys.service.UserService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("wms_man_mat")
-public class ManMat implements Serializable {
+public class Mat implements Serializable {
private static final long serialVersionUID = 1L;
@@ -260,9 +255,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public ManMat() {}
+ public Mat() {}
- public ManMat(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 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) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -302,7 +297,7 @@
this.memo = memo;
}
-// ManMat manMat = new ManMat(
+// Mat manMat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿[闈炵┖]
@@ -344,7 +339,7 @@
public String getTagId$(){
ManTagService manTagService = SpringUtils.getBean(ManTagService.class);
- ManTag tag = manTagService.getById(this.tagId);
+ Tag tag = manTagService.getById(this.tagId);
if (!Cools.isEmpty(tag)){
return String.valueOf(tag.getId());
}
--
Gitblit v1.9.1