From b2e95bcae0e10000c8d3af600845e78493f9b21f Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 5 Dec 2023 13:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CustomerreceiptRequestMainBaseVO.java | 2 +- .../vo/CustomerreceiptRequestMainExcelVO.java | 2 +- .../vo/CustomerreceiptRequestMainExportReqVO.java | 2 +- .../vo/CustomerreceiptRequestMainPageReqVO.java | 2 +- .../customerreceiptRequest/CustomerreceiptRequestMainDO.java | 3 ++- .../CustomerreceiptRequestMainMapper.java | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java index 68ffb8a0..99ca2cad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java @@ -23,7 +23,7 @@ public class CustomerreceiptRequestMainBaseVO { private Long id; @Schema(description = "发货记录单号") - private String deliverRequestNumber; + private String deliverRecordNumber; @Schema(description = "发货计划单号") private String deliverPlanNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java index 17be8c5a..90690ad6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java @@ -27,7 +27,7 @@ public class CustomerreceiptRequestMainExcelVO { private String number; @ExcelProperty("发货记录单号") - private String deliverRequestNumber; + private String deliverRecordNumber; @ExcelProperty("发货计划单号") private String deliverPlanNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java index 6ce2095f..08035734 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java @@ -14,7 +14,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class CustomerreceiptRequestMainExportReqVO { @Schema(description = "发货记录单号") - private String deliverRequestNumber; + private String deliverRecordNumber; @Schema(description = "发货计划单号") private String deliverPlanNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java index 9ac82322..5a058bba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java @@ -16,7 +16,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class CustomerreceiptRequestMainPageReqVO extends PageParam { @Schema(description = "发货记录单号") - private String deliverRequestNumber; + private String deliverRecordNumber; @Schema(description = "发货计划单号") private String deliverPlanNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java index 09bb2fb5..43efedbd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.customerreceiptRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -31,7 +32,7 @@ public class CustomerreceiptRequestMainDO extends BaseDO { /** * 发货记录单号 */ - private String deliverRequestNumber; + private String deliverRecordNumber; /** * 发货计划单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java index 0ed2c76a..bdde64d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java @@ -22,7 +22,7 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX selectPage(CustomerreceiptRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverRequestNumber, reqVO.getDeliverRequestNumber()) + .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverRecordNumber, reqVO.getDeliverRecordNumber()) .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverPlanNumber, reqVO.getDeliverPlanNumber()) .eqIfPresent(CustomerreceiptRequestMainDO::getCustomerCode, reqVO.getCustomerCode()) .eqIfPresent(CustomerreceiptRequestMainDO::getCustomerDockCode, reqVO.getCustomerDockCode()) @@ -57,7 +57,7 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX selectList(CustomerreceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverRequestNumber, reqVO.getDeliverRequestNumber()) + .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverRecordNumber, reqVO.getDeliverRecordNumber()) .eqIfPresent(CustomerreceiptRequestMainDO::getDeliverPlanNumber, reqVO.getDeliverPlanNumber()) .eqIfPresent(CustomerreceiptRequestMainDO::getCustomerCode, reqVO.getCustomerCode()) .eqIfPresent(CustomerreceiptRequestMainDO::getCustomerDockCode, reqVO.getCustomerDockCode())