From 1fcc1023aaca48874c19d50a4f2a1806aa43958b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 2 Dec 2024 11:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E8=AF=A6=E6=83=85=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/domain/PurchaseCheckDetails.java | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
index d65943e9..bd9e5add 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
@@ -28,15 +28,16 @@ public class PurchaseCheckDetails extends BaseEntity {
     private Long id;
 
     /** 任务ID */
-    @Excel(name = "任务ID")
+    //@Excel(name = "任务ID")
     @ApiModelProperty(value = "任务ID")
     private Long taskId;
 
     /** 规格id */
-    @Excel(name = "规格id")
+    //@Excel(name = "规格id")
     @ApiModelProperty(value = "规格id")
     private Long typeId;
 
+    @Excel(name = "规格名称", sort = 2)
     @ApiModelProperty(value = "规格名称")
     private String typeName;
 
@@ -46,31 +47,32 @@ public class PurchaseCheckDetails extends BaseEntity {
     @ApiModelProperty(value = "物资单位名称")
     private String unitName;
 
+    @Excel(name = "物资名称", sort = 1)
     @ApiModelProperty(value = "物资名称--规格parent类型")
     private String maTypeName;
 
     /** 采购单价(不含税) */
-    @Excel(name = "采购单价(不含税)")
+    @Excel(name = "采购单价(不含税)", sort = 3)
     @ApiModelProperty(value = "采购单价(不含税)")
     private BigDecimal purchasePrice;
 
     /** 采购单价(含税) */
-    @Excel(name = "采购单价(含税)")
+    @Excel(name = "采购单价(含税)", sort = 4)
     @ApiModelProperty(value = "采购单价(含税)")
     private BigDecimal purchaseTaxPrice;
 
     /** 采购数量 */
-    @Excel(name = "采购数量")
+    @Excel(name = "采购数量", sort = 5)
     @ApiModelProperty(value = "采购数量")
     private Long purchaseNum;
 
     /** 验收数量 */
-    @Excel(name = "验收数量")
+    @Excel(name = "验收数量", sort = 6)
     @ApiModelProperty(value = "验收数量")
     private Long checkNum;
 
     /** 绑定数量 */
-    @Excel(name = "绑定数量")
+    @Excel(name = "绑定数量", sort = 7)
     @ApiModelProperty(value = "绑定数量")
     private Long bindNum;
 
@@ -94,18 +96,18 @@ public class PurchaseCheckDetails extends BaseEntity {
 
     /** 物资厂家名称 */
     @ApiModelProperty(value = "物资厂家名称")
-    @Excel(name = "物资厂家名称")
+    //@Excel(name = "物资厂家名称")
     private String supplierName;
 
     /** 状态，参考数据字典purchase_task_status键值 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", readConverterExp = "1=待通知,2=待验收,3=待绑定,4=待入库,19=已入库", sort = 11)
     @ApiModelProperty(value = "状态，参考数据字典purchase_task_status键值")
     private Integer status;
 
     /** 出厂日期 */
     @ApiModelProperty(value = "出厂日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 10)
     private Date productionTime;
 
     /** 验收图片 */
@@ -119,19 +121,19 @@ public class PurchaseCheckDetails extends BaseEntity {
     private String checkUrl;
 
     /** 入库数量 */
-    @Excel(name = "入库数量")
+    @Excel(name = "入库数量", sort = 8)
     @ApiModelProperty(value = "入库数量")
     private Long inputNum;
 
     /** 是否入库 */
-    @Excel(name = "是否入库")
+    //@Excel(name = "是否入库")
     @ApiModelProperty(value = "是否入库")
     private String inputStatus;
 
     /** 入库时间 */
     @ApiModelProperty(value = "入库时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd", sort = 9)
     private Date inputTime;
 
     /** 验收附件名称 */
@@ -154,7 +156,7 @@ public class PurchaseCheckDetails extends BaseEntity {
     private String fixCode;
 
     /** 管理方式(0编号 1计数) */
-    @Excel(name = "管理方式(0编号 1计数)")
+    @Excel(name = "管理方式", readConverterExp = "0=编号,1=计数", sort = 12)
     @ApiModelProperty(value = "管理方式(0编号 1计数)")
     private Integer manageType;