From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/entity/ReviewDetl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ReviewDetl.java b/src/main/java/com/zy/asrs/entity/ReviewDetl.java
index 5d3aab7..d0b1ddf 100644
--- a/src/main/java/com/zy/asrs/entity/ReviewDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ReviewDetl.java
@@ -1,5 +1,7 @@
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;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -25,17 +27,25 @@
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鏄惁鏄剧ず")
+ @ExcelIgnore
+ @TableField(exist = false)
+ private Boolean show;
+
/**
* ID
*/
@ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
+ @ExcelIgnore
private Long id;
/**
* 璁㈠崟鍐呯爜
*/
@ApiModelProperty(value = "璁㈠崟鍐呯爜")
+ @ExcelIgnore
@TableField("order_id")
private Long orderId;
@@ -44,6 +54,7 @@
*/
@ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
+ @ExcelProperty("鍗曟嵁缂栧彿")
private String orderNo;
@@ -51,6 +62,7 @@
* 鏁伴噺
*/
@ApiModelProperty(value = "鏁伴噺")
+ @ExcelProperty("鍑�閲�")
private Double anfme;
/**
@@ -61,6 +73,7 @@
*/
@ApiModelProperty(value = "浣滀笟鏁伴噺")
@TableField("work_qty")
+ @ExcelIgnore
private Double workQty;
/**
@@ -70,96 +83,112 @@
* 鍑哄簱 : qty 馃憜
*/
@ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ @ExcelIgnore
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
@ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ @ExcelProperty("鐗╂枡缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
@ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
@ApiModelProperty(value = "鎵瑰彿")
+ @ExcelProperty("鎵规鍙�")
private String batch;
/**
* 瑙勬牸
*/
@ApiModelProperty(value = "瑙勬牸")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String specs;
/**
* 鍨嬪彿
*/
@ApiModelProperty(value = "鍨嬪彿")
+ @ExcelProperty("鍗峰彿")
private String model;
/**
* 棰滆壊
*/
@ApiModelProperty(value = "棰滆壊")
+ @ExcelIgnore
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value = "鍝佺墝")
+ @ExcelIgnore
private String brand;
/**
* 鍗曚綅
*/
@ApiModelProperty(value = "鍗曚綅")
+ @ExcelIgnore
private String unit;
/**
* 鍗曚环
*/
@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 = "浜у湴")
+ @ExcelIgnore
private String origin;
/**
* 鍘傚 銆併�佹睙閾滐細鏆傚瓨搴撲綅鍙�
*/
@ApiModelProperty(value = "鍘傚")
+ @ExcelIgnore
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
@ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @ExcelIgnore
@TableField("manu_date")
private String manuDate;
@@ -167,6 +196,7 @@
* 鍝侀」鏁�
*/
@ApiModelProperty(value = "鍝侀」鏁�")
+ @ExcelIgnore
@TableField("item_num")
private String itemNum;
@@ -174,6 +204,7 @@
* 瀹夊叏搴撳瓨閲�
*/
@ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @ExcelIgnore
@TableField("safe_qty")
private Double safeQty;
@@ -181,18 +212,21 @@
* 閲嶉噺
*/
@ApiModelProperty(value = "閲嶉噺")
+ @ExcelIgnore
private Double weight;
/**
* 闀垮害
*/
@ApiModelProperty(value = "闀垮害")
+ @ExcelIgnore
private Double length;
/**
* 浣撶Н
*/
@ApiModelProperty(value = "浣撶Н")
+ @ExcelIgnore
private Double volume;
/**
@@ -200,18 +234,21 @@
*/
@ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
+ @ExcelProperty("澶嶆牳浜�")
private String threeCode;
/**
* 渚涘簲鍟�
*/
@ApiModelProperty(value = "渚涘簲鍟�")
+ @ExcelIgnore
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @ExcelIgnore
@TableField("supp_code")
private String suppCode;
@@ -220,6 +257,7 @@
*/
@ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
+ @ExcelIgnore
private Integer beBatch;
/**
@@ -227,12 +265,14 @@
*/
@ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
+ @ExcelProperty("鍑哄簱鏃ユ湡")
private String deadTime;
/**
* 棰勮澶╂暟
*/
@ApiModelProperty(value = "棰勮澶╂暟")
+ @ExcelIgnore
@TableField("dead_warn")
private Integer deadWarn;
@@ -240,30 +280,39 @@
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佹睙閾滐細鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ExcelIgnore
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ExcelIgnore
private Integer inspect;
+
+ @ExcelProperty("鏄惁澶嶆牳")
+ @TableField(exist = false)
+ private String inspect$;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ExcelIgnore
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ExcelIgnore
private Integer status;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value = "娣诲姞浜哄憳")
+ @ExcelIgnore
@TableField("create_by")
private Long createBy;
@@ -271,6 +320,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @ExcelIgnore
@TableField("create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -279,6 +329,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value = "淇敼浜哄憳")
+ @ExcelIgnore
@TableField("update_by")
private Long updateBy;
@@ -288,15 +339,18 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty("澶嶆牳鏃堕棿")
private Date updateTime;
/**
* 澶囨敞
*/
@ApiModelProperty(value = "澶囨敞")
+ @ExcelProperty("澶嶆牳澶囨敞")
private String memo;
@ApiModelProperty(value = "閫�搴撴爣璁�")
+ @ExcelIgnore
@TableField("tk_type")
private Integer tkType;
@@ -304,6 +358,7 @@
* 鍗蜂俊鎭疘D
*/
@ApiModelProperty(value = "鍗蜂俊鎭疘D")
+ @ExcelIgnore
@TableField("roll_up")
private Long rollUp;
@@ -395,4 +450,10 @@
return this.brand;
}
+ public Boolean getShow() {
+ if (this.inspect != null && this.inspect == 1) {
+ return false;
+ }
+ return true;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1