Browse Source

Merge remote-tracking branch 'origin/master'

master
刘忱 2 years ago
parent
commit
38f7f0b2ad
  1. 7
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java
  3. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java
  4. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java
  5. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java
  6. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java
  7. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java
  8. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java
  9. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java
  10. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java
  11. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java
  12. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java
  13. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java
  14. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java
  15. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java
  16. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java
  17. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java
  18. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java
  19. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java
  20. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java
  21. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java
  22. 27
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java
  23. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java
  24. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java
  25. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java
  26. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java
  27. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java
  28. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java
  29. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java
  30. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java
  31. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java
  32. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java
  33. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java
  34. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java
  35. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java
  36. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java
  37. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java
  38. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java
  39. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java
  40. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java
  41. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java
  42. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java
  43. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java
  44. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java
  45. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java
  46. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java
  47. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java
  48. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java
  49. 112
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java
  50. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java
  51. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java
  52. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java
  53. 112
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java
  54. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java
  55. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java
  56. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java
  57. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java
  58. 21
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java
  59. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java
  60. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java
  61. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java
  62. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java
  63. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java
  64. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java
  65. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java
  66. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  67. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java
  68. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java
  69. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java
  70. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java
  71. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java
  72. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java
  73. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java
  74. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java
  75. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java
  76. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java
  77. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java
  78. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java
  79. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java
  80. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java
  81. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java
  82. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java
  83. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java
  84. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java
  85. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java
  86. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java
  87. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java
  88. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java
  89. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java
  90. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java
  91. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java
  92. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java
  93. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java
  94. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java
  95. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java
  96. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java
  97. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java
  98. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java
  99. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java
  100. 23
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java

7
win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@ -435,7 +435,7 @@ public interface ErrorCodeConstants {
//采购收货记录子ErrorCode
ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在");
ErrorCode PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_074_002, "采购收货记录无效,number无效");
ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号,订单行,零件号无效");
ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_NUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号,单据号,订单行,零件号无效");
//采购退货申请主ErrorCode
ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在");
//采购退货申请子ErrorCode
@ -675,8 +675,9 @@ public interface ErrorCodeConstants {
ErrorCode DELIVER_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_120_001, "发货任务子不存在");
ErrorCode DELIVER_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_120_003, "发货任务状态错误");
//发货记录ErrorCode
ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "发货记录主不存在");
ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "发货记录子不存在");
ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在");
ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在");
ErrorCode DELIVER_PSONUMBER_PSOLINE_PITEMCODE_NOT_EXISTS = new ErrorCode(1_000_121_002, "采购收货记录明细:销售订单号或销售订单行或物品代码无效");
//客户收货申请ErrorCode
ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在");
ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在");

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java

@ -98,7 +98,7 @@ public class AccountcalendarController {
@PostMapping("/senior")
@Operation(summary = "高级搜索获得账期日历分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<AccountcalendarRespVO>> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) {
public CommonResult<PageResult<AccountcalendarRespVO>> getAccountcalendarSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<AccountcalendarDO> pageResult = accountcalendarService.getAccountcalendarSenior(conditions);
PageResult<AccountcalendarRespVO> result = AccountcalendarConvert.INSTANCE.convertPage(pageResult);
for(AccountcalendarRespVO vo : result.getList()) {

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.container;
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.container.vo.*;
@ -91,7 +92,19 @@ public class ContainerDetailController {
PageResult<ContainerDetailDO> pageResult = containerDetailService.getContainerDetailPage(pageVO);
return success(ContainerDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得器具子分页")
@PreAuthorize("@ss.hasPermission('wms:container-detail:query')")
public CommonResult<PageResult<ContainerDetailRespVO>> getContainerDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ContainerDetailDO> pageResult = containerDetailService.getContainerDetailSenior(conditions);
PageResult<ContainerDetailRespVO> result = ContainerDetailConvert.INSTANCE.convertPage(pageResult);
for(ContainerDetailRespVO 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:container-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.container;
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.container.vo.*;
@ -91,7 +92,19 @@ public class ContainerMainController {
PageResult<ContainerMainDO> pageResult = containerMainService.getContainerMainPage(pageVO);
return success(ContainerMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得器具主分页")
@PreAuthorize("@ss.hasPermission('wms:container-main:query')")
public CommonResult<PageResult<ContainerMainRespVO>> getContainerMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ContainerMainDO> pageResult = containerMainService.getContainerMainSenior(conditions);
PageResult<ContainerMainRespVO> result = ContainerMainConvert.INSTANCE.convertPage(pageResult);
for(ContainerMainRespVO 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:container-main:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.container.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 器具子 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ContainerDetailRespVO extends ContainerDetailBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java

@ -3,9 +3,18 @@ package com.win.module.wms.controller.container.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 器具主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ContainerMainRespVO extends ContainerMainBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.countJob;
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.countJob.vo.*;
@ -91,7 +92,19 @@ public class CountJobDetailController {
PageResult<CountJobDetailDO> pageResult = countJobDetailService.getCountJobDetailPage(pageVO);
return success(CountJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点任务子分页")
@PreAuthorize("@ss.hasPermission('wms:count-job-detail:query')")
public CommonResult<PageResult<CountJobDetailRespVO>> getCountJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountJobDetailDO> pageResult = countJobDetailService.getCountJobDetailSenior(conditions);
PageResult<CountJobDetailRespVO> result = CountJobDetailConvert.INSTANCE.convertPage(pageResult);
for(CountJobDetailRespVO 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:count-job-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java

@ -1,9 +1,9 @@
package com.win.module.wms.controller.countJob;
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.countJob.vo.*;
import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,7 +92,19 @@ public class CountJobMainController {
PageResult<CountJobMainDO> pageResult = countJobMainService.getCountJobMainPage(pageVO);
return success(CountJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点任务主分页")
@PreAuthorize("@ss.hasPermission('wms:count-job-main:query')")
public CommonResult<PageResult<CountJobMainRespVO>> getCountJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountJobMainDO> pageResult = countJobMainService.getCountJobMainSenior(conditions);
PageResult<CountJobMainRespVO> result = CountJobMainConvert.INSTANCE.convertPage(pageResult);
for(CountJobMainRespVO 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:count-job-main:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.countPlan;
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.countPlan.vo.*;
@ -91,7 +92,19 @@ public class CountPlanDetailController {
PageResult<CountPlanDetailDO> pageResult = countPlanDetailService.getCountPlanDetailPage(pageVO);
return success(CountPlanDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点计划子分页")
@PreAuthorize("@ss.hasPermission('wms:count-plan-detail:query')")
public CommonResult<PageResult<CountPlanDetailRespVO>> getCountPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountPlanDetailDO> pageResult = countPlanDetailService.getCountPlanDetailSenior(conditions);
PageResult<CountPlanDetailRespVO> result = CountPlanDetailConvert.INSTANCE.convertPage(pageResult);
for(CountPlanDetailRespVO 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:count-plan-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.countPlan;
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.countJob.vo.CountJobMainExcelVO;
import com.win.module.wms.controller.countPlan.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CountPlanMainController {
PageResult<CountPlanMainDO> pageResult = countPlanMainService.getCountPlanMainPage(pageVO);
return success(CountPlanMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点计划主分页")
@PreAuthorize("@ss.hasPermission('wms:count-plan-main:query')")
public CommonResult<PageResult<CountPlanMainRespVO>> getCountPlanMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountPlanMainDO> pageResult = countPlanMainService.getCountPlanMainSenior(conditions);
PageResult<CountPlanMainRespVO> result = CountPlanMainConvert.INSTANCE.convertPage(pageResult);
for(CountPlanMainRespVO 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:count-plan-main:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.countRecord;
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.countPlan.vo.CountPlanMainExcelVO;
import com.win.module.wms.controller.countRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -26,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.countRecord.vo.*;
import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
import com.win.module.wms.convert.countRecord.CountRecordDetailConvert;
import com.win.module.wms.service.countRecord.CountRecordDetailService;
@ -92,7 +91,19 @@ public class CountRecordDetailController {
PageResult<CountRecordDetailDO> pageResult = countRecordDetailService.getCountRecordDetailPage(pageVO);
return success(CountRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点记录子分页")
@PreAuthorize("@ss.hasPermission('wms:count-record-detail:query')")
public CommonResult<PageResult<CountRecordDetailRespVO>> getCountRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountRecordDetailDO> pageResult = countRecordDetailService.getCountRecordDetailSenior(conditions);
PageResult<CountRecordDetailRespVO> result = CountRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(CountRecordDetailRespVO 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:count-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.countRecord;
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.countRecord.vo.*;
@ -91,7 +92,19 @@ public class CountRecordMainController {
PageResult<CountRecordMainDO> pageResult = countRecordMainService.getCountRecordMainPage(pageVO);
return success(CountRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点记录主分页")
@PreAuthorize("@ss.hasPermission('wms:count-record-main:query')")
public CommonResult<PageResult<CountRecordMainRespVO>> getCountRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountRecordMainDO> pageResult = countRecordMainService.getCountRecordMainSenior(conditions);
PageResult<CountRecordMainRespVO> result = CountRecordMainConvert.INSTANCE.convertPage(pageResult);
for(CountRecordMainRespVO 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:count-record-main:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.countRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 盘点记录子 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class CountRecordDetailRespVO extends CountRecordDetailBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.countRequest;
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.countRecord.vo.CountRecordMainExcelVO;
import com.win.module.wms.controller.countRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -93,7 +93,19 @@ public class CountRequestDetailController {
PageResult<CountRequestDetailDO> pageResult = countRequestDetailService.getCountRequestDetailPage(pageVO);
return success(CountRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点申请子分页")
@PreAuthorize("@ss.hasPermission('wms:count-request-detail:query')")
public CommonResult<PageResult<CountRequestDetailRespVO>> getCountRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountRequestDetailDO> pageResult = countRequestDetailService.getCountRequestDetailSenior(conditions);
PageResult<CountRequestDetailRespVO> result = CountRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(CountRequestDetailRespVO 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:count-request-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.countRequest;
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.countRequest.vo.*;
@ -92,7 +93,19 @@ public class CountRequestMainController {
PageResult<CountRequestMainDO> pageResult = countRequestMainService.getCountRequestMainPage(pageVO);
return success(CountRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点申请主分页")
@PreAuthorize("@ss.hasPermission('wms:count-request-main:query')")
public CommonResult<PageResult<CountRequestMainRespVO>> getCountRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountRequestMainDO> pageResult = countRequestMainService.getCountRequestMainSenior(conditions);
PageResult<CountRequestMainRespVO> result = CountRequestMainConvert.INSTANCE.convertPage(pageResult);
for(CountRequestMainRespVO 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:count-request-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.countadjustRecord;
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.countadjustRecord.vo.*;
@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.countadjustRecord.vo.*;
import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert;
import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService;
@ -91,7 +91,19 @@ public class CountadjustRecordDetailController {
PageResult<CountadjustRecordDetailDO> pageResult = countadjustRecordDetailService.getCountadjustRecordDetailPage(pageVO);
return success(CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整记录子分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
public CommonResult<PageResult<CountadjustRecordDetailRespVO>> getCountadjustRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountadjustRecordDetailDO> pageResult = countadjustRecordDetailService.getCountadjustRecordDetailSenior(conditions);
PageResult<CountadjustRecordDetailRespVO> result = CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(CountadjustRecordDetailRespVO 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:countadjust-record-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.countadjustRecord;
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.container.vo.ContainerMainExcelVO;
import com.win.module.wms.controller.countadjustRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CountadjustRecordMainController {
PageResult<CountadjustRecordMainDO> pageResult = countadjustRecordMainService.getCountadjustRecordMainPage(pageVO);
return success(CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整记录主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
public CommonResult<PageResult<CountadjustRecordMainRespVO>> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountadjustRecordMainDO> pageResult = countadjustRecordMainService.getCountadjustRecordMainSenior(conditions);
PageResult<CountadjustRecordMainRespVO> result = CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult);
for(CountadjustRecordMainRespVO 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:countadjust-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.countadjustRequest;
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.countadjustRecord.vo.CountadjustRecordMainExcelVO;
import com.win.module.wms.controller.countadjustRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CountadjustRequestMainController {
PageResult<CountadjustRequestMainDO> pageResult = countadjustRequestMainService.getCountadjustRequestMainPage(pageVO);
return success(CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得盘点调整申请主分页")
@PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
public CommonResult<PageResult<CountadjustRequestMainRespVO>> getCountadjustRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CountadjustRequestMainDO> pageResult = countadjustRequestMainService.getCountadjustRequestMainSenior(conditions);
PageResult<CountadjustRequestMainRespVO> result = CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult);
for(CountadjustRequestMainRespVO 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:countadjust-request-main:export')")

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java

@ -1,13 +1,13 @@
package com.win.module.wms.controller.currencyexchange;
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.countRequest.vo.CountRequestMainExcelVO;
import com.win.module.wms.controller.currencyexchange.vo.*;
import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert;
import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO;
@ -94,7 +94,19 @@ public class CurrencyexchangeController {
PageResult<CurrencyexchangeDO> pageResult = currencyexchangeService.getCurrencyexchangePage(pageVO);
return success(CurrencyexchangeConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得货币转换分页")
@PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')")
public CommonResult<PageResult<CurrencyexchangeRespVO>> getCurrencyexchangeSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CurrencyexchangeDO> pageResult = currencyexchangeService.getCurrencyexchangeSenior(conditions);
PageResult<CurrencyexchangeRespVO> result = CurrencyexchangeConvert.INSTANCE.convertPage(pageResult);
for(CurrencyexchangeRespVO 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:currencyexchange:export')")
@ -108,8 +120,12 @@ public class CurrencyexchangeController {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas);
} Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(0, currency);
String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(3, isRequired);
ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入货币转换模板")

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java

@ -1,13 +1,13 @@
package com.win.module.wms.controller.customer;
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.currencyexchange.vo.CurrencyexchangeExcelVO;
import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
import com.win.module.wms.controller.customer.vo.*;
import com.win.module.wms.convert.customer.CustomerConvert;
@ -94,7 +94,19 @@ public class CustomerController {
PageResult<CustomerDO> pageResult = customerService.getCustomerPage(pageVO);
return success(CustomerConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户分页")
@PreAuthorize("@ss.hasPermission('wms:customer:query')")
public CommonResult<PageResult<CustomerRespVO>> getCustomerSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerDO> pageResult = customerService.getCustomerSenior(conditions);
PageResult<CustomerRespVO> result = CustomerConvert.INSTANCE.convertPage(pageResult);
for(CustomerRespVO 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:customer:export')")
@ -109,7 +121,14 @@ public class CustomerController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(11, currency);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE);
mapDropDown.put(13, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(14, available);
ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入客户模板")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java

@ -1,14 +1,13 @@
package com.win.module.wms.controller.customerdock;
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.customer.vo.CustomerExcelVO;
import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
import com.win.module.wms.controller.customerdock.vo.*;
import com.win.module.wms.convert.customerdock.CustomerdockConvert;
import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO;
@ -95,7 +94,19 @@ public class CustomerdockController {
PageResult<CustomerdockDO> pageResult = customerdockService.getCustomerdockPage(pageVO);
return success(CustomerdockConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户月台分页")
@PreAuthorize("@ss.hasPermission('wms:customerdock:query')")
public CommonResult<PageResult<CustomerdockRespVO>> getCustomerdockSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerdockDO> pageResult = customerdockService.getCustomerdockSenior(conditions);
PageResult<CustomerdockRespVO> result = CustomerdockConvert.INSTANCE.convertPage(pageResult);
for(CustomerdockRespVO 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:customerdock:export')")

27
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java

@ -1,13 +1,13 @@
package com.win.module.wms.controller.customeritem;
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.customerdock.vo.CustomerdockExcelVO;
import com.win.module.wms.controller.customeritem.vo.*;
import com.win.module.wms.convert.customeritem.CustomeritemConvert;
import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO;
@ -94,7 +94,19 @@ public class CustomeritemController {
PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemPage(pageVO);
return success(CustomeritemConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户物品分页")
@PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
public CommonResult<PageResult<CustomeritemRespVO>> getCustomeritemSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemSenior(conditions);
PageResult<CustomeritemRespVO> result = CustomeritemConvert.INSTANCE.convertPage(pageResult);
for(CustomeritemRespVO 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:customeritem:export')")
@ -109,7 +121,16 @@ public class CustomeritemController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(3, cusotmerUom);
String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(5, packUnit);
String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(7, altPackUnit);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(10, available);
ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreceiptRecord;
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.customeritem.vo.CustomeritemExcelVO;
import com.win.module.wms.controller.customerreceiptRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CustomerreceiptRecordDetailController {
PageResult<CustomerreceiptRecordDetailDO> pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO);
return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得账期日历分页")
@PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')")
public CommonResult<PageResult<CustomerreceiptRecordDetailRespVO>> getCustomerreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreceiptRecordDetailDO> pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailSenior(conditions);
PageResult<CustomerreceiptRecordDetailRespVO> result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomerreceiptRecordDetailRespVO 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:customerreceipt-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.customerreceiptRecord;
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.*;
@ -90,7 +91,19 @@ public class CustomerreceiptRecordMainController {
PageResult<CustomerreceiptRecordMainDO> pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO);
return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户收货记录主分页")
@PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')")
public CommonResult<PageResult<CustomerreceiptRecordMainRespVO>> getCustomerreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreceiptRecordMainDO> pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainSenior(conditions);
PageResult<CustomerreceiptRecordMainRespVO> result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
for(CustomerreceiptRecordMainRespVO 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:customerreceipt-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreceiptRequest;
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.CustomerreceiptRecordDetailExcelVO;
import com.win.module.wms.controller.customerreceiptRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CustomerreceiptRequestDetailController {
PageResult<CustomerreceiptRequestDetailDO> pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO);
return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户收货申请子分页")
@PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')")
public CommonResult<PageResult<CustomerreceiptRequestDetailRespVO>> getCustomerreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreceiptRequestDetailDO> pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailSenior(conditions);
PageResult<CustomerreceiptRequestDetailRespVO> result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomerreceiptRequestDetailRespVO 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:customerreceipt-request-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.customerreceiptRequest;
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.*;
@ -91,7 +92,19 @@ public class CustomerreceiptRequestMainController {
PageResult<CustomerreceiptRequestMainDO> pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO);
return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户收货申请主分页")
@PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')")
public CommonResult<PageResult<CustomerreceiptRequestMainRespVO>> getCustomerreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreceiptRequestMainDO> pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainSenior(conditions);
PageResult<CustomerreceiptRequestMainRespVO> result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
for(CustomerreceiptRequestMainRespVO 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:customerreceipt-request-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreturnJob;
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.CustomerreceiptRequestMainExcelVO;
import com.win.module.wms.controller.customerreturnJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CustomerreturnJobDetailController {
PageResult<CustomerreturnJobDetailDO> pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO);
return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货任务子分页")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')")
public CommonResult<PageResult<CustomerreturnJobDetailRespVO>> getCustomerreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnJobDetailDO> pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailSenior(conditions);
PageResult<CustomerreturnJobDetailRespVO> result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnJobDetailRespVO 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:customerreturn-job-detail:export')")

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.customerreturnJob;
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.*;
@ -92,6 +93,19 @@ public class CustomerreturnJobMainController {
return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货任务主分页")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')")
public CommonResult<PageResult<CustomerreturnJobMainRespVO>> getCustomerreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnJobMainDO> pageResult = customerreturnJobMainService.getCustomerreturnJobMainSenior(conditions);
PageResult<CustomerreturnJobMainRespVO> result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnJobMainRespVO 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:customerreturn-job-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreturnRecord;
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.CustomerreturnJobMainExcelVO;
import com.win.module.wms.controller.customerreturnRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CustomerreturnRecordDetailController {
PageResult<CustomerreturnRecordDetailDO> pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO);
return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货记录子分页")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')")
public CommonResult<PageResult<CustomerreturnRecordDetailRespVO>> getCustomerreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnRecordDetailDO> pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailSenior(conditions);
PageResult<CustomerreturnRecordDetailRespVO> result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnRecordDetailRespVO 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:customerreturn-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.customerreturnRecord;
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.*;
@ -91,7 +92,19 @@ public class CustomerreturnRecordMainController {
PageResult<CustomerreturnRecordMainDO> pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO);
return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货记录主分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<CustomerreturnRecordMainRespVO>> getCustomerreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnRecordMainDO> pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainSenior(conditions);
PageResult<CustomerreturnRecordMainRespVO> result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnRecordMainRespVO 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:customerreturn-record-main:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.customerreturnRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 客户退货记录主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class CustomerreturnRecordMainRespVO extends CustomerreturnRecordMainBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreturnRequest;
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.CustomerreturnRecordMainExcelVO;
import com.win.module.wms.controller.customerreturnRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -92,7 +92,19 @@ public class CustomerreturnRequestDetailController {
PageResult<CustomerreturnRequestDetailDO> pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO);
return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货申请子分页")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')")
public CommonResult<PageResult<CustomerreturnRequestDetailRespVO>> getCustomerreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnRequestDetailDO> pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailSenior(conditions);
PageResult<CustomerreturnRequestDetailRespVO> result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnRequestDetailRespVO 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:customerreturn-request-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.customerreturnRequest;
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 org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class CustomerreturnRequestMainController {
PageResult<CustomerreturnRequestMainDO> pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO);
return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户退货申请主分页")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')")
public CommonResult<PageResult<CustomerreturnRequestMainRespVO>> getCustomerreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomerreturnRequestMainDO> pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainSenior(conditions);
PageResult<CustomerreturnRequestMainRespVO> result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult);
for(CustomerreturnRequestMainRespVO 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:customerreturn-request-main:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java

@ -1,9 +1,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.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO;
import com.win.module.wms.controller.customersettleRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,7 +91,19 @@ public class CustomersettleRecordDetailController {
PageResult<CustomersettleRecordDetailDO> pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO);
return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户结算记录子分页")
@PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')")
public CommonResult<PageResult<CustomersettleRecordDetailRespVO>> getCustomersettleRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomersettleRecordDetailDO> pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailSenior(conditions);
PageResult<CustomersettleRecordDetailRespVO> result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomersettleRecordDetailRespVO 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:customersettle-record-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java

@ -1,8 +1,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.customersettleRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,19 @@ public class CustomersettleRecordMainController {
PageResult<CustomersettleRecordMainDO> pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO);
return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户结算记录主分页")
@PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')")
public CommonResult<PageResult<CustomersettleRecordMainRespVO>> getCustomersettleRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomersettleRecordMainDO> pageResult = customersettleRecordMainService.getCustomersettleRecordMainSenior(conditions);
PageResult<CustomersettleRecordMainRespVO> result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult);
for(CustomersettleRecordMainRespVO 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:customersettle-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java

@ -1,8 +1,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.customersettleRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class CustomersettleRequestDetailController {
PageResult<CustomersettleRequestDetailDO> pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO);
return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户结算申请子分页")
@PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')")
public CommonResult<PageResult<CustomersettleRequestDetailRespVO>> getCustomersettleRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomersettleRequestDetailDO> pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailSenior(conditions);
PageResult<CustomersettleRequestDetailRespVO> result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(CustomersettleRequestDetailRespVO 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:customersettle-request-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java

@ -1,8 +1,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.customersettleRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,19 @@ public class CustomersettleRequestMainController {
PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO);
return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得客户结算申请主分页")
@PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')")
public CommonResult<PageResult<CustomersettleRequestMainRespVO>> getCustomersettleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions);
PageResult<CustomersettleRequestMainRespVO> result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult);
for(CustomersettleRequestMainRespVO 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:customersettle-request-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java

@ -1,8 +1,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.deliverJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class DeliverJobDetailController {
PageResult<DeliverJobDetailDO> pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO);
return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货任务子分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')")
public CommonResult<PageResult<DeliverJobDetailRespVO>> getDeliverJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverJobDetailDO> pageResult = deliverJobDetailService.getDeliverJobDetailSenior(conditions);
PageResult<DeliverJobDetailRespVO> result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult);
for(DeliverJobDetailRespVO 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:deliver-job-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java

@ -1,8 +1,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.deliverJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class DeliverJobMainController {
PageResult<DeliverJobMainDO> pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO);
return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货任务主分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
public CommonResult<PageResult<DeliverJobMainRespVO>> getDeliverJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverJobMainDO> pageResult = deliverJobMainService.getDeliverJobMainSenior(conditions);
PageResult<DeliverJobMainRespVO> result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult);
for(DeliverJobMainRespVO 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:deliver-job-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.deliverPlan;
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.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class DeliverPlanDetailController {
PageResult<DeliverPlanDetailDO> pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO);
return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货计划子分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')")
public CommonResult<PageResult<DeliverPlanDetailRespVO>> getDeliverPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverPlanDetailDO> pageResult = deliverPlanDetailService.getDeliverPlanDetailSenior(conditions);
PageResult<DeliverPlanDetailRespVO> result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult);
for(DeliverPlanDetailRespVO 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:deliver-plan-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.deliverPlan;
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.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,19 @@ public class DeliverPlanMainController {
PageResult<DeliverPlanMainDO> pageResult = deliverPlanMainService.getDeliverPlanMainPage(pageVO);
return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货计划主分页")
@PreAuthorize("@ss.hasPermission('wms:wms:deliver-plan-main:query')")
public CommonResult<PageResult<DeliverPlanMainRespVO>> getDeliverPlanMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverPlanMainDO> pageResult = deliverPlanMainService.getDeliverPlanMainSenior(conditions);
PageResult<DeliverPlanMainRespVO> result = DeliverPlanMainConvert.INSTANCE.convertPage(pageResult);
for(DeliverPlanMainRespVO 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:deliver-plan-main:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java

@ -1,5 +1,6 @@
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.deliverRecord.vo.*;
@ -24,8 +25,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.deliverRecord.vo.*;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
import com.win.module.wms.convert.deliverRecord.DeliverRecordDetailConvert;
import com.win.module.wms.service.deliverRecord.DeliverRecordDetailService;
@ -91,6 +90,20 @@ public class DeliverRecordDetailController {
return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货记录子分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')")
public CommonResult<PageResult<DeliverRecordDetailRespVO>> getDeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverRecordDetailDO> pageResult = deliverRecordDetailService.getDeliverRecordDetailSenior(conditions);
PageResult<DeliverRecordDetailRespVO> result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(DeliverRecordDetailRespVO 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:deliver-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java

@ -1,5 +1,6 @@
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.deliverRecord.vo.*;
@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.deliverRecord.vo.*;
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert;
import com.win.module.wms.service.deliverRecord.DeliverRecordMainService;
@ -92,6 +92,19 @@ public class DeliverRecordMainController {
return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货记录主分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')")
public CommonResult<PageResult<DeliverRecordMainRespVO>> getDeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverRecordMainDO> pageResult = deliverRecordMainService.getDeliverRecordMainSenior(conditions);
PageResult<DeliverRecordMainRespVO> result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult);
for(DeliverRecordMainRespVO 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:deliver-record-main:export')")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java

@ -116,4 +116,6 @@ public class DeliverRecordDetailBaseVO {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "是否可用")
private String available;
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java

@ -1,8 +1,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.deliverRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class DeliverRequestDetailController {
return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货申请子分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')")
public CommonResult<PageResult<DeliverRequestDetailRespVO>> getDeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverRequestDetailDO> pageResult = deliverRequestDetailService.getDeliverRequestDetailSenior(conditions);
PageResult<DeliverRequestDetailRespVO> result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(DeliverRequestDetailRespVO 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:deliver-request-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java

@ -1,8 +1,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.deliverRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class DeliverRequestMainController {
return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发货申请主分页")
@PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')")
public CommonResult<PageResult<DeliverRequestMainRespVO>> getDeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DeliverRequestMainDO> pageResult = deliverRequestMainService.getDeliverRequestMainSenior(conditions);
PageResult<DeliverRequestMainRespVO> result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult);
for(DeliverRequestMainRespVO 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:deliver-request-main:export')")

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.demandforecasting;
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.demandforecasting.vo.*;
@ -92,6 +93,19 @@ public class DemandforecastingDetailController {
return success(DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得要货预测子分页")
@PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:query')")
public CommonResult<PageResult<DemandforecastingDetailRespVO>> getDemandforecastingDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DemandforecastingDetailDO> pageResult = demandforecastingDetailService.getDemandforecastingDetailSenior(conditions);
PageResult<DemandforecastingDetailRespVO> result = DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult);
for(DemandforecastingDetailRespVO 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:demandforecasting-detail:export')")

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.demandforecasting;
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.demandforecasting.vo.*;
@ -91,6 +92,19 @@ public class DemandforecastingMainController {
return success(DemandforecastingMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得要货预测主分页")
@PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:query')")
public CommonResult<PageResult<DemandforecastingMainRespVO>> getDemandforecastingMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DemandforecastingMainDO> pageResult = demandforecastingMainService.getDemandforecastingMainSenior(conditions);
PageResult<DemandforecastingMainRespVO> result = DemandforecastingMainConvert.INSTANCE.convertPage(pageResult);
for(DemandforecastingMainRespVO 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:demandforecasting-main:export')")

112
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java

@ -1,112 +0,0 @@
package com.win.module.wms.controller.dismantleRecord;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.dismantleRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.dismantleRecord.vo.*;
import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO;
import com.win.module.wms.convert.dismantleRecord.DismantleRecordDetailbConvert;
import com.win.module.wms.service.dismantleRecord.DismantleRecordDetailbService;
@Tag(name = "管理后台 - 制品拆解记录子")
@RestController
@RequestMapping("/wms/dismantle-record-detailb")
@Validated
public class DismantleRecordDetailbController {
@Resource
private DismantleRecordDetailbService dismantleRecordDetailbService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建制品拆解记录子")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:create')")
public CommonResult<Long> createDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbCreateReqVO createReqVO) {
return success(dismantleRecordDetailbService.createDismantleRecordDetailb(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新制品拆解记录子")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:update')")
public CommonResult<Boolean> updateDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbUpdateReqVO updateReqVO) {
dismantleRecordDetailbService.updateDismantleRecordDetailb(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除制品拆解记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:delete')")
public CommonResult<Boolean> deleteDismantleRecordDetailb(@RequestParam("id") Long id) {
dismantleRecordDetailbService.deleteDismantleRecordDetailb(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得制品拆解记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
public CommonResult<DismantleRecordDetailbRespVO> getDismantleRecordDetailb(@RequestParam("id") Long id) {
DismantleRecordDetailbDO dismantleRecordDetailb = dismantleRecordDetailbService.getDismantleRecordDetailb(id);
return success(DismantleRecordDetailbConvert.INSTANCE.convert(dismantleRecordDetailb));
}
@GetMapping("/list")
@Operation(summary = "获得制品拆解记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
public CommonResult<List<DismantleRecordDetailbRespVO>> getDismantleRecordDetailbList(@RequestParam("ids") Collection<Long> ids) {
List<DismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(ids);
return success(DismantleRecordDetailbConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得制品拆解记录子分页")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
public CommonResult<PageResult<DismantleRecordDetailbRespVO>> getDismantleRecordDetailbPage(@Valid DismantleRecordDetailbPageReqVO pageVO) {
PageResult<DismantleRecordDetailbDO> pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbPage(pageVO);
return success(DismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出制品拆解记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:export')")
@OperateLog(type = EXPORT)
public void exportDismantleRecordDetailbExcel(@Valid DismantleRecordDetailbExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<DismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO);
// 导出 Excel
List<DismantleRecordDetailbExcelVO> datas = DismantleRecordDetailbConvert.INSTANCE.convertList02(list);
for(DismantleRecordDetailbExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "制品拆解记录子.xls", "数据", DismantleRecordDetailbExcelVO.class, datas);
}
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRecord.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "管理后台 - 制品拆解记录子创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRecordDetailbCreateReqVO extends DismantleRecordDetailbBaseVO {
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@Schema(description = "管理后台 - 制品拆解记录子 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRecordDetailbRespVO extends DismantleRecordDetailbBaseVO {
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@Schema(description = "管理后台 - 制品拆解记录子更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRecordDetailbUpdateReqVO extends DismantleRecordDetailbBaseVO {
}

112
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java

@ -1,112 +0,0 @@
package com.win.module.wms.controller.dismantleRequest;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.dismantleRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.dismantleRequest.vo.*;
import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO;
import com.win.module.wms.convert.dismantleRequest.DismantleRequestDetailbConvert;
import com.win.module.wms.service.dismantleRequest.DismantleRequestDetailbService;
@Tag(name = "管理后台 - 制品拆解申请子")
@RestController
@RequestMapping("/wms/dismantle-request-detailb")
@Validated
public class DismantleRequestDetailbController {
@Resource
private DismantleRequestDetailbService dismantleRequestDetailbService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建制品拆解申请子")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:create')")
public CommonResult<Long> createDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbCreateReqVO createReqVO) {
return success(dismantleRequestDetailbService.createDismantleRequestDetailb(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新制品拆解申请子")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:update')")
public CommonResult<Boolean> updateDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbUpdateReqVO updateReqVO) {
dismantleRequestDetailbService.updateDismantleRequestDetailb(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除制品拆解申请子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:delete')")
public CommonResult<Boolean> deleteDismantleRequestDetailb(@RequestParam("id") Long id) {
dismantleRequestDetailbService.deleteDismantleRequestDetailb(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得制品拆解申请子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
public CommonResult<DismantleRequestDetailbRespVO> getDismantleRequestDetailb(@RequestParam("id") Long id) {
DismantleRequestDetailbDO dismantleRequestDetailb = dismantleRequestDetailbService.getDismantleRequestDetailb(id);
return success(DismantleRequestDetailbConvert.INSTANCE.convert(dismantleRequestDetailb));
}
@GetMapping("/list")
@Operation(summary = "获得制品拆解申请子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
public CommonResult<List<DismantleRequestDetailbRespVO>> getDismantleRequestDetailbList(@RequestParam("ids") Collection<Long> ids) {
List<DismantleRequestDetailbDO> list = dismantleRequestDetailbService.getDismantleRequestDetailbList(ids);
return success(DismantleRequestDetailbConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得制品拆解申请子分页")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
public CommonResult<PageResult<DismantleRequestDetailbRespVO>> getDismantleRequestDetailbPage(@Valid DismantleRequestDetailbPageReqVO pageVO) {
PageResult<DismantleRequestDetailbDO> pageResult = dismantleRequestDetailbService.getDismantleRequestDetailbPage(pageVO);
return success(DismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出制品拆解申请子 Excel")
@PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:export')")
@OperateLog(type = EXPORT)
public void exportDismantleRequestDetailbExcel(@Valid DismantleRequestDetailbExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<DismantleRequestDetailbDO> list = dismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO);
// 导出 Excel
List<DismantleRequestDetailbExcelVO> datas = DismantleRequestDetailbConvert.INSTANCE.convertList02(list);
for(DismantleRequestDetailbExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "制品拆解申请子.xls", "数据", DismantleRequestDetailbExcelVO.class, datas);
}
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRequest.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(description = "管理后台 - 制品拆解申请子创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRequestDetailbCreateReqVO extends DismantleRequestDetailbBaseVO {
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@Schema(description = "管理后台 - 制品拆解申请子 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRequestDetailbRespVO extends DismantleRequestDetailbBaseVO {
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java

@ -1,12 +0,0 @@
package com.win.module.wms.controller.dismantleRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@Schema(description = "管理后台 - 制品拆解申请子更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DismantleRequestDetailbUpdateReqVO extends DismantleRequestDetailbBaseVO {
}

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java

@ -1,6 +1,6 @@
package com.win.module.wms.controller.dock;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@ -29,10 +29,8 @@ import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
@Tag(name = "管理后台 - 月台")
@RestController
@ -98,6 +96,19 @@ public class DockController {
return success(DockConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得月台分页")
@PreAuthorize("@ss.hasPermission('wms:dock:query')")
public CommonResult<PageResult<DockRespVO>> getDockSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DockDO> pageResult = dockService.getDockSenior(conditions);
PageResult<DockRespVO> result = DockConvert.INSTANCE.convertPage(pageResult);
for(DockRespVO 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:dock:export')")
@ -112,7 +123,12 @@ public class DockController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE);
mapDropDown.put(5, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(10, available);;
ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")

21
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java

@ -1,6 +1,8 @@
package com.win.module.wms.controller.documentSwitch;
import com.win.module.wms.controller.documentSwitch.vo.*;
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 org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -37,6 +39,9 @@ public class SwitchController {
@Resource
private SwitchService switchService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建单据开关")
@PreAuthorize("@ss.hasPermission('wms:switch:create')")
@ -79,6 +84,20 @@ public class SwitchController {
return success(SwitchConvert.INSTANCE.convertList(list));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得单据开关分页")
@PreAuthorize("@ss.hasPermission('wms:switch:query')")
public CommonResult<PageResult<SwitchRespVO>> getSwitchSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<SwitchDO> pageResult = switchService.getSwitchSenior(conditions);
PageResult<SwitchRespVO> result = SwitchConvert.INSTANCE.convertPage(pageResult);
for(SwitchRespVO vo : result.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return success(result);
}
@GetMapping("/page")
@Operation(summary = "获得单据开关分页")
@PreAuthorize("@ss.hasPermission('wms:switch:query')")

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java

@ -3,6 +3,8 @@ package com.win.module.wms.controller.documentSwitch.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 SwitchRespVO extends SwitchBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17760")
private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.documentsetting;
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;
@ -94,6 +95,20 @@ public class DocumentsettingController {
return success(DocumentsettingConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得单据设置分页")
@PreAuthorize("@ss.hasPermission('wms:documentsetting:query')")
public CommonResult<PageResult<DocumentsettingRespVO>> getDocumentsettingSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<DocumentsettingDO> pageResult = documentsettingService.getDocumentsettingSenior(conditions);
PageResult<DocumentsettingRespVO> result = DocumentsettingConvert.INSTANCE.convertPage(pageResult);
for(DocumentsettingRespVO 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:documentsetting:export')")
@ -108,7 +123,12 @@ public class DocumentsettingController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE);
mapDropDown.put(3, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(10, available);;
ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入单据设置模板")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.expectin;
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.expectin.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class ExpectinController {
return success(ExpectinConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得预计入库存分页")
@PreAuthorize("@ss.hasPermission('wms:expectin:query')")
public CommonResult<PageResult<ExpectinRespVO>> getExpectinSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ExpectinDO> pageResult = expectinService.getExpectinSenior(conditions);
PageResult<ExpectinRespVO> result = ExpectinConvert.INSTANCE.convertPage(pageResult);
for(ExpectinRespVO 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:expectin:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectin.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 预计入库存 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ExpectinRespVO extends ExpectinBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.expectout;
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.expectout.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class ExpectoutController {
return success(ExpectoutConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得账期日历分页")
@PreAuthorize("@ss.hasPermission('wms:expectout:query')")
public CommonResult<PageResult<ExpectoutRespVO>> getExpectoutSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ExpectoutDO> pageResult = expectoutService.getExpectoutSenior(conditions);
PageResult<ExpectoutRespVO> result = ExpectoutConvert.INSTANCE.convertPage(pageResult);
for(ExpectoutRespVO 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:expectout:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectout.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 预计出库存 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ExpectoutRespVO extends ExpectoutBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inspectJob;
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.inspectJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class InspectJobDetailController {
return success(InspectJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验任务子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
public CommonResult<PageResult<InspectJobDetailRespVO>> getInspectJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectJobDetailDO> pageResult = inspectJobDetailService.getInspectJobDetailSenior(conditions);
PageResult<InspectJobDetailRespVO> result = InspectJobDetailConvert.INSTANCE.convertPage(pageResult);
for(InspectJobDetailRespVO 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:inspect-job-detail:export')")

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.inspectJob;
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.inspectJob.vo.*;
@ -91,6 +92,19 @@ public class InspectJobMainController {
return success(InspectJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验任务主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<PageResult<InspectJobMainRespVO>> getInspectJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectJobMainDO> pageResult = inspectJobMainService.getInspectJobMainSenior(conditions);
PageResult<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertPage(pageResult);
for(InspectJobMainRespVO 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:inspect-job-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inspectRecord;
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.inspectRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class InspectRecordDetailController {
return success(InspectRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验记录子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
public CommonResult<PageResult<InspectRecordDetailRespVO>> getInspectRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectRecordDetailDO> pageResult = inspectRecordDetailService.getInspectRecordDetailSenior(conditions);
PageResult<InspectRecordDetailRespVO> result = InspectRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(InspectRecordDetailRespVO 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:inspect-record-detail:export')")

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.inspectRecord;
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.inspectRecord.vo.*;
@ -91,6 +92,19 @@ public class InspectRecordMainController {
return success(InspectRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
public CommonResult<PageResult<InspectRecordMainRespVO>> getInspectRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectRecordMainDO> pageResult = inspectRecordMainService.getInspectRecordMainSenior(conditions);
PageResult<InspectRecordMainRespVO> result = InspectRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InspectRecordMainRespVO 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:inspect-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inspectRequest;
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.inspectRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class InspectRequestDetailController {
return success(InspectRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验申请子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')")
public CommonResult<PageResult<InspectRequestDetailRespVO>> getInspectRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectRequestDetailDO> pageResult = inspectRequestDetailService.getInspectRequestDetailSenior(conditions);
PageResult<InspectRequestDetailRespVO> result = InspectRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(InspectRequestDetailRespVO 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:inspect-request-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.inspectRequest;
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.inspectRequest.vo.*;
@ -89,7 +90,19 @@ public class InspectRequestMainController {
PageResult<InspectRequestMainDO> pageResult = inspectRequestMainService.getInspectRequestMainPage(pageVO);
return success(InspectRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得检验申请主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')")
public CommonResult<PageResult<InspectRequestMainRespVO>> getInspectRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InspectRequestMainDO> pageResult = inspectRequestMainService.getInspectRequestMainSenior(conditions);
PageResult<InspectRequestMainRespVO> result = InspectRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InspectRequestMainRespVO 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:inspect-request-main:export')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java

@ -3,10 +3,18 @@ package com.win.module.wms.controller.inspectRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 检验申请子 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class InspectRequestDetailRespVO extends InspectRequestDetailBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorychangeRecord;
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.inventorychangeRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class InventorychangeRecordDetailController {
return success(InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存修改记录子分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<InventorychangeRecordDetailRespVO>> getInventorychangeRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorychangeRecordDetailDO> pageResult = inventorychangeRecordDetailService.getInventorychangeRecordDetailSenior(conditions);
PageResult<InventorychangeRecordDetailRespVO> result = InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorychangeRecordDetailRespVO 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:inventorychange-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorychangeRecord;
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.inventorychangeRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class InventorychangeRecordMainController {
return success(InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存修改记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:query')")
public CommonResult<PageResult<InventorychangeRecordMainRespVO>> getInventorychangeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorychangeRecordMainDO> pageResult = inventorychangeRecordMainService.getInventorychangeRecordMainSenior(conditions);
PageResult<InventorychangeRecordMainRespVO> result = InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InventorychangeRecordMainRespVO 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:inventorychange-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorychangeRequest;
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.inventorychangeRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class InventorychangeRequestDetailController {
PageResult<InventorychangeRequestDetailDO> pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailPage(pageVO);
return success(InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存修改申请子分页")
@PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:query')")
public CommonResult<PageResult<InventorychangeRequestDetailRespVO>> getInventorychangeRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorychangeRequestDetailDO> pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailSenior(conditions);
PageResult<InventorychangeRequestDetailRespVO> result = InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorychangeRequestDetailRespVO 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:inventorychange-request-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorychangeRequest;
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.inventorychangeRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class InventorychangeRequestMainController {
PageResult<InventorychangeRequestMainDO> pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainPage(pageVO);
return success(InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存修改申请主分页")
@PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:query')")
public CommonResult<PageResult<InventorychangeRequestMainRespVO>> getInventorychangeRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorychangeRequestMainDO> pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainSenior(conditions);
PageResult<InventorychangeRequestMainRespVO> result = InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InventorychangeRequestMainRespVO 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:inventorychange-request-main:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventoryinitRecord;
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.inventoryinitRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class InventoryinitRecordDetailController {
return success(InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存初始化记录子分页")
@PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:query')")
public CommonResult<PageResult<InventoryinitRecordDetailRespVO>> getInventoryinitRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventoryinitRecordDetailDO> pageResult = inventoryinitRecordDetailService.getInventoryinitRecordDetailSenior(conditions);
PageResult<InventoryinitRecordDetailRespVO> result = InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(InventoryinitRecordDetailRespVO 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:inventoryinit-record-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventoryinitRecord;
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.inventoryinitRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class InventoryinitRecordMainController {
PageResult<InventoryinitRecordMainDO> pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainPage(pageVO);
return success(InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存初始化记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:query')")
public CommonResult<PageResult<InventoryinitRecordMainRespVO>> getInventoryinitRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventoryinitRecordMainDO> pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainSenior(conditions);
PageResult<InventoryinitRecordMainRespVO> result = InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InventoryinitRecordMainRespVO 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:inventoryinit-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventoryinitRequest;
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.inventoryinitRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class InventoryinitRequestDetailController {
return success(InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存初始化申请子分页")
@PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:query')")
public CommonResult<PageResult<InventoryinitRequestDetailRespVO>> getInventoryinitRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventoryinitRequestDetailDO> pageResult = inventoryinitRequestDetailService.getInventoryinitRequestDetailSenior(conditions);
PageResult<InventoryinitRequestDetailRespVO> result = InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(InventoryinitRequestDetailRespVO 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:inventoryinit-request-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventoryinitRequest;
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.inventoryinitRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,19 @@ public class InventoryinitRequestMainController {
PageResult<InventoryinitRequestMainDO> pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainPage(pageVO);
return success(InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存初始化申请主分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<InventoryinitRequestMainRespVO>> getInventoryinitRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventoryinitRequestMainDO> pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainSenior(conditions);
PageResult<InventoryinitRequestMainRespVO> result = InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InventoryinitRequestMainRespVO 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:inventoryinit-request-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveJob;
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.inventorymoveJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,19 @@ public class InventorymoveJobDetailController {
PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO);
return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移任务子分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')")
public CommonResult<PageResult<InventorymoveJobDetailRespVO>> getInventorymoveJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailSenior(conditions);
PageResult<InventorymoveJobDetailRespVO> result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveJobDetailRespVO 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:inventorymove-job-detail:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveJob;
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.inventorymoveJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class InventorymoveJobMainController {
return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移任务主分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')")
public CommonResult<PageResult<InventorymoveJobMainRespVO>> getInventorymoveJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveJobMainDO> pageResult = inventorymoveJobMainService.getInventorymoveJobMainSenior(conditions);
PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveJobMainRespVO 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:inventorymove-job-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveRecord;
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.inventorymoveRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -94,6 +94,20 @@ public class InventorymoveRecordDetailController {
return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移记录子分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')")
public CommonResult<PageResult<InventorymoveRecordDetailRespVO>> getInventorymoveRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveRecordDetailDO> pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailSenior(conditions);
PageResult<InventorymoveRecordDetailRespVO> result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRecordDetailRespVO 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:inventorymove-record-detail:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveRecord;
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.inventorymoveRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,20 @@ public class InventorymoveRecordMainController {
PageResult<InventorymoveRecordMainDO> pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO);
return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:query')")
public CommonResult<PageResult<InventorymoveRecordMainRespVO>> getInventorymoveRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveRecordMainDO> pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainSenior(conditions);
PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRecordMainRespVO 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:inventorymove-record-main:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveRequest;
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.inventorymoveRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,20 @@ public class InventorymoveRequestDetailController {
PageResult<InventorymoveRequestDetailDO> pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailPage(pageVO);
return success(InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移申请子分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:query')")
public CommonResult<PageResult<InventorymoveRequestDetailRespVO>> getInventorymoveRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveRequestDetailDO> pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailSenior(conditions);
PageResult<InventorymoveRequestDetailRespVO> result = InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRequestDetailRespVO 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:inventorymove-request-detail:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.inventorymoveRequest;
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.inventorymoveRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,20 @@ public class InventorymoveRequestMainController {
PageResult<InventorymoveRequestMainDO> pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainPage(pageVO);
return success(InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移申请主分页")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:query')")
public CommonResult<PageResult<InventorymoveRequestMainRespVO>> getInventorymoveRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<InventorymoveRequestMainDO> pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainSenior(conditions);
PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRequestMainRespVO 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:inventorymove-request-main:export')")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueJob;
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.issueJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,20 @@ public class IssueJobDetailController {
PageResult<IssueJobDetailDO> pageResult = issueJobDetailService.getIssueJobDetailPage(pageVO);
return success(IssueJobDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料任务子分页")
@PreAuthorize("@ss.hasPermission('wms:issue-job-detail:query')")
public CommonResult<PageResult<IssueJobDetailRespVO>> getIssueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueJobDetailDO> pageResult = issueJobDetailService.getIssueJobDetailSenior(conditions);
PageResult<IssueJobDetailRespVO> result = IssueJobDetailConvert.INSTANCE.convertPage(pageResult);
for(IssueJobDetailRespVO 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:issue-job-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueJob;
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.issueJob.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class IssueJobMainController {
return success(IssueJobMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料任务主分页分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<IssueJobMainRespVO>> getIssueJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueJobMainDO> pageResult = issueJobMainService.getIssueJobMainSenior(conditions);
PageResult<IssueJobMainRespVO> result = IssueJobMainConvert.INSTANCE.convertPage(pageResult);
for(IssueJobMainRespVO 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:issue-job-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueRecord;
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.issueRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -90,7 +90,19 @@ public class IssueRecordDetailController {
PageResult<IssueRecordDetailDO> pageResult = issueRecordDetailService.getIssueRecordDetailPage(pageVO);
return success(IssueRecordDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料记录子分页")
@PreAuthorize("@ss.hasPermission('wms:issue-record-detail:query')")
public CommonResult<PageResult<IssueRecordDetailRespVO>> getIssueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueRecordDetailDO> pageResult = issueRecordDetailService.getIssueRecordDetailSenior(conditions);
PageResult<IssueRecordDetailRespVO> result = IssueRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(IssueRecordDetailRespVO 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:issue-record-detail:export')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueRecord;
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.issueRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class IssueRecordMainController {
return success(IssueRecordMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料记录主分页")
@PreAuthorize("@ss.hasPermission('wms:issue-record-main:query')")
public CommonResult<PageResult<IssueRecordMainRespVO>> getIssueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueRecordMainDO> pageResult = issueRecordMainService.getIssueRecordMainSenior(conditions);
PageResult<IssueRecordMainRespVO> result = IssueRecordMainConvert.INSTANCE.convertPage(pageResult);
for(IssueRecordMainRespVO 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:issue-record-main:export')")

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueRequest;
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.issueRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,20 @@ public class IssueRequestDetailController {
return success(IssueRequestDetailConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料申请子分页")
@PreAuthorize("@ss.hasPermission('wms:issue-request-detail:query')")
public CommonResult<PageResult<IssueRequestDetailRespVO>> getIssueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueRequestDetailDO> pageResult = issueRequestDetailService.getIssueRequestDetailSenior(conditions);
PageResult<IssueRequestDetailRespVO> result = IssueRequestDetailConvert.INSTANCE.convertPage(pageResult);
for(IssueRequestDetailRespVO 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:issue-request-detail:export')")

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.issueRequest;
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.issueRequest.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -91,7 +91,21 @@ public class IssueRequestMainController {
PageResult<IssueRequestMainDO> pageResult = issueRequestMainService.getIssueRequestMainPage(pageVO);
return success(IssueRequestMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得发料申请主分页")
@PreAuthorize("@ss.hasPermission('wms:issue-request-main:query')")
public CommonResult<PageResult<IssueRequestMainRespVO>> getIssueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<IssueRequestMainDO> pageResult = issueRequestMainService.getIssueRequestMainSenior(conditions);
PageResult<IssueRequestMainRespVO> result = IssueRequestMainConvert.INSTANCE.convertPage(pageResult);
for(IssueRequestMainRespVO 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:issue-request-main:export')")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@ -23,7 +23,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@ -31,7 +30,6 @@ import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.itempackaging;
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;
@ -86,13 +87,26 @@ public class ItempackagingController {
}
@GetMapping("/page")
@Operation(summary = "获得物品包装信息 分页")
@Operation(summary = "获得物品包装信息分页")
@PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
public CommonResult<PageResult<ItempackagingRespVO>> getItempackagingPage(@Valid ItempackagingPageReqVO pageVO) {
PageResult<ItempackagingDO> pageResult = itempackagingService.getItempackagingPage(pageVO);
return success(ItempackagingConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得物品包装信息分页")
@PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
public CommonResult<PageResult<ItempackagingRespVO>> getItempackagingSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ItempackagingDO> pageResult = itempackagingService.getItempackagingSenior(conditions);
PageResult<ItempackagingRespVO> result = ItempackagingConvert.INSTANCE.convertPage(pageResult);
for(ItempackagingRespVO 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:itempackaging:export')")
@ -107,7 +121,22 @@ public class ItempackagingController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(1, uom);
String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(2, description);;
String[] altPackUnit1 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(5, altPackUnit1);;
String[] altPackUnit2 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(7, altPackUnit2);;
String[] altPackUnit3 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(9, altPackUnit3);;
String[] altPackUnit4 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(11, altPackUnit4);;
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(13, available);;
ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.jobsetting;
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;
@ -111,6 +112,20 @@ public class JobsettingController {
ExcelUtils.write(response, "任务设置.xls", "数据", JobsettingExcelVO.class, datas);
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得任务设置分页")
@PreAuthorize("@ss.hasPermission('wms:jobsetting:query')")
public CommonResult<PageResult<JobsettingRespVO>> getJobsettingSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<JobsettingDO> pageResult = jobsettingService.getJobsettingSenior(conditions);
PageResult<JobsettingRespVO> result = JobsettingConvert.INSTANCE.convertPage(pageResult);
for(JobsettingRespVO vo : result.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return success(result);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入任务设置模板")
public void importTemplate(HttpServletResponse response) throws IOException {

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.labeltype;
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.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
@ -88,7 +89,19 @@ public class LabeltypeController {
PageResult<LabeltypeDO> pageResult = labeltypeService.getLabeltypePage(pageVO);
return success(LabeltypeConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得标签定义分页")
@PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')")
public CommonResult<PageResult<LabeltypeRespVO>> getLabeltypeSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<LabeltypeDO> pageResult = labeltypeService.getLabeltypeSenior(conditions);
PageResult<LabeltypeRespVO> result = LabeltypeConvert.INSTANCE.convertPage(pageResult);
for(LabeltypeRespVO 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:labeltypeService:export')")

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java

@ -3,6 +3,8 @@ package com.win.module.wms.controller.labeltype.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 LabeltypeRespVO extends LabeltypeBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5848")
private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.location;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ErrorCode;
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;
@ -10,10 +10,7 @@ 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.location.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.location.LocationConvert;
import com.win.module.wms.dal.dataobject.balance.BalanceDO;
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.mysql.balance.BalanceMapper;
import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
@ -114,6 +111,20 @@ public class LocationController {
return success(LocationConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得账期日历分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<PageResult<LocationRespVO>> getLocationSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<LocationDO> pageResult = locationService.getLocationSenior(conditions);
PageResult<LocationRespVO> result = LocationConvert.INSTANCE.convertPage(pageResult);
for(LocationRespVO 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:location:export')")
@ -128,7 +139,18 @@ public class LocationController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
mapDropDown.put(3, warehouseCode);
String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
mapDropDown.put(4, areaCode);
String[] erpLocationCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ERP_LOCATION);
mapDropDown.put(6, erpLocationCode);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(7, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(18, available);;
ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入库位模板")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java

@ -1,8 +1,8 @@
package com.win.module.wms.controller.locationcapacity;
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.locationcapacity.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -92,6 +92,19 @@ public class LocationcapacityController {
return success(LocationcapacityConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库位容量分页")
@PreAuthorize("@ss.hasPermission('wms:locationcapacity:query')")
public CommonResult<PageResult<LocationcapacityRespVO>> getLocationcapacitySenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<LocationcapacityDO> pageResult = locationcapacityService.getLocationcapacitySenior(conditions);
PageResult<LocationcapacityRespVO> result = LocationcapacityConvert.INSTANCE.convertPage(pageResult);
for(LocationcapacityRespVO 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:locationcapacity:export')")

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java

@ -3,10 +3,17 @@ package com.win.module.wms.controller.locationcapacity.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 库位容量 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LocationcapacityRespVO extends LocationcapacityBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

23
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.locationgroup;
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;
@ -92,6 +93,19 @@ public class LocationgroupController {
return success(LocationgroupConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库位组分页")
@PreAuthorize("@ss.hasPermission('wms:locationgroup:query')")
public CommonResult<PageResult<LocationgroupRespVO>> getLocationgroupSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<LocationgroupDO> pageResult = locationgroupService.getLocationgroupSenior(conditions);
PageResult<LocationgroupRespVO> result = LocationgroupConvert.INSTANCE.convertPage(pageResult);
for(LocationgroupRespVO 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:locationgroup:export')")
@ -106,7 +120,14 @@ public class LocationgroupController {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas);
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
mapDropDown.put(3, warehouseCode);
String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
mapDropDown.put(4, areaCode);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(5, available);;
ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入库位组模板")

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save