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

---
 .../purchase/domain/PurchaseCheckInfo.java      | 17 +++++++++++++----
 .../resources/mapper/material/ma/TypeMapper.xml |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index b97f407f..4db98e59 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -29,17 +29,20 @@ public class PurchaseCheckInfo extends BaseEntity {
     private Long id;
 
     /** 任务ID */
-    @Excel(name = "任务ID")
+    //@Excel(name = "任务ID")
     @ApiModelProperty(value = "任务ID")
     private Long taskId;
 
+    @Excel(name = "任务状态", readConverterExp = "21=入库进行中,22=入库已完成", sort = 10)
     @ApiModelProperty(value = "任务状态")
     private Integer taskStatus;
 
+    @Excel(name = "采购单号", sort = 2)
     @ApiModelProperty(value = "采购单号")
     private String code;
 
     /** 采购日期 */
+    @Excel(name = "采购日期", sort = 1)
     @ApiModelProperty(value = "采购日期")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date purchaseTime;
@@ -57,50 +60,56 @@ public class PurchaseCheckInfo extends BaseEntity {
     private Long purchaser;
 
     /** 物资厂家id */
-    @Excel(name = "物资厂家id")
+    //@Excel(name = "物资厂家id")
     @ApiModelProperty(value = "物资厂家id")
     private Long supplierId;
 
     /** 物资厂家名称 */
-    @Excel(name = "物资厂家名称")
+    @Excel(name = "物资厂家名称", sort = 8)
     @ApiModelProperty(value = "物资厂家名称")
     private String supplier;
 
     /** 数据所属组织 */
-    @Excel(name = "数据所属组织")
+    //@Excel(name = "数据所属组织")
     private Long companyId;
 
     /**
      * 采购物资
      */
+    @Excel(name = "采购物资", sort = 3)
     @ApiModelProperty(value = "采购物资--外层Table字段")
     private String purchaseMaTypeName;
 
     /**
      * 采购数量
      */
+    @Excel(name = "采购数量", sort = 4)
     @ApiModelProperty(value = "采购数量--外层Table字段")
     private Long purchaseMaNumber;
 
     /**
      * 采购单价(不含税)
      */
+    @Excel(name = "采购单价(不含税)", sort = 5)
     @ApiModelProperty(value = "采购单价(不含税)--外层Table字段")
     private BigDecimal purchasePrice;
 
     /**
      * 采购单价(含税)
      */
+    @Excel(name = "采购单价(含税)", sort = 6)
     @ApiModelProperty(value = "采购单价(含税)--外层Table字段")
     private BigDecimal purchaseTaxPrice;
 
     /**
      * 税率
      */
+    @Excel(name = "税率", sort = 7)
     @ApiModelProperty(value = "税率 0~100")
     @Size(max = 100, message = "税率长度必须介于 0 和 100 之间")
     private BigDecimal taxRate;
 
+    @Excel(name = "操作人", sort = 9)
     @ApiModelProperty(value = "操作人名称")
     private String createUserName;
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index 9099299b..277595a2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -689,7 +689,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             mm.type_id = #{record.typeId}
           and mm.ma_code is not null
-          and mm.ma_status in (15)
+          and mm.ma_status in (1)
           and mt.`level` = 4
           and mt.del_flag = '0'
     </select>