From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期三, 02 七月 2025 15:12:43 +0800
Subject: [PATCH] #优化库位检索
---
src/main/java/com/zy/asrs/entity/Mat.java | 364 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 287 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index ecd9b5f..428d94c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -8,10 +9,12 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -21,8 +24,7 @@
@TableName("man_mat")
public class Mat implements Serializable {
- private static final long serialVersionUID = 1L;
-
+ @ExcelIgnore
@TableField(exist = false)
private Double stock;
@@ -34,9 +36,12 @@
this.stock = stock;
}
+ private static final long serialVersionUID = 1L;
+
/**
* ID
*/
+ @ExcelIgnore
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@@ -44,132 +49,242 @@
/**
* 缂栧彿
*/
+ // 瀵煎嚭鍊熺敤璇ュ瓧娈靛瓨鎵�灞炲綊绫讳腑鏂囨弿杩�
+ @ExcelProperty(value = "褰掔被鍚嶇О")
@ApiModelProperty(value= "缂栧彿")
private String uuid;
-
- /**
- * 鎵�灞炲尯鍩�
- */
- @ApiModelProperty(value= "鎵�灞炲尯鍩�")
- @TableField("node_id")
- private Long nodeId;
/**
* 鎵�灞炲綊绫�
*/
@ApiModelProperty(value= "鎵�灞炲綊绫�")
@TableField("tag_id")
+ @ExcelProperty(value = "褰掔被")
private Long tagId;
/**
- * 鍟嗗搧缂栧彿
+ * 鍝佸彿
*/
- @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍝佸彿")
+ @ExcelProperty(value = "鍝佸彿")
private String matnr;
+
/**
- * 鍟嗗搧鍚嶇О
+ * 鍝佸悕
*/
- @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鍝佸悕")
+ @ExcelProperty(value = "鍝佸悕")
private String maktx;
/**
- * 鍚嶇О
+ * 鍒悕
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "鍒悕")
+ @ExcelIgnore
private String name;
/**
* 瑙勬牸
*/
- @ExcelProperty(index = 4, value = "瑙勬牸")
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ExcelProperty(index = 5, value = "鍨嬪彿")
@ApiModelProperty(value= "鍨嬪彿")
+ @ExcelIgnore
private String model;
/**
- * 鎵瑰彿
+ * 棰滆壊
*/
- @ExcelProperty(index = 6, value = "鎵瑰彿")
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value= "棰滆壊")
+ @ExcelIgnore
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "绫诲瀷")
+// @ApiModelProperty(value= "鍝佺墝")
+ @ExcelProperty(value = "绫诲瀷")
+ private String brand;
/**
* 鍗曚綅
*/
- @ExcelProperty(index = 7, value = "鍗曚綅")
@ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty(value = "鍗曚綅")
private String unit;
/**
- * SKC
+ * 鍗曚环
*/
- @ExcelProperty(index = 8, value = "SKC")
- @ApiModelProperty(value= "SKC")
+ @ApiModelProperty(value= "鍗曚环")
+ @ExcelIgnore
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ @ExcelIgnore
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ @ExcelIgnore
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @ExcelIgnore
private String barcode;
/**
- * 鍗曟嵁绫诲瀷
+ * 浜у湴
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @TableField("doc_id")
- private Long docId;
+ @ApiModelProperty(value= "浜у湴")
+ @ExcelIgnore
+ private String origin;
/**
- * 鍗曟嵁缂栧彿
+ * 鍘傚
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("doc_num")
- private String docNum;
+ @ApiModelProperty(value= "鍘傚")
+ @ExcelIgnore
+ private String manu;
/**
- * 瀹㈡埛鍚嶇О
+ * 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- @TableField("cust_name")
- private String custName;
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ExcelIgnore
+ @TableField("manu_date")
+ private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ @ExcelIgnore
@TableField("item_num")
- private Integer itemNum;
+ private String itemNum;
/**
- * 搴撳瓨浣欓噺
+ * 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "搴撳瓨浣欓噺")
- private Integer count;
-
- /**
- * 鍗曚环
- */
- @ExcelProperty(index = 9, value = "鍗曚环")
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ExcelIgnore
+ @TableField("safe_qty")
+ private Double safeQty;
/**
* 閲嶉噺
*/
- @ExcelProperty(index = 10, value = "閲嶉噺")
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelIgnore
private Double weight;
- @ApiModelProperty(value= "")
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ @ExcelIgnore
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelIgnore
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ExcelIgnore
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelIgnore
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ExcelIgnore
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ExcelIgnore
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ @ExcelIgnore
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ @ExcelIgnore
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ExcelIgnore
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ExcelIgnore
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ExcelIgnore
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ExcelIgnore
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
+ @ExcelIgnore
@ApiModelProperty(value= "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
@@ -177,13 +292,16 @@
/**
* 娣诲姞鏃堕棿
*/
+ @ExcelIgnore
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
+ @ExcelIgnore
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
@@ -191,37 +309,53 @@
/**
* 淇敼鏃堕棿
*/
+ @ExcelIgnore
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ExcelProperty(index = 11, value = "澶囨敞")
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty(value = "澶囨敞")
private String memo;
public Mat() {}
- public Mat(String uuid,Long nodeId,Long tagId,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,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.nodeId = nodeId;
this.tagId = tagId;
this.matnr = matnr;
this.maktx = maktx;
this.name = name;
this.specs = specs;
this.model = model;
- this.batch = batch;
+ this.color = color;
+ this.brand = brand;
this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
this.barcode = barcode;
- this.docId = docId;
- this.docNum = docNum;
- this.custName = custName;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
this.itemNum = itemNum;
- this.count = count;
+ 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;
@@ -232,23 +366,37 @@
// Mat mat = new Mat(
// null, // 缂栧彿
-// null, // 鎵�灞炲尯鍩�
// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
+// null, // 鍝佸彿
+// null, // 鍝佸悕
+// null, // 鍒悕
// null, // 瑙勬牸
// null, // 鍨嬪彿
-// null, // 鎵瑰彿
+// null, // 棰滆壊
+// null, // 鍝佺墝
// null, // 鍗曚綅
-// null, // SKC
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁缂栧彿
-// null, // 瀹㈡埛鍚嶇О
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍗曚綅閲�
+// null, // 鏉＄爜
+// null, // 浜у湴
+// null, // 鍘傚
+// null, // 鐢熶骇鏃ユ湡
// null, // 鍝侀」鏁�
-// null, // 搴撳瓨浣欓噺
+// null, // 瀹夊叏搴撳瓨閲�
// null, // 閲嶉噺
-// null, //
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null, // 鏄惁鎵规
+// null, // 淇濊川鏈�
+// null, // 棰勮澶╂暟
+// null, // 鍒惰喘
+// null, // 瑕佹眰妫�楠�
+// null, // 鍗遍櫓鍝�
+// null, // 鐘舵�乕闈炵┖]
// null, // 娣诲姞浜哄憳
// null, // 娣诲姞鏃堕棿
// null, // 淇敼浜哄憳
@@ -265,11 +413,73 @@
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$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -281,15 +491,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public Long getUpdateBy() {
- return updateBy;
- }
-
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -301,4 +507,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
--
Gitblit v1.9.1