From 86303b3aba65b81c382d35750863eb4d6089fe8d Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Tue, 31 Oct 2023 11:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=BB=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/PurchaseclaimRequestImportErrorVO.java | 110 ++----------------
 .../PurchaseclaimRequestDetailConvert.java    |   1 -
 2 files changed, 7 insertions(+), 104 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportErrorVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportErrorVO.java
index b4d56a19..507461f8 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportErrorVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportErrorVO.java
@@ -1,18 +1,9 @@
 package com.win.module.wms.controller.purchaseclaimRequest.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.win.framework.excel.core.annotations.DictFormat;
-import com.win.framework.excel.core.convert.DictConvert;
-import com.win.module.wms.enums.DictTypeConstants;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 
 /**
@@ -21,101 +12,14 @@ import java.time.LocalDateTime;
  * @author 超级管理员
  */
 @Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = false)
-public class PurchaseclaimRequestImportErrorVO {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PurchaseclaimRequestImportErrorVO extends PurchaseclaimRequestImportVO {
 
-    @ExcelProperty("导入状态")
+    @ExcelProperty(value = "导入状态", index = 0)
     private String importStatus;
 
-    @ExcelProperty("导入说明")
+    @ExcelProperty(value = "导入说明", index = 1)
     private String importRemark;
 
-    @ExcelProperty("发货单号")
-    private String asnNumber;
-
-    @ExcelProperty("要货计划单号")
-    private String ppNumber;
-
-    @ExcelProperty("供应商代码")
-    private String supplierCode;
-
-    @ExcelProperty("单据号")
-    private String number;
-
-    @ExcelProperty("业务类型")
-    private String businessType;
-
-    @ExcelProperty("申请时间")
-    @ColumnWidth(value = 16)
-    private LocalDateTime requestTime;
-
-    @ExcelProperty("截止时间")
-    @ColumnWidth(value = 16)
-    private LocalDateTime dueTime;
-
-    @ExcelProperty("部门")
-    private String departmentCode;
-
-    @ExcelProperty("自动提交")
-    private String autoCommit;
-
-    @ExcelProperty("自动通过")
-    private String autoAgree;
-
-    @ExcelProperty("自动执行")
-    private String autoExecute;
-
-    @ExcelProperty("直接生成记录")
-    private String directCreateRecord;
-
-    @ExcelProperty("批次")
-    private String batch;
-
-    @ExcelProperty("替代批次")
-    private String altBatch;
-
-    @ExcelProperty("订单号")
-    private String poNumber;
-
-    @ExcelProperty("订单行")
-    private String poLine;
-
-    @ExcelProperty(value = "原因", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.PURCHASE_RETURN_REASON)
-    private String reason;
-
-    @ExcelProperty("单价")
-    private BigDecimal singlePrice;
-
-    @ExcelProperty("金额")
-    private BigDecimal amount;
-
-    @ExcelProperty("物品代码")
-    private String itemCode;
-
-    @ExcelProperty("物品名称")
-    private String itemName;
-
-    @ExcelProperty("物品描述1")
-    private String itemDesc1;
-
-    @ExcelProperty("物品描述2")
-    private String itemDesc2;
-
-    @ExcelProperty("项目代码")
-    private String projectCode;
-
-    @ExcelProperty("数量")
-    private BigDecimal qty;
-
-    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.UOM)
-    private String uom;
-
-    @ExcelProperty("备注")
-    private String remark;
-
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java
index 4486b929..9847f521 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestDetailConvert.java
@@ -47,7 +47,6 @@ public interface PurchaseclaimRequestDetailConvert {
     })
     PurchaseclaimRequestDetailExcelVO convert(PurchaseclaimRequestMainDO mainDO, PurchaseclaimRequestDetailDO detailDO);
 
-
     @Mappings({
             @Mapping(source = "mainVo.number", target = "number"),
             @Mapping(source = "mainVo.remark", target = "remark"),