From 12e16a4e48fa33ead5aae7ca065fdea636135527 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 13 八月 2024 12:55:26 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 239 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 139 insertions(+), 100 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 814a247..d92a820 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,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.zy.asrs.common.wms.service.TagService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +21,7 @@
import java.io.Serializable;
@Data
-@TableName("wms_man_mat")
+@TableName("wms_mat")
public class Mat implements Serializable {
private static final long serialVersionUID = 1L;
@@ -41,6 +43,7 @@
* 鎵�灞炲綊绫�
*/
@ApiModelProperty(value= "鎵�灞炲綊绫�")
+ @TableField("tag_id")
private Long tagId;
/**
@@ -107,7 +110,7 @@
* 鍗曚綅閲�
*/
@ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ private String units;
/**
* 鏉＄爜
@@ -131,42 +134,39 @@
* 鐢熶骇鏃ユ湡
*/
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
/**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ private String weight;
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ private String length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ private String volume;
/**
* 涓夋柟缂栫爜
*/
@ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
private String threeCode;
/**
@@ -179,43 +179,15 @@
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
/**
* 淇濊川鏈�
*/
@ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
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: 绂佺敤
@@ -227,6 +199,7 @@
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
private Long createBy;
/**
@@ -234,12 +207,14 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("create_time")
private Date createTime;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
private Long updateBy;
/**
@@ -247,6 +222,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("update_time")
private Date updateTime;
/**
@@ -255,9 +231,103 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ @TableField("host_id")
+ private Long hostId;
+
+ //蹇靛垵浣跨敤浠ヤ笅棰濆瀛楁
+ //涓昏浠撳簱
+ @TableField("main_host")
+ private String mainHost;
+
+ //涓昏鏉ユ簮
+ @TableField("main_source")
+ private String mainSource;
+
+ //寰幆鐩樼偣鐮�
+ @TableField("cycle_pick_code")
+ private String cyclePickCode;
+
+ //瀛樻斁浣嶇疆
+ @TableField("location_stock")
+ private String locationStock;
+
+ //鏉愯川
+ private String material;
+
+ //鍒朵护
+ private String decrees;
+
+ //鍥惧彿
+ @TableField("img_num")
+ private String imgNum;
+
+ //閲囪喘鍗曚綅
+ @TableField("purchasing_units")
+ private String purchasingUnits;
+
+ //宸ヨ壓缂栧彿
+ @TableField("process_number")
+ private String processNumber;
+
+ //鎸囧畾bom
+ private String bom;
+
+ //瀹夊叏瀛橀噺
+ @TableField("safe_num")
+ private String safeNum;
+
+ //鏈�浣庤ˉ閲�
+ @TableField("mini_count")
+ private String miniCount;
+
+ //琛ヨ揣鍊嶉噺
+ @TableField("replenishment_num")
+ private String replenishmentNum;
+
+ //鑷畾涔�1
+ private String tmp1;
+
+ //鑷畾涔�2
+ private String tmp2;
+
+ //鑷畾涔�3
+ private String tmp3;
+
+ //鎸夐渶姹傝ˉ璐�
+ @TableField("restock_demand")
+ private String restockDemand;
+
+ //澶辨晥
+ private String lapse;
+
+ //蹇嵎鐮�
+ private String shortcuts;
+
+ //瀹藉害
+ private String width;
+
+ //楂樺害
+ private String height;
+
+ //浼氳鍒嗙被
+ @TableField("accounting_class")
+ private String accountingClass;
+
+ //鎵瑰彿绠＄悊
+ private String batch;
+
+ //瀛樿揣鏍哥畻
+ @TableField("inventory_account")
+ private String inventoryAccount;
+
+
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, 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;
@@ -276,28 +346,47 @@
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;
+ 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(
+ // Mat manMat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿[闈炵┖]
@@ -341,59 +430,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