From fdb653cab266eda206472c7f577392366ce08ab7 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 7 Dec 2023 15:41:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=9B=E5=BB=BA=E8=80=85=E5=B1=95=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/DictTypeConstants.java | 1 + ...CustomerreceiptRecordDetailController.java | 8 ++- .../CustomerreceiptRecordMainController.java | 9 +++- ...ustomerreceiptRequestDetailController.java | 9 +++- .../CustomerreceiptRequestMainController.java | 10 +++- .../CustomerreturnJobDetailController.java | 10 +++- .../CustomerreturnJobMainController.java | 10 +++- .../CustomerreturnRecordDetailController.java | 10 +++- .../CustomerreturnRecordMainController.java | 10 +++- ...CustomerreturnRequestDetailController.java | 9 +++- .../CustomerreturnRequestMainController.java | 10 +++- .../CustomersettleRecordDetailController.java | 9 +++- .../CustomersettleRecordMainController.java | 9 +++- ...CustomersettleRequestDetailController.java | 10 +++- .../CustomersettleRequestMainController.java | 15 ++++-- .../DeliverJobDetailController.java | 9 +++- .../deliverJob/DeliverJobMainController.java | 10 +++- .../DeliverPlanDetailController.java | 9 +++- .../DeliverPlanMainController.java | 2 +- .../DeliverRecordDetailController.java | 9 +++- .../DeliverRecordMainController.java | 9 +++- .../DeliverRequestDetailController.java | 10 +++- .../DeliverRequestMainController.java | 9 +++- .../itembasic/ItembasicController.java | 10 ++-- .../labelBarbasic/BarbasicController.java | 51 +++++++++++++++++++ .../labelBarbasic/vo/BarbasicExcelVO.java | 12 +++-- .../labelBarbasic/vo/BarbasicRespVO.java | 7 +++ .../packageMassage/PackageController.java | 42 +++++++++++---- .../packageMassage/vo/PackageExcelVO.java | 3 ++ .../packageMassage/vo/PackageExportReqVO.java | 6 +++ .../packageMassage/PackageConvert.java | 2 +- .../dataobject/packageMassage/PackageDO.java | 2 +- .../mysql/labelBarbasic/BarbasicMapper.java | 9 ++++ .../mysql/packageMassage/PackageMapper.java | 6 +++ .../CustomerreturnRequestMainServiceImpl.java | 2 + .../labelBarbasic/BarbasicService.java | 11 ++++ .../labelBarbasic/BarbasicServiceImpl.java | 12 ++++- .../packageMassage/PackageService.java | 9 ++++ .../packageMassage/PackageServiceImpl.java | 6 +++ 39 files changed, 348 insertions(+), 48 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 50535caf..32be3bd7 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -63,6 +63,7 @@ public interface DictTypeConstants { String INTERFACE_TYPE = "interface_type";//接口类型 String REQUEST_MODE = "reqeust_mode";//申请模式 String LABEL_TYPE = "label_type";//标签类型 + String LABEL_STATUS = "label_status";//标签状态 String CARRIER_TYPE = "carrier_type";//承运商类型 String INVENTORY_STATUS = "inventory_status";//库存状态 String REQUEST_STATUS = "request_status";//请求状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java index a117237f..4a5cb2b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; +import com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,12 @@ public class CustomerreceiptRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')") public CommonResult> getCustomerreceiptRecordDetailPage(@Valid CustomerreceiptRecordDetailPageReqVO pageVO) { PageResult pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO); - return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得账期日历分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java index 2324ecaf..fd4d738b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java @@ -7,7 +7,9 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; @@ -100,7 +102,12 @@ public class CustomerreceiptRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')") public CommonResult> getCustomerreceiptRecordMainPage(@Valid CustomerreceiptRecordMainPageReqVO pageVO) { PageResult pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO); - return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货记录主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java index 24585f1f..707fa4f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; +import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,13 @@ public class CustomerreceiptRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')") public CommonResult> getCustomerreceiptRequestDetailPage(@Valid CustomerreceiptRequestDetailPageReqVO pageVO) { PageResult pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO); - return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货申请子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java index a0740874..79a3fa01 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java @@ -5,6 +5,8 @@ import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestDetailService; @@ -95,7 +97,13 @@ public class CustomerreceiptRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')") public CommonResult> getCustomerreceiptRequestMainPage(@Valid CustomerreceiptRequestMainPageReqVO pageVO) { PageResult pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO); - return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货申请主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java index ca92c7e9..639a17b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnJob.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,8 +92,12 @@ public class CustomerreturnJobDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')") public CommonResult> getCustomerreturnJobDetailPage(@Valid CustomerreturnJobDetailPageReqVO pageVO) { PageResult pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO); - return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货任务子分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index cdf14e7e..022417b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -7,8 +7,10 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnJob.vo.*; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExcelVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert; import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; @@ -104,7 +106,13 @@ public class CustomerreturnJobMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')") public CommonResult> getCustomerreturnJobMainPage(@Valid CustomerreturnJobMainPageReqVO pageVO) { PageResult pageResult = customerreturnJobMainService.getCustomerreturnJobMainPage(pageVO); - return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java index 82fff5c5..b8dbf14d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRecord.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,8 +92,12 @@ public class CustomerreturnRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')") public CommonResult> getCustomerreturnRecordDetailPage(@Valid CustomerreturnRecordDetailPageReqVO pageVO) { PageResult pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO); - return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货记录子分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java index 926aa8b7..537e79d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java @@ -8,7 +8,9 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRecord.CustomerreturnRecordMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; import com.win.module.wms.enums.DictTypeConstants; @@ -98,8 +100,12 @@ public class CustomerreturnRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')") public CommonResult> getCustomerreturnRecordMainPage(@Valid CustomerreturnRecordMainPageReqVO pageVO) { PageResult pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO); - return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货记录主分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java index 6cd49d99..aa86eec8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRequest.vo.*; +import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,13 @@ public class CustomerreturnRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')") public CommonResult> getCustomerreturnRequestDetailPage(@Valid CustomerreturnRequestDetailPageReqVO pageVO) { PageResult pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO); - return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货申请子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java index b6099174..0edb3e46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java @@ -6,7 +6,9 @@ import com.win.framework.excel.core.util.ConvertUtil; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService; @@ -103,7 +105,13 @@ public class CustomerreturnRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')") public CommonResult> getCustomerreturnRequestMainPage(@Valid CustomerreturnRequestMainPageReqVO pageVO) { PageResult pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO); - return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货申请主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java index 0cf578f0..2b53eef3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,12 @@ public class CustomersettleRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')") public CommonResult> getCustomersettleRecordDetailPage(@Valid CustomersettleRecordDetailPageReqVO pageVO) { PageResult pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO); - return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算记录子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java index a101a51c..21f213b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customersettleRecord.CustomersettleRecordDetailService; @@ -94,7 +96,12 @@ public class CustomersettleRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')") public CommonResult> getCustomersettleRecordMainPage(@Valid CustomersettleRecordMainPageReqVO pageVO) { PageResult pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO); - return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算记录主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java index f1c5ebaf..a3db9f2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRequest; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,13 @@ public class CustomersettleRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')") public CommonResult> getCustomersettleRequestDetailPage(@Valid CustomersettleRequestDetailPageReqVO pageVO) { PageResult pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO); - return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算申请子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java index 4195bcc9..0d799651 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java @@ -7,7 +7,10 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert; +import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; @@ -104,7 +107,13 @@ public class CustomersettleRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')") public CommonResult> getCustomersettleRequestMainPage(@Valid CustomersettleRequestMainPageReqVO pageVO) { PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO); - return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算申请主分页") @@ -113,9 +122,9 @@ public class CustomersettleRequestMainController { PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions); PageResult result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult); for(CustomersettleRequestMainRespVO vo : result.getList()) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); } return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java index cdb93eb2..a0fe64ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverJob; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,12 @@ public class DeliverJobDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')") public CommonResult> getDeliverJobDetailPage(@Valid DeliverJobDetailPageReqVO pageVO) { PageResult pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO); - return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货任务子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java index 6a0e533e..acdba6f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java @@ -4,7 +4,9 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.deliverJob.DeliverJobDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.enums.DictTypeConstants; @@ -99,7 +101,13 @@ public class DeliverJobMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')") public CommonResult> getDeliverJobMainPage(@Valid DeliverJobMainPageReqVO pageVO) { PageResult pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO); - return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货任务主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java index bab97336..cb59f091 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert; import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import org.springframework.web.bind.annotation.*; @@ -92,7 +93,13 @@ public class DeliverPlanDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')") public CommonResult> getDeliverPlanDetailPage(@Valid DeliverPlanDetailPageReqVO pageVO) { PageResult pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO); - return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverPlanDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货计划子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java index 793686fb..35fc34d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java @@ -158,7 +158,7 @@ public class DeliverPlanMainController { vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); } - return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult)); + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货计划主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java index c8d40924..d84b3dcb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java @@ -3,7 +3,9 @@ package com.win.module.wms.controller.deliverRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.controller.deliverRecord.vo.*; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -87,7 +89,12 @@ public class DeliverRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')") public CommonResult> getDeliverRecordDetailPage(@Valid DeliverRecordDetailPageReqVO pageVO) { PageResult pageResult = deliverRecordDetailService.getDeliverRecordDetailPage(pageVO); - return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java index f5919e80..29e0491b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java @@ -4,9 +4,11 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExcelVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.*; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; @@ -97,7 +99,12 @@ public class DeliverRecordMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')") public CommonResult> getDeliverRecordMainPage(@Valid DeliverRecordMainPageReqVO pageVO) { PageResult pageResult = deliverRecordMainService.getDeliverRecordMainPage(pageVO); - return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java index 7bfafe8a..09f0e615 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverRequest; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,13 @@ public class DeliverRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')") public CommonResult> getDeliverRequestDetailPage(@Valid DeliverRequestDetailPageReqVO pageVO) { PageResult pageResult = deliverRequestDetailService.getDeliverRequestDetailPage(pageVO); - return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java index 9c5f3e08..8cb05718 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java @@ -6,6 +6,7 @@ import com.win.framework.excel.core.util.ConvertUtil; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainExcelVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert; @@ -107,7 +108,13 @@ public class DeliverRequestMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')") public CommonResult> getDeliverRequestMainPage(@Valid DeliverRequestMainPageReqVO pageVO) { PageResult pageResult = deliverRequestMainService.getDeliverRequestMainPage(pageVO); - return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index 8184fb04..7ad3fb96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -274,11 +274,11 @@ public class ItembasicController { @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception { List list = ExcelUtils.read(file, ItembasicImportExcelVo.class); List errorList = itembasicService.importItembasicList(list, mode, updatePart); - Map returnMap = new HashMap<>(); - returnMap.put("errorCount", errorList.size()); - if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("物品基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); - returnMap.put("errorFile", url); + Map returnMap = new HashMap<>(); + returnMap.put("errorCount", errorList.size()); + if(!errorList.isEmpty()) { + String url = ExcelUtils.writeLocalFile("物品基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + returnMap.put("errorFile", url); } return success(returnMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java index 171d9e6a..53720780 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java @@ -1,5 +1,13 @@ package com.win.module.wms.controller.labelBarbasic; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.enums.DictTypeConstants; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +40,9 @@ public class BarbasicController { @Resource private BarbasicService barbasicService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建条码实体基类") @PreAuthorize("@ss.hasPermission('wms:barbasic:create')") @@ -79,9 +90,29 @@ public class BarbasicController { @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") public CommonResult> getBarbasicPage(@Valid BarbasicPageReqVO pageVO) { PageResult pageResult = barbasicService.getBarbasicPage(pageVO); + PageResult result = BarbasicConvert.INSTANCE.convertPage(pageResult); + for(BarbasicRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } return success(BarbasicConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索条码实体基类分页") + @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") + public CommonResult> getBarbasicSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = barbasicService.getBarbasicSenior(conditions); + PageResult result = BarbasicConvert.INSTANCE.convertPage(pageResult); + for(BarbasicRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出条码实体基类 Excel") @PreAuthorize("@ss.hasPermission('wms:barbasic:export')") @@ -94,6 +125,26 @@ public class BarbasicController { ExcelUtils.write(response, "条码实体基类.xls", "数据", BarbasicExcelVO.class, datas); } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物品基本信息 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = barbasicService.getBarbasicList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BarbasicExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] labelType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_TYPE); + mapDropDown.put(1, labelType); + String[] labelStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_STATUS); + mapDropDown.put(3, labelStatus); + // 导出 Excel + List resultList = BarbasicConvert.INSTANCE.convertList02(list); + return resultList; + } + @GetMapping("/get-import-template") @Operation(summary = "获得导入条码实体基类模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java index 66562c67..37b04de2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.labelBarbasic.vo; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -14,19 +16,21 @@ import com.alibaba.excel.annotation.ExcelProperty; @Data public class BarbasicExcelVO { - @ExcelProperty("id") - private Long id; +// @ExcelProperty("id") +// private Long id; @ExcelProperty("标签号") private String number; - @ExcelProperty("标签类型") + @ExcelProperty(value = "标签类型", converter = DictConvert.class) + @DictFormat("label_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; @ExcelProperty("标签模板") private String template; - @ExcelProperty("标签状态") + @ExcelProperty(value = "标签状态", converter = DictConvert.class) + @DictFormat("label_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String status; @ExcelProperty("关联号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java index 698cd996..518ae0a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.labelBarbasic.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 条码实体基类 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class BarbasicRespVO extends BarbasicBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29175") private Long id; + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建者ID") + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java index 56d2a751..aa00f71f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java @@ -3,14 +3,17 @@ package com.win.module.wms.controller.packageMassage; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.packageMassage.vo.*; import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; +import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.packageMassage.PackageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -23,8 +26,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.util.Collection; -import java.util.List; +import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -104,17 +106,39 @@ public class PackageController { public void exportPackageExcel(@Valid PackageExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = packageService.getPackageList(exportReqVO); + // 导出 Excel + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出包装 Excel") + @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:export')") + @OperateLog(type = EXPORT) + public void exportPackageSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = packageService.getPackageList(conditions); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); // 导出 Excel - List datas = PackageConvert.INSTANCE.convertList02(list); - for(PackageExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas); + ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown); } + private List getExcelVo(List list, Map mapDropDown) { + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(10, uom); + mapDropDown.put(12, uom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(16, packUnit); + List resultList = PackageConvert.INSTANCE.convertList02(list); + // 导出 + for (PackageExcelVO vo : resultList) { + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return resultList; + } @PostMapping("/senior") @Operation(summary = "高级搜索获得包装分页") @PreAuthorize("@ss.hasPermission('wms:package:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java index e56a8e81..7baa733c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java @@ -46,12 +46,15 @@ public class PackageExcelVO { private String altBatch; @ExcelProperty("生产日期") + @ColumnWidth(value = 22) private LocalDateTime produceDate; @ExcelProperty("有效期(日)") private Integer validityDays; @ExcelProperty("失效日期") + @ColumnWidth(value = 22) + private LocalDateTime expireDate; @ExcelProperty(value = "计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java index e416f564..74b7ad1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java @@ -138,4 +138,10 @@ public class PackageExportReqVO { @Schema(description = "体积") private String volume; + @Schema(description = "创建者id") + private String creator; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime createTime; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java index 326b90a9..42d7e7ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java @@ -8,6 +8,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExcelVO; import com.win.module.wms.controller.packageMassage.vo.PackageRespVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; @@ -33,5 +34,4 @@ public interface PackageConvert { PageResult convertPage(PageResult page); List convertList02(List list); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java index f6ae080a..974c734e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java @@ -24,7 +24,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO; @Builder @NoArgsConstructor @AllArgsConstructor -public class PackageDO{ +public class PackageDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java index 7d284111..41c3bcf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.labelBarbasic; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.labelBarbasic.vo.BarbasicExportReqVO; import com.win.module.wms.controller.labelBarbasic.vo.BarbasicPageReqVO; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; @@ -48,4 +50,11 @@ public interface BarbasicMapper extends BaseMapperX { .orderByDesc(BarbasicDO::getId)); } + default PageResult selectSenior(CustomConditions conditions){ + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default List selectSeniorList(CustomConditions conditions){ + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java index d4ba53fe..e28366b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import org.apache.ibatis.annotations.Mapper; @@ -83,7 +84,12 @@ public interface PackageMapper extends BaseMapperX { .eqIfPresent(PackageDO::getWeight, reqVO.getWeight()) .eqIfPresent(PackageDO::getArea, reqVO.getArea()) .eqIfPresent(PackageDO::getVolume, reqVO.getVolume()) + .eqIfPresent(PackageDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageDO::getCreator, reqVO.getCreator()) .orderByDesc(PackageDO::getId)); } + default List selectSeniorList(CustomConditions conditions){ + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 56975809..25af7f3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -324,6 +324,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque customerreturnJobMainDO.setCreateTime(null); customerreturnJobMainDO.setUpdater(null); customerreturnJobMainDO.setUpdateTime(null); + customerreturnJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses()); + customerreturnJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses()); // 获取任务单据设置 JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("CustomerRejectJob"); customerreturnJobMainDO.setRequestDueTime(mainDO.getDueTime()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java index 080f3288..5a76732c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.labelBarbasic; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.labelBarbasic.vo.*; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; import com.win.framework.common.pojo.PageResult; @@ -51,6 +53,14 @@ public interface BarbasicService { */ List getBarbasicList(Collection ids); + /** + * 获得条码实体基类列表 + * + * @param ids 编号 + * @return 条码实体基类列表 + */ + List getBarbasicList(CustomConditions conditions); + /** * 获得条码实体基类分页 * @@ -68,4 +78,5 @@ public interface BarbasicService { List getBarbasicList(BarbasicExportReqVO exportReqVO); + PageResult getBarbasicSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java index 46f3f206..0d29c5e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java @@ -1,6 +1,8 @@ package com.win.module.wms.service.labelBarbasic; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -70,6 +72,11 @@ public class BarbasicServiceImpl implements BarbasicService { return barbasicMapper.selectBatchIds(ids); } + @Override + public List getBarbasicList(CustomConditions conditions) { + return barbasicMapper.selectSeniorList(conditions); + } + @Override public PageResult getBarbasicPage(BarbasicPageReqVO pageReqVO) { return barbasicMapper.selectPage(pageReqVO); @@ -80,5 +87,8 @@ public class BarbasicServiceImpl implements BarbasicService { return barbasicMapper.selectList(exportReqVO); } - + @Override + public PageResult getBarbasicSenior(CustomConditions conditions) { + return barbasicMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index 4bb95486..da40a146 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -6,6 +6,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import javax.validation.Valid; @@ -95,4 +96,12 @@ public interface PackageService { * @param packageDO */ void generateLabel(PackageDO packageDO); + + /** + * 获得包装列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 包装列表 + */ + List getPackageList(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index e4f4e291..a4565865 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -12,6 +12,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.convert.packageMassage.PackageConvert; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; @@ -231,4 +232,9 @@ public class PackageServiceImpl implements PackageService { barbasicDO.setBarcodeString(headerStr + contentStr); barbasicMapper.insert(barbasicDO); } + + @Override + public List getPackageList(CustomConditions conditions) { + return packageMapper.selectSeniorList(conditions); + } }