From 6cb4e6647b0e2e8c0cafa38a07666e07709bcf54 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 19 一月 2026 13:06:05 +0800
Subject: [PATCH] 物料新增，修改功能 优化
---
src/main/java/com/zy/asrs/entity/Mat.java | 94 ++++++++++++++---------------------------------
1 files changed, 28 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bdd9654..c8a2d7b 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zy.api.enums.MatLocType;
import com.zy.asrs.enums.ContainerType;
-import com.zy.asrs.service.BasContainerService;
-import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -56,6 +56,7 @@
*/
@ApiModelProperty(value= "鎵�灞炲綊绫�")
@TableField("tag_id")
+// @ExcelProperty(value = "鍟嗗搧绫诲瀷")
private Long tagId;
/**
@@ -77,35 +78,35 @@
* 鍒悕
*/
@ApiModelProperty(value= "鍒悕")
- @ExcelProperty(value = "鍒悕")
+// @ExcelProperty(value = "鍒悕")
private String name;
/**
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty(value = "瑙勬牸")
+ @ExcelProperty(value = "灏哄")
private String specs;
/**
* 鍨嬪彿
*/
@ApiModelProperty(value= "鍨嬪彿")
- @ExcelProperty(value = "鍨嬪彿")
+// @ExcelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
- @ExcelProperty(value = "棰滆壊")
+// @ExcelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
- @ExcelProperty(value = "鍝佺墝")
+// @ExcelProperty(value = "鍝佺墝")
private String brand;
/**
@@ -119,42 +120,42 @@
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
- @ExcelProperty(value = "鍗曚环")
+// @ExcelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
@ApiModelProperty(value= "sku")
- @ExcelProperty(value = "sku")
+// @ExcelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
@ApiModelProperty(value= "鍗曚綅閲�")
- @ExcelProperty(value = "鍗曚綅閲�")
+// @ExcelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
- @ExcelProperty(value = "鏉＄爜")
+// @ExcelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
@ApiModelProperty(value= "浜у湴")
- @ExcelProperty(value = "浜у湴")
+// @ExcelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
- @ExcelProperty(value = "鍘傚")
+ @ExcelProperty(value = "鍏徃")
private String manu;
/**
@@ -169,7 +170,7 @@
* 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
- @ExcelProperty(value = "鍝侀」鏁�")
+// @ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
@@ -177,7 +178,7 @@
* 瀹夊叏搴撳瓨閲�
*/
@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+// @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
@@ -204,14 +205,14 @@
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
+// @ExcelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
@ApiModelProperty(value= "涓夋柟缂栫爜")
- @ExcelProperty(value = "涓夋柟缂栫爜")
+ @ExcelProperty(value = "BS Code")
@TableField("three_code")
private String threeCode;
@@ -219,7 +220,7 @@
* 渚涘簲鍟�
*/
@ApiModelProperty(value= "渚涘簲鍟�")
- @ExcelProperty(value = "渚涘簲鍟�")
+// @ExcelProperty(value = "渚涘簲鍟�")
private String supp;
/**
@@ -242,7 +243,7 @@
*/
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
- @ExcelProperty(value = "淇濊川鏈�")
+// @ExcelProperty(value = "淇濊川鏈�")
private String deadTime;
/**
@@ -250,7 +251,7 @@
*/
@ApiModelProperty(value= "棰勮澶╂暟")
@TableField("dead_warn")
- @ExcelProperty(value = "棰勮澶╂暟")
+// @ExcelProperty(value = "棰勮澶╂暟")
private Integer deadWarn;
/**
@@ -305,10 +306,12 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("搴撲綅绫诲瀷")
@TableField("loc_type")
+// @ExcelProperty(value = "搴撲綅绫诲瀷")
private Long locType;
/**
@@ -378,53 +381,8 @@
this.memo = memo;
}
-// Mat mat = new Mat(
-// null, // 缂栧彿
-// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍒悕
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// 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 // 澶囨敞
-// );
-
public String getTagId$(){
- TagService service = SpringUtils.getBean(TagService.class);
- Tag tag = service.selectById(this.tagId);
- if (!Cools.isEmpty(tag)){
- return String.valueOf(tag.getName());
- }
- return null;
+ return MatLocType.getTagName(this.tagId + "");
}
public String getLocType$(){
@@ -441,6 +399,10 @@
return null;
}
+ public String getProType(){
+ return MatLocType.getMatTag(this.tagId + "");
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1