From 7e981164f860264a38aa419f0f8a93699d59db3a Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 14 Dec 2023 08:36:08 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/SupplierdeliverRequestMainExcelVO.java | 13 +++-- .../SupplierdeliverRequestMainImportVO.java | 52 ++++++++++++------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainExcelVO.java index 159eadba..3a0dbd0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierdeliverRequest.vo; +import com.win.module.wms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -100,16 +101,20 @@ public class SupplierdeliverRequestMainExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("自动提交") + @ExcelProperty(value = "自动提交", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String autoCommit; - @ExcelProperty("自动通过") + @ExcelProperty(value = "自动通过", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String autoAgree; - @ExcelProperty("自动执行") + @ExcelProperty(value = "自动执行", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String autoExecute; - @ExcelProperty("直接生成记录") + @ExcelProperty(value = "直接生成记录", converter = DictConvert.class) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String directCreateRecord; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java index cebf9814..2a6e3c24 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java @@ -2,6 +2,7 @@ package com.win.module.wms.controller.supplierdeliverRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.win.framework.excel.core.annotations.OnlyOne; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,43 +23,58 @@ import java.time.LocalDateTime; @Accessors(chain = false) // 设置 chain = false,避免用户导入有问题 public class SupplierdeliverRequestMainImportVO { - //主表数据 - @ExcelProperty("订单类型") - private String type; - - @ExcelProperty("单据号") - private String number; - - @ExcelProperty("行号") - private String hang; + @ExcelProperty("要货计划单号") + private String ppNumber; @ExcelProperty("供应商代码") + @OnlyOne private String supplierCode; + @ExcelProperty("从仓库代码") + private String fromWarehouseCode; + + @ExcelProperty("计划到货时间") + private LocalDateTime planArriveTime; + @ExcelProperty("联系人姓名") private String contactName; @ExcelProperty("联系人电话") - @ColumnWidth(value = 16) private String contactPhone; @ExcelProperty("联系人电子邮件") - @ColumnWidth(value = 16) private String contactEmail; - @ExcelProperty("是否寄存订单") - private String isConsignment; + @ExcelProperty("承运商") + private String carrierCode; - @ExcelProperty("截止日期") - private LocalDateTime dueDate; + @ExcelProperty("运输方式") + private String transferMode; + + @ExcelProperty("车牌号") + private String vehiclePlateNumber; + + @ExcelProperty("截止时间") + private LocalDateTime dueTime; //子表数据 @ExcelProperty("物品代码") private String itemCode; + @ExcelProperty("批次") + private String batch; + @ExcelProperty("订单号") + private String poNumber; + @ExcelProperty("订单行") + private String poLine; @ExcelProperty("数量") - private BigDecimal orderQty; + private BigDecimal qty; @ExcelProperty("计量单位") private String uom; - @ExcelProperty("超收百分比") - private BigDecimal overReceivingPercent; + @ExcelProperty("到货日期") + private LocalDateTime arriveDate; + @ExcelProperty("生产日期") + private LocalDateTime produceDate; + @ExcelProperty("过期日期") + private LocalDateTime expireDate; + }