From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 105 +++++-----------------------------------------------
1 files changed, 10 insertions(+), 95 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 68c3062..c794049 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
@@ -140,12 +140,6 @@
private String itemNum;
/**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
@@ -182,40 +176,10 @@
private String suppCode;
/**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
* 淇濊川鏈�
*/
@ApiModelProperty(value= "淇濊川鏈�")
private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -255,9 +219,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
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 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) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -276,28 +246,23 @@
this.manu = manu;
this.manuDate = manuDate;
this.itemNum = itemNum;
- this.safeQty = safeQty;
this.weight = weight;
this.length = length;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
this.suppCode = suppCode;
- this.beBatch = beBatch;
this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
this.status = status;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.hostId = hostId;
}
-// Mat manMat = new Mat(
+ // Mat manMat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿[闈炵┖]
@@ -341,59 +306,9 @@
TagService tagService = SpringUtils.getBean(TagService.class);
Tag tag = tagService.getById(this.tagId);
if (!Cools.isEmpty(tag)){
- return String.valueOf(tag.getId());
+ return String.valueOf(tag.getName());
}
return null;
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
}
public String getStatus$(){
--
Gitblit v1.9.1