Browse Source

Merge remote-tracking branch 'origin/master'

master
赵雪冰 2 years ago
parent
commit
09a50ad7a7
  1. 16
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java
  2. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java
  3. 63
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java
  4. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java
  5. 113
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java
  6. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java
  7. 97
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java
  8. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java
  9. 105
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java
  10. 100
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java
  11. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java
  12. 19
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java
  13. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java
  14. 85
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java
  15. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java
  16. 80
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java
  17. 75
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java
  18. 77
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java
  19. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java
  20. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java
  21. 113
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java
  22. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java
  23. 97
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java
  24. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java
  25. 105
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java
  26. 100
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java
  27. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java
  28. 19
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java
  29. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java
  30. 86
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java
  31. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java
  32. 80
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java
  33. 75
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java
  34. 77
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java
  35. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java
  36. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java
  37. 114
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java
  38. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java
  39. 97
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java
  40. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java
  41. 105
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java
  42. 100
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java
  43. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java
  44. 19
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java
  45. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java
  46. 88
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java
  47. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java
  48. 80
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java
  49. 75
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java
  50. 77
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java
  51. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java
  52. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java
  53. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java
  54. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java
  55. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java
  56. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java
  57. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java
  58. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java
  59. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java
  60. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java
  61. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java
  62. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java
  63. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java
  64. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java
  65. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java
  66. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java
  67. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java
  68. 136
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java
  69. 102
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java
  70. 84
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java
  71. 72
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java
  72. 84
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java
  73. 71
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java
  74. 84
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java
  75. 71
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java
  76. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java
  77. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java
  78. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java
  79. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
  80. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java
  81. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java
  82. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java
  83. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java
  84. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java
  85. 28
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java
  86. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java
  87. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
  88. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  89. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java
  90. 28
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
  91. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java
  92. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java
  93. 71
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java
  94. 82
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java
  95. 73
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java
  96. 87
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java
  97. 71
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java
  98. 83
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java
  99. 73
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java
  100. 88
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java

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

@ -1083,6 +1083,21 @@ public interface ErrorCodeConstants {
ErrorCode CONTAINER_INIT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_168_002, "器具初始化记录主不存在");
ErrorCode CONTAINER_INIT_RECORD_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_168_003, "器具初始化子列表不存在");
// 合包记录主
ErrorCode PACKAGEMERGE_MAIN_NOT_EXISTS = new ErrorCode(1_000_169_001, "合包记录主不存在");
// 合包记录子
ErrorCode PACKAGEMERGE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_169_002, "合包记录子不存在");
// 翻包记录主
ErrorCode PACKAGEOVER_MAIN_NOT_EXISTS = new ErrorCode(1_000_170_001, "翻包记录主不存在");
// 翻包记录子
ErrorCode PACKAGEOVER_DETAIL_NOT_EXISTS = new ErrorCode(1_000_170_002, "翻包记录子不存在");
// 拆包记录主
ErrorCode PACKAGESPLIT_MAIN_NOT_EXISTS = new ErrorCode(1_000_171_001, "拆包记录主不存在");
// 拆包记录子
ErrorCode PACKAGESPLIT_DETAIL_NOT_EXISTS = new ErrorCode(1_000_171_002, "拆包记录子不存在");
//UOM ErrorCode
ErrorCode BATCH_EXCEPTION = new ErrorCode(1_000_400_000, "批次问题:【{}】");
ErrorCode UOM_EXCEPTION = new ErrorCode(1_000_401_000, "单位问题:【{}】");
@ -1107,5 +1122,6 @@ public interface ErrorCodeConstants {
ErrorCode ENTERPRISE_EXISTS = new ErrorCode(1_000_303_001, "企业已存在");
ErrorCode BACKFLUSH_REQUEST_DETAILB_NOT_EXISTS = new ErrorCode(1_000_304_001, "制品收货申请二子表不存在");
}

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

@ -197,6 +197,15 @@ public class CountRequestMainController {
return success(count > 0);
}
@PutMapping("/reAdd")
@Operation(summary = "重新添加采购收货申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:count-request-main:reAdd')")
public CommonResult<Boolean> openCountRequestMain(@RequestParam("id") Long id) {
Integer count = countRequestMainService.reAddCountRequestMain(id);
return success(count > 0);
}
@PutMapping("/submit")
@Operation(summary = "提交盘点申请主")
@Parameter(name = "id", description = "编号", required = true)
@ -224,12 +233,12 @@ public class CountRequestMainController {
return success(count > 0);
}
@PutMapping("/abort")
@PutMapping("/refused")
@Operation(summary = "审批拒绝盘点申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:count-request-main:abort')")
public CommonResult<Boolean> abortCountRequestMain(@RequestParam("id") Long id) {
Integer count = countRequestMainService.abortCountRequestMain(id);
@PreAuthorize("@ss.hasPermission('wms:count-request-main:refused')")
public CommonResult<Boolean> refusedCountRequestMain(@RequestParam("id") Long id) {
Integer count = countRequestMainService.refusedCountRequestMain(id);
return success(count > 0);
}

63
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java

@ -2,12 +2,18 @@ package com.win.module.wms.controller.index;
import com.win.framework.common.pojo.CommonResult;
import com.win.module.wms.service.balance.BalanceService;
import com.win.module.wms.service.countJob.CountJobMainService;
import com.win.module.wms.service.customerreturnJob.CustomerreturnJobMainService;
import com.win.module.wms.service.deliverJob.DeliverJobMainService;
import com.win.module.wms.service.deliverPlan.DeliverPlanMainService;
import com.win.module.wms.service.inspectJob.InspectJobMainService;
import com.win.module.wms.service.inventorymoveJob.InventorymoveJobMainService;
import com.win.module.wms.service.issueJob.IssueJobMainService;
import com.win.module.wms.service.issueRequest.IssueRequestMainService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.pickJob.PickJobMainService;
import com.win.module.wms.service.preparetoissue.PreparetoissueMainService;
import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService;
import com.win.module.wms.service.production.ProductionMainService;
import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService;
import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService;
@ -24,8 +30,13 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService
import com.win.module.wms.service.purchasereturnRecord.PurchasereturnRecordDetailService;
import com.win.module.wms.service.putawayJob.PutawayJobMainService;
import com.win.module.wms.service.repleinshJob.RepleinshJobMainService;
import com.win.module.wms.service.scrapJob.ScrapJobMainService;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
import com.win.module.wms.service.transferissueJob.TransferissueJobMainService;
import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService;
import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobMainService;
import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jetbrains.annotations.NotNull;
@ -96,6 +107,28 @@ public class IndexController {
private ProductscrapJobMainService productscrapJobMainService;
@Resource
private RepleinshJobMainService repleinshJobMainService;
@Resource
private CountJobMainService countJobMainService;
@Resource
private CustomerreturnJobMainService customerreturnJobMainService;
@Resource
private DeliverJobMainService deliverJobMainService;
@Resource
private InventorymoveJobMainService inventorymoveJobMainService;
@Resource
private PickJobMainService pickJobMainService;
@Resource
private ProductdismantleJobMainService productdismantleJobMainService;
@Resource
private ScrapJobMainService scrapJobMainService;
@Resource
private TransferissueJobMainService transferissueJobMainService;
@Resource
private TransferreceiptJobMainService transferreceiptJobMainService;
@Resource
private UnplannedissueJobMainService unplannedissueJobMainService;
@Resource
private UnplannedreceiptJobMainService unplannedreceiptJobMainService;
@GetMapping("/indexSupplier")
@Operation(summary = "供应商首页")
@ -187,4 +220,34 @@ public class IndexController {
return success(dataMap);
}
@GetMapping("/indexPda")
@Operation(summary = "PDA首页任务数量")
public CommonResult<Map<String, Object>> indexPda() {
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("count", countJobMainService.getCountJobCountPda());//盘点任务数
dataMap.put("customerreturn", customerreturnJobMainService.getCustomerreturnJobCountPda());//客户退货任务数
dataMap.put("deliver", deliverJobMainService.getDeliverJobCountPda());//发货退货任务数
dataMap.put("inspect", inspectJobMainService.getInspectJobCountPda());//检验任务数
dataMap.put("inventorymove", inventorymoveJobMainService.getInventorymoveJobCountPda());//库存转移任务数
dataMap.put("issue", issueJobMainService.getIssueJobCountPda());//发料任务数
dataMap.put("pick", pickJobMainService.getPickJobCountPda());//拣料任务数
dataMap.put("productdismantle", productdismantleJobMainService.getProductdismantleJobCountPda());//制品拆解任务数
dataMap.put("productionreceipt", productionreceiptJobMainService.getProductionreceiptJobCountPda());//生产收料任务数
dataMap.put("productionreturn", productionreturnJobMainService.getProductionreturnJobCountPda());//生产退料任务数
dataMap.put("productputawayJ", productputawayJobMainService.getProductputawayJobCountPda());//制品上架退料任务数
dataMap.put("productreceipt", productreceiptJobMainService.getProductreceiptJobCountPda());//制品收货退料任务数
dataMap.put("productscrap", productscrapJobMainService.getProductscrapJobCountPda());//制品报废任务数
dataMap.put("purchasereceipt", purchasereceiptJobMainService.getPurchasereceiptJobCountPda());//采购收货任务数
dataMap.put("purchasereturn", purchasereturnJobMainService.getPurchasereturnJobCountPda());//采购退货任务数
dataMap.put("putaway", putawayJobMainService.getPutawayJobCountPda());//上架任务数
dataMap.put("repleinsh", repleinshJobMainService.getRepleinshJobCountPda());//补料任务数
dataMap.put("scrap", scrapJobMainService.getScrapJobCountPda());//报废出库任务数
dataMap.put("transferissue", transferissueJobMainService.getTransferissueJobCountPda());//调拨出库任务数
dataMap.put("transferreceipt", transferreceiptJobMainService.getTransferreceiptJobCountPda());//调拨入库任务数
dataMap.put("unplannedissue", unplannedissueJobMainService.getUnplannedissueJobCountPda());//计划外出库任务数
dataMap.put("unplannedreceipt", unplannedreceiptJobMainService.getUnplannedreceiptJobCountPda());//计划外入库任务数
return success(dataMap);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java

@ -80,6 +80,9 @@ public class InspectRecordDetailBaseVO {
@Schema(description = "其他属性")
private String otherProperties;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

113
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java

@ -0,0 +1,113 @@
package com.win.module.wms.controller.packagemergemain;
import io.swagger.v3.oas.annotations.Parameters;
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.time.LocalDateTime;
import java.time.ZoneOffset;
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.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO;
import com.win.module.wms.convert.packagemergemain.PackagemergeDetailConvert;
import com.win.module.wms.service.packagemergemain.PackagemergeDetailService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 合包记录子")
@RestController
@RequestMapping("/wms/packagemerge-detail")
@Validated
public class PackagemergeDetailController {
@Resource
private PackagemergeDetailService packagemergeDetailService;
@PostMapping("/create")
@Operation(summary = "创建合包记录子")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:create')")
public CommonResult<Long> createPackagemergeDetail(@Valid @RequestBody PackagemergeDetailCreateReqVO createReqVO) {
return success(packagemergeDetailService.createPackagemergeDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新合包记录子")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:update')")
public CommonResult<Boolean> updatePackagemergeDetail(@Valid @RequestBody PackagemergeDetailUpdateReqVO updateReqVO) {
int result = packagemergeDetailService.updatePackagemergeDetail(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除合包记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:delete')")
public CommonResult<Boolean> deletePackagemergeDetail(@RequestParam("id") Long id) {
int result = packagemergeDetailService.deletePackagemergeDetail(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得合包记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')")
public CommonResult<PackagemergeDetailRespVO> getPackagemergeDetail(@RequestParam("id") Long id) {
PackagemergeDetailDO packagemergeDetail = packagemergeDetailService.getPackagemergeDetail(id);
return success(PackagemergeDetailConvert.INSTANCE.convert(packagemergeDetail));
}
@GetMapping("/list")
@Operation(summary = "获得合包记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')")
public CommonResult<List<PackagemergeDetailRespVO>> getPackagemergeDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PackagemergeDetailDO> list = packagemergeDetailService.getPackagemergeDetailList(ids);
return success(PackagemergeDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得合包记录子分页")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')")
public CommonResult<PageResult<PackagemergeDetailRespVO>> getPackagemergeDetailPage(@Valid PackagemergeDetailPageReqVO pageVO) {
PageResult<PackagemergeDetailDO> pageResult = packagemergeDetailService.getPackagemergeDetailPage(pageVO);
return success(PackagemergeDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出合包记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:export')")
@OperateLog(type = EXPORT)
public void exportPackagemergeDetailExcel(@Valid PackagemergeDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackagemergeDetailDO> list = packagemergeDetailService.getPackagemergeDetailList(exportReqVO);
// 导出 Excel
List<PackagemergeDetailExcelVO> datas = PackagemergeDetailConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "合包记录子.xls", "数据", PackagemergeDetailExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入合包记录子模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackagemergeDetailExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "合包记录子基本信息导入模板.xls", "合包记录子基本信息列表", PackagemergeDetailExcelVO.class, list);
}
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java

@ -0,0 +1,136 @@
package com.win.module.wms.controller.packagemergemain;
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.IssueRecordMainRespVO;
import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import io.swagger.v3.oas.annotations.Parameters;
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.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
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.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert;
import com.win.module.wms.service.packagemergemain.PackagemergeMainService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 合包记录主")
@RestController
@RequestMapping("/wms/packagemerge-main")
@Validated
public class PackagemergeMainController {
@Resource
private AdminUserApi userApi;
@Resource
private PackagemergeMainService packagemergeMainService;
@PostMapping("/create")
@Operation(summary = "创建合包记录主")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:create')")
public CommonResult<Long> createPackagemergeMain(@Valid @RequestBody PackagemergeMainCreateReqVO createReqVO) {
return success(packagemergeMainService.createPackagemergeMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新合包记录主")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:update')")
public CommonResult<Boolean> updatePackagemergeMain(@Valid @RequestBody PackagemergeMainUpdateReqVO updateReqVO) {
int result = packagemergeMainService.updatePackagemergeMain(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除合包记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:delete')")
public CommonResult<Boolean> deletePackagemergeMain(@RequestParam("id") Long id) {
int result = packagemergeMainService.deletePackagemergeMain(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得合包记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')")
public CommonResult<PackagemergeMainRespVO> getPackagemergeMain(@RequestParam("id") Long id) {
PackagemergeMainDO packagemergeMain = packagemergeMainService.getPackagemergeMain(id);
return success(PackagemergeMainConvert.INSTANCE.convert(packagemergeMain));
}
@GetMapping("/list")
@Operation(summary = "获得合包记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')")
public CommonResult<List<PackagemergeMainRespVO>> getPackagemergeMainList(@RequestParam("ids") Collection<Long> ids) {
List<PackagemergeMainDO> list = packagemergeMainService.getPackagemergeMainList(ids);
return success(PackagemergeMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得合包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')")
public CommonResult<PageResult<PackagemergeMainRespVO>> getPackagemergeMainPage(@Valid PackagemergeMainPageReqVO pageVO) {
PageResult<PackagemergeMainDO> pageResult = packagemergeMainService.getPackagemergeMainPage(pageVO);
return success(PackagemergeMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得合包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')")
public CommonResult<PageResult<PackagemergeMainRespVO>> getPackagemergeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<PackagemergeMainDO> pageResult = packagemergeMainService.getPackagemergeMainSenior(conditions);
PageResult<PackagemergeMainRespVO> result = PackagemergeMainConvert.INSTANCE.convertPage(pageResult);
for(PackagemergeMainRespVO 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:packagemerge-main:export')")
@OperateLog(type = EXPORT)
public void exportPackagemergeMainExcel(@Valid PackagemergeMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackagemergeMainDO> list = packagemergeMainService.getPackagemergeMainList(exportReqVO);
// 导出 Excel
List<PackagemergeMainExcelVO> datas = PackagemergeMainConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "合包记录主.xls", "数据", PackagemergeMainExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入合包记录主模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackagemergeMainExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "合包记录主基本信息导入模板.xls", "合包记录主基本信息列表", PackagemergeMainExcelVO.class, list);
}
}

97
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java

@ -0,0 +1,97 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
/**
* 合包记录子 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackagemergeDetailBaseVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "1")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "2")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "18261")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "地点ID", example = "29185")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java

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

105
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java

@ -0,0 +1,105 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 合包记录子 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackagemergeDetailExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("库位代码")
private String locationCode;
@ExcelProperty("库位组代码")
private String locationGroupCode;
@ExcelProperty("库区代码")
private String areaCode;
@ExcelProperty("从包装号")
private String fromPackingNumber;
@ExcelProperty("到包装号")
private String toPackingNumber;
@ExcelProperty("从批次")
private String fromBatch;
@ExcelProperty("到批次")
private String toBatch;
@ExcelProperty("从库存状态")
private String fromInventoryStatus;
@ExcelProperty("到库存状态")
private String toInventoryStatus;
@ExcelProperty("从器具号")
private String fromContainerNumber;
@ExcelProperty("到器具号")
private String toContainerNumber;
@ExcelProperty("从货主代码")
private String fromOwnerCode;
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("主表ID")
private Long masterId;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("地点ID")
private String siteId;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("到数量")
private BigDecimal toQty;
@ExcelProperty("从数量")
private BigDecimal fromQty;
@ExcelProperty("计量单位")
private String uom;
@ExcelProperty("接口类型")
private String interfaceType;
}

100
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java

@ -0,0 +1,100 @@
package com.win.module.wms.controller.packagemergemain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合包记录子 Excel 导出 Request VO,参数和 PackagemergeDetailPageReqVO 是一致的")
@Data
public class PackagemergeDetailExportReqVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "1")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "2")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "18261")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "29185")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java

@ -0,0 +1,102 @@
package com.win.module.wms.controller.packagemergemain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合包记录子分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagemergeDetailPageReqVO extends PageParam {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "1")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "2")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "18261")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "29185")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

19
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java

@ -0,0 +1,19 @@
package com.win.module.wms.controller.packagemergemain.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 PackagemergeDetailRespVO extends PackagemergeDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14985")
private Long id;
@Schema(description = "创建时间")
private LocalDateTime createTime;
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合包记录子更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagemergeDetailUpdateReqVO extends PackagemergeDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14985")
@NotNull(message = "id不能为空")
private Long id;
}

85
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java

@ -0,0 +1,85 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 合包记录主 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackagemergeMainBaseVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "2")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建者")
private String creator;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "更新者")
private String updater;
@Schema(description = "更新时间")
private LocalDateTime updateTime;
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java

@ -0,0 +1,14 @@
package com.win.module.wms.controller.packagemergemain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合包记录主创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagemergeMainCreateReqVO extends PackagemergeMainBaseVO {
}

80
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java

@ -0,0 +1,80 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 合包记录主 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackagemergeMainExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("仓库代码")
private String warehouseCode;
@ExcelProperty("明细")
private String details;
@ExcelProperty("出库事务类型")
private String outTransactionType;
@ExcelProperty("入库事务类型")
private String inTransactionType;
@ExcelProperty("执行时间")
private LocalDateTime executeTime;
@ExcelProperty("生效日期")
private LocalDateTime activeDate;
@ExcelProperty("是否可用")
private String available;
@ExcelProperty("申请时间")
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
private LocalDateTime dueTime;
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty("用户组")
private String userGroupCode;
@ExcelProperty("接口类型")
private String interfaceType;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("扩展属性")
private String extraProperties;
@ExcelProperty("地点ID")
private String siteId;
}

75
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java

@ -0,0 +1,75 @@
package com.win.module.wms.controller.packagemergemain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合包记录主 Excel 导出 Request VO,参数和 PackagemergeMainPageReqVO 是一致的")
@Data
public class PackagemergeMainExportReqVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "2")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "5629")
private String siteId;
}

77
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java

@ -0,0 +1,77 @@
package com.win.module.wms.controller.packagemergemain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合包记录主分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagemergeMainPageReqVO extends PageParam {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "2")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "5629")
private String siteId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java

@ -0,0 +1,13 @@
package com.win.module.wms.controller.packagemergemain.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 PackagemergeMainRespVO extends PackagemergeMainBaseVO {
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packagemergemain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合包记录主更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagemergeMainUpdateReqVO extends PackagemergeMainBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30783")
@NotNull(message = "id不能为空")
private Long id;
}

113
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java

@ -0,0 +1,113 @@
package com.win.module.wms.controller.packageovermain;
import io.swagger.v3.oas.annotations.Parameters;
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.time.LocalDateTime;
import java.time.ZoneOffset;
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.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO;
import com.win.module.wms.convert.packageovermain.PackageoverDetailConvert;
import com.win.module.wms.service.packageovermain.PackageoverDetailService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 翻包记录子")
@RestController
@RequestMapping("/wms/packageover-detail")
@Validated
public class PackageoverDetailController {
@Resource
private PackageoverDetailService packageoverDetailService;
@PostMapping("/create")
@Operation(summary = "创建翻包记录子")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:create')")
public CommonResult<Long> createPackageoverDetail(@Valid @RequestBody PackageoverDetailCreateReqVO createReqVO) {
return success(packageoverDetailService.createPackageoverDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新翻包记录子")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:update')")
public CommonResult<Boolean> updatePackageoverDetail(@Valid @RequestBody PackageoverDetailUpdateReqVO updateReqVO) {
int result = packageoverDetailService.updatePackageoverDetail(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除翻包记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:delete')")
public CommonResult<Boolean> deletePackageoverDetail(@RequestParam("id") Long id) {
int result = packageoverDetailService.deletePackageoverDetail(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得翻包记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')")
public CommonResult<PackageoverDetailRespVO> getPackageoverDetail(@RequestParam("id") Long id) {
PackageoverDetailDO packageoverDetail = packageoverDetailService.getPackageoverDetail(id);
return success(PackageoverDetailConvert.INSTANCE.convert(packageoverDetail));
}
@GetMapping("/list")
@Operation(summary = "获得翻包记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')")
public CommonResult<List<PackageoverDetailRespVO>> getPackageoverDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PackageoverDetailDO> list = packageoverDetailService.getPackageoverDetailList(ids);
return success(PackageoverDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得翻包记录子分页")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')")
public CommonResult<PageResult<PackageoverDetailRespVO>> getPackageoverDetailPage(@Valid PackageoverDetailPageReqVO pageVO) {
PageResult<PackageoverDetailDO> pageResult = packageoverDetailService.getPackageoverDetailPage(pageVO);
return success(PackageoverDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出翻包记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:packageover-detail:export')")
@OperateLog(type = EXPORT)
public void exportPackageoverDetailExcel(@Valid PackageoverDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackageoverDetailDO> list = packageoverDetailService.getPackageoverDetailList(exportReqVO);
// 导出 Excel
List<PackageoverDetailExcelVO> datas = PackageoverDetailConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "翻包记录子.xls", "数据", PackageoverDetailExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入翻包记录子模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackageoverDetailExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "翻包记录子基本信息导入模板.xls", "翻包记录子基本信息列表", PackageoverDetailExcelVO.class, list);
}
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java

@ -0,0 +1,136 @@
package com.win.module.wms.controller.packageovermain;
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.packagemergemain.vo.PackagemergeMainRespVO;
import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
import io.swagger.v3.oas.annotations.Parameters;
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.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
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.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
import com.win.module.wms.convert.packageovermain.PackageoverMainConvert;
import com.win.module.wms.service.packageovermain.PackageoverMainService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 翻包记录主")
@RestController
@RequestMapping("/wms/packageover-main")
@Validated
public class PackageoverMainController {
@Resource
private AdminUserApi userApi;
@Resource
private PackageoverMainService packageoverMainService;
@PostMapping("/create")
@Operation(summary = "创建翻包记录主")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:create')")
public CommonResult<Long> createPackageoverMain(@Valid @RequestBody PackageoverMainCreateReqVO createReqVO) {
return success(packageoverMainService.createPackageoverMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新翻包记录主")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:update')")
public CommonResult<Boolean> updatePackageoverMain(@Valid @RequestBody PackageoverMainUpdateReqVO updateReqVO) {
int result = packageoverMainService.updatePackageoverMain(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除翻包记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packageover-main:delete')")
public CommonResult<Boolean> deletePackageoverMain(@RequestParam("id") Long id) {
int result = packageoverMainService.deletePackageoverMain(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得翻包记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:query')")
public CommonResult<PackageoverMainRespVO> getPackageoverMain(@RequestParam("id") Long id) {
PackageoverMainDO packageoverMain = packageoverMainService.getPackageoverMain(id);
return success(PackageoverMainConvert.INSTANCE.convert(packageoverMain));
}
@GetMapping("/list")
@Operation(summary = "获得翻包记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:query')")
public CommonResult<List<PackageoverMainRespVO>> getPackageoverMainList(@RequestParam("ids") Collection<Long> ids) {
List<PackageoverMainDO> list = packageoverMainService.getPackageoverMainList(ids);
return success(PackageoverMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得翻包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:query')")
public CommonResult<PageResult<PackageoverMainRespVO>> getPackageoverMainPage(@Valid PackageoverMainPageReqVO pageVO) {
PageResult<PackageoverMainDO> pageResult = packageoverMainService.getPackageoverMainPage(pageVO);
return success(PackageoverMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得翻包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packageover-main:query')")
public CommonResult<PageResult<PackageoverMainRespVO>> getPackageoverMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<PackageoverMainDO> pageResult = packageoverMainService.getPackageoverMainSenior(conditions);
PageResult<PackageoverMainRespVO> result = PackageoverMainConvert.INSTANCE.convertPage(pageResult);
for(PackageoverMainRespVO 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:packageover-main:export')")
@OperateLog(type = EXPORT)
public void exportPackageoverMainExcel(@Valid PackageoverMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackageoverMainDO> list = packageoverMainService.getPackageoverMainList(exportReqVO);
// 导出 Excel
List<PackageoverMainExcelVO> datas = PackageoverMainConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "翻包记录主.xls", "数据", PackageoverMainExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入翻包记录主模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackageoverMainExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "翻包记录主基本信息导入模板.xls", "翻包记录主基本信息列表", PackageoverMainExcelVO.class, list);
}
}

97
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java

@ -0,0 +1,97 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
/**
* 翻包记录子 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackageoverDetailBaseVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "19413")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "地点ID", example = "14071")
private String siteId;
@Schema(description = "物品名称", example = "王五")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java

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

105
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java

@ -0,0 +1,105 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 翻包记录子 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackageoverDetailExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("库位代码")
private String locationCode;
@ExcelProperty("库位组代码")
private String locationGroupCode;
@ExcelProperty("库区代码")
private String areaCode;
@ExcelProperty("从包装号")
private String fromPackingNumber;
@ExcelProperty("到包装号")
private String toPackingNumber;
@ExcelProperty("从批次")
private String fromBatch;
@ExcelProperty("到批次")
private String toBatch;
@ExcelProperty("从库存状态")
private String fromInventoryStatus;
@ExcelProperty("到库存状态")
private String toInventoryStatus;
@ExcelProperty("从器具号")
private String fromContainerNumber;
@ExcelProperty("到器具号")
private String toContainerNumber;
@ExcelProperty("从货主代码")
private String fromOwnerCode;
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("主表ID")
private Long masterId;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("地点ID")
private String siteId;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("到数量")
private BigDecimal toQty;
@ExcelProperty("从数量")
private BigDecimal fromQty;
@ExcelProperty("计量单位")
private String uom;
@ExcelProperty("接口类型")
private String interfaceType;
}

100
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java

@ -0,0 +1,100 @@
package com.win.module.wms.controller.packageovermain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 翻包记录子 Excel 导出 Request VO,参数和 PackageoverDetailPageReqVO 是一致的")
@Data
public class PackageoverDetailExportReqVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "19413")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "14071")
private String siteId;
@Schema(description = "物品名称", example = "王五")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java

@ -0,0 +1,102 @@
package com.win.module.wms.controller.packageovermain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 翻包记录子分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackageoverDetailPageReqVO extends PageParam {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "19413")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "14071")
private String siteId;
@Schema(description = "物品名称", example = "王五")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

19
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java

@ -0,0 +1,19 @@
package com.win.module.wms.controller.packageovermain.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 PackageoverDetailRespVO extends PackageoverDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27780")
private Long id;
@Schema(description = "创建时间")
private LocalDateTime createTime;
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 翻包记录子更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackageoverDetailUpdateReqVO extends PackageoverDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27780")
@NotNull(message = "id不能为空")
private Long id;
}

86
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java

@ -0,0 +1,86 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 翻包记录主 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackageoverMainBaseVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "创建者")
private String creator;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "更新者")
private String updater;
@Schema(description = "更新时间")
private LocalDateTime updateTime;
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java

@ -0,0 +1,14 @@
package com.win.module.wms.controller.packageovermain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 翻包记录主创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackageoverMainCreateReqVO extends PackageoverMainBaseVO {
}

80
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java

@ -0,0 +1,80 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 翻包记录主 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackageoverMainExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("仓库代码")
private String warehouseCode;
@ExcelProperty("明细")
private String details;
@ExcelProperty("出库事务类型")
private String outTransactionType;
@ExcelProperty("入库事务类型")
private String inTransactionType;
@ExcelProperty("执行时间")
private LocalDateTime executeTime;
@ExcelProperty("生效日期")
private LocalDateTime activeDate;
@ExcelProperty("是否可用")
private String available;
@ExcelProperty("申请时间")
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
private LocalDateTime dueTime;
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty("用户组")
private String userGroupCode;
@ExcelProperty("接口类型")
private String interfaceType;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("扩展属性")
private String extraProperties;
@ExcelProperty("地点ID")
private String siteId;
}

75
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java

@ -0,0 +1,75 @@
package com.win.module.wms.controller.packageovermain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 翻包记录主 Excel 导出 Request VO,参数和 PackageoverMainPageReqVO 是一致的")
@Data
public class PackageoverMainExportReqVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "32228")
private String siteId;
}

77
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java

@ -0,0 +1,77 @@
package com.win.module.wms.controller.packageovermain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 翻包记录主分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackageoverMainPageReqVO extends PageParam {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "2")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "32228")
private String siteId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java

@ -0,0 +1,13 @@
package com.win.module.wms.controller.packageovermain.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 PackageoverMainRespVO extends PackageoverMainBaseVO {
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packageovermain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 翻包记录主更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackageoverMainUpdateReqVO extends PackageoverMainBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2501")
@NotNull(message = "id不能为空")
private Long id;
}

114
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java

@ -0,0 +1,114 @@
package com.win.module.wms.controller.packagesplitmain;
import io.swagger.v3.oas.annotations.Parameters;
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.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
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.packagesplitmain.vo.*;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO;
import com.win.module.wms.convert.packagesplitmain.PackagesplitDetailConvert;
import com.win.module.wms.service.packagesplitmain.PackagesplitDetailService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 拆包记录子")
@RestController
@RequestMapping("/wms/packagesplit-detail")
@Validated
public class PackagesplitDetailController {
@Resource
private PackagesplitDetailService packagesplitDetailService;
@PostMapping("/create")
@Operation(summary = "创建拆包记录子")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:create')")
public CommonResult<Long> createPackagesplitDetail(@Valid @RequestBody PackagesplitDetailCreateReqVO createReqVO) {
return success(packagesplitDetailService.createPackagesplitDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新拆包记录子")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:update')")
public CommonResult<Boolean> updatePackagesplitDetail(@Valid @RequestBody PackagesplitDetailUpdateReqVO updateReqVO) {
int result = packagesplitDetailService.updatePackagesplitDetail(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除拆包记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:delete')")
public CommonResult<Boolean> deletePackagesplitDetail(@RequestParam("id") Long id) {
int result = packagesplitDetailService.deletePackagesplitDetail(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得拆包记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')")
public CommonResult<PackagesplitDetailRespVO> getPackagesplitDetail(@RequestParam("id") Long id) {
PackagesplitDetailDO packagesplitDetail = packagesplitDetailService.getPackagesplitDetail(id);
return success(PackagesplitDetailConvert.INSTANCE.convert(packagesplitDetail));
}
@GetMapping("/list")
@Operation(summary = "获得拆包记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')")
public CommonResult<List<PackagesplitDetailRespVO>> getPackagesplitDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PackagesplitDetailDO> list = packagesplitDetailService.getPackagesplitDetailList(ids);
return success(PackagesplitDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得拆包记录子分页")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')")
public CommonResult<PageResult<PackagesplitDetailRespVO>> getPackagesplitDetailPage(@Valid PackagesplitDetailPageReqVO pageVO) {
PageResult<PackagesplitDetailDO> pageResult = packagesplitDetailService.getPackagesplitDetailPage(pageVO);
return success(PackagesplitDetailConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出拆包记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:export')")
@OperateLog(type = EXPORT)
public void exportPackagesplitDetailExcel(@Valid PackagesplitDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackagesplitDetailDO> list = packagesplitDetailService.getPackagesplitDetailList(exportReqVO);
// 导出 Excel
List<PackagesplitDetailExcelVO> datas = PackagesplitDetailConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "拆包记录子.xls", "数据", PackagesplitDetailExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入拆包记录子模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackagesplitDetailExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "拆包记录子基本信息导入模板.xls", "拆包记录子基本信息列表", PackagesplitDetailExcelVO.class, list);
}
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java

@ -0,0 +1,136 @@
package com.win.module.wms.controller.packagesplitmain;
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.packageovermain.vo.PackageoverMainRespVO;
import com.win.module.wms.convert.packageovermain.PackageoverMainConvert;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
import io.swagger.v3.oas.annotations.Parameters;
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.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
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.packagesplitmain.vo.*;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO;
import com.win.module.wms.convert.packagesplitmain.PackagesplitMainConvert;
import com.win.module.wms.service.packagesplitmain.PackagesplitMainService;
import org.springframework.web.multipart.MultipartFile;
@Tag(name = "管理后台 - 拆包记录主")
@RestController
@RequestMapping("/wms/packagesplit-main")
@Validated
public class PackagesplitMainController {
@Resource
private AdminUserApi userApi;
@Resource
private PackagesplitMainService packagesplitMainService;
@PostMapping("/create")
@Operation(summary = "创建拆包记录主")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:create')")
public CommonResult<Long> createPackagesplitMain(@Valid @RequestBody PackagesplitMainCreateReqVO createReqVO) {
return success(packagesplitMainService.createPackagesplitMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新拆包记录主")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:update')")
public CommonResult<Boolean> updatePackagesplitMain(@Valid @RequestBody PackagesplitMainUpdateReqVO updateReqVO) {
int result = packagesplitMainService.updatePackagesplitMain(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@Operation(summary = "删除拆包记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:delete')")
public CommonResult<Boolean> deletePackagesplitMain(@RequestParam("id") Long id) {
int result = packagesplitMainService.deletePackagesplitMain(id);
return success(result > 0);
}
@GetMapping("/get")
@Operation(summary = "获得拆包记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')")
public CommonResult<PackagesplitMainRespVO> getPackagesplitMain(@RequestParam("id") Long id) {
PackagesplitMainDO packagesplitMain = packagesplitMainService.getPackagesplitMain(id);
return success(PackagesplitMainConvert.INSTANCE.convert(packagesplitMain));
}
@GetMapping("/list")
@Operation(summary = "获得拆包记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')")
public CommonResult<List<PackagesplitMainRespVO>> getPackagesplitMainList(@RequestParam("ids") Collection<Long> ids) {
List<PackagesplitMainDO> list = packagesplitMainService.getPackagesplitMainList(ids);
return success(PackagesplitMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得拆包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')")
public CommonResult<PageResult<PackagesplitMainRespVO>> getPackagesplitMainPage(@Valid PackagesplitMainPageReqVO pageVO) {
PageResult<PackagesplitMainDO> pageResult = packagesplitMainService.getPackagesplitMainPage(pageVO);
return success(PackagesplitMainConvert.INSTANCE.convertPage(pageResult));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得拆包记录主分页")
@PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')")
public CommonResult<PageResult<PackagesplitMainRespVO>> getPackagesplitMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<PackagesplitMainDO> pageResult = packagesplitMainService.getPackagesplitMainSenior(conditions);
PageResult<PackagesplitMainRespVO> result = PackagesplitMainConvert.INSTANCE.convertPage(pageResult);
for(PackagesplitMainRespVO 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:packagesplit-main:export')")
@OperateLog(type = EXPORT)
public void exportPackagesplitMainExcel(@Valid PackagesplitMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PackagesplitMainDO> list = packagesplitMainService.getPackagesplitMainList(exportReqVO);
// 导出 Excel
List<PackagesplitMainExcelVO> datas = PackagesplitMainConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "拆包记录主.xls", "数据", PackagesplitMainExcelVO.class, datas);
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入拆包记录主模板")
public void importTemplate(HttpServletResponse response) throws IOException {
List<PackagesplitMainExcelVO> list = Arrays.asList();
// 输出
ExcelUtils.write(response, "拆包记录主基本信息导入模板.xls", "拆包记录主基本信息列表", PackagesplitMainExcelVO.class, list);
}
}

97
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java

@ -0,0 +1,97 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
/**
* 拆包记录子 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackagesplitDetailBaseVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "24141")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "地点ID", example = "11960")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java

@ -0,0 +1,14 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 拆包记录子创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitDetailCreateReqVO extends PackagesplitDetailBaseVO {
}

105
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java

@ -0,0 +1,105 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 拆包记录子 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackagesplitDetailExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("库位代码")
private String locationCode;
@ExcelProperty("库位组代码")
private String locationGroupCode;
@ExcelProperty("库区代码")
private String areaCode;
@ExcelProperty("从包装号")
private String fromPackingNumber;
@ExcelProperty("到包装号")
private String toPackingNumber;
@ExcelProperty("从批次")
private String fromBatch;
@ExcelProperty("到批次")
private String toBatch;
@ExcelProperty("从库存状态")
private String fromInventoryStatus;
@ExcelProperty("到库存状态")
private String toInventoryStatus;
@ExcelProperty("从器具号")
private String fromContainerNumber;
@ExcelProperty("到器具号")
private String toContainerNumber;
@ExcelProperty("从货主代码")
private String fromOwnerCode;
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("主表ID")
private Long masterId;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("地点ID")
private String siteId;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("到数量")
private BigDecimal toQty;
@ExcelProperty("从数量")
private BigDecimal fromQty;
@ExcelProperty("计量单位")
private String uom;
@ExcelProperty("接口类型")
private String interfaceType;
}

100
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java

@ -0,0 +1,100 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 拆包记录子 Excel 导出 Request VO,参数和 PackagesplitDetailPageReqVO 是一致的")
@Data
public class PackagesplitDetailExportReqVO {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "24141")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "11960")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java

@ -0,0 +1,102 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 拆包记录子分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitDetailPageReqVO extends PageParam {
@Schema(description = "库位代码")
private String locationCode;
@Schema(description = "库位组代码")
private String locationGroupCode;
@Schema(description = "库区代码")
private String areaCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
@Schema(description = "从批次")
private String fromBatch;
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "从库存状态", example = "2")
private String fromInventoryStatus;
@Schema(description = "到库存状态", example = "1")
private String toInventoryStatus;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "24141")
private Long masterId;
@Schema(description = "单据号")
private String number;
@Schema(description = "物品代码")
private String itemCode;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "地点ID", example = "11960")
private String siteId;
@Schema(description = "物品名称", example = "芋艿")
private String itemName;
@Schema(description = "物品描述1")
private String itemDesc1;
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "项目代码")
private String projectCode;
@Schema(description = "到数量")
private BigDecimal toQty;
@Schema(description = "从数量")
private BigDecimal fromQty;
@Schema(description = "计量单位")
private String uom;
@Schema(description = "接口类型", example = "1")
private String interfaceType;
}

19
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java

@ -0,0 +1,19 @@
package com.win.module.wms.controller.packagesplitmain.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 PackagesplitDetailRespVO extends PackagesplitDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23508")
private Long id;
@Schema(description = "创建时间")
private LocalDateTime createTime;
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 拆包记录子更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitDetailUpdateReqVO extends PackagesplitDetailBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23508")
@NotNull(message = "id不能为空")
private Long id;
}

88
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java

@ -0,0 +1,88 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 拆包记录主 Base VO提供给添加修改详细的子 VO 使用
* 如果子 VO 存在差异的字段请不要添加到这里影响 Swagger 文档生成
*/
@Data
public class PackagesplitMainBaseVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "1")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "2")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "2")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "地点ID", example = "19009")
private String siteId;
@Schema(description = "创建者")
private String creator;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "更新者")
private String updater;
@Schema(description = "更新时间")
private LocalDateTime updateTime;
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java

@ -0,0 +1,14 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 拆包记录主创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitMainCreateReqVO extends PackagesplitMainBaseVO {
}

80
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java

@ -0,0 +1,80 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 拆包记录主 Excel VO
*
* @author 超级管理员
*/
@Data
public class PackagesplitMainExcelVO {
@ExcelProperty("id")
private Long id;
@ExcelProperty("仓库代码")
private String warehouseCode;
@ExcelProperty("明细")
private String details;
@ExcelProperty("出库事务类型")
private String outTransactionType;
@ExcelProperty("入库事务类型")
private String inTransactionType;
@ExcelProperty("执行时间")
private LocalDateTime executeTime;
@ExcelProperty("生效日期")
private LocalDateTime activeDate;
@ExcelProperty("是否可用")
private String available;
@ExcelProperty("申请时间")
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
private LocalDateTime dueTime;
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty("用户组")
private String userGroupCode;
@ExcelProperty("接口类型")
private String interfaceType;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("扩展属性")
private String extraProperties;
@ExcelProperty("地点ID")
private String siteId;
}

75
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java

@ -0,0 +1,75 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 拆包记录主 Excel 导出 Request VO,参数和 PackagesplitMainPageReqVO 是一致的")
@Data
public class PackagesplitMainExportReqVO {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "1")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "2")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "2")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "19009")
private String siteId;
}

77
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java

@ -0,0 +1,77 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 拆包记录主分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitMainPageReqVO extends PageParam {
@Schema(description = "仓库代码")
private String warehouseCode;
@Schema(description = "明细")
private String details;
@Schema(description = "出库事务类型", example = "1")
private String outTransactionType;
@Schema(description = "入库事务类型", example = "1")
private String inTransactionType;
@Schema(description = "执行时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] executeTime;
@Schema(description = "生效日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activeDate;
@Schema(description = "是否可用")
private String available;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] requestTime;
@Schema(description = "截止时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueTime;
@Schema(description = "部门")
private String departmentCode;
@Schema(description = "用户组")
private String userGroupCode;
@Schema(description = "接口类型", example = "2")
private String interfaceType;
@Schema(description = "单据号")
private String number;
@Schema(description = "业务类型", example = "2")
private String businessType;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "扩展属性")
private String extraProperties;
@Schema(description = "地点ID", example = "19009")
private String siteId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java

@ -0,0 +1,13 @@
package com.win.module.wms.controller.packagesplitmain.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 PackagesplitMainRespVO extends PackagesplitMainBaseVO {
}

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java

@ -0,0 +1,18 @@
package com.win.module.wms.controller.packagesplitmain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 拆包记录主更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class PackagesplitMainUpdateReqVO extends PackagesplitMainBaseVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15400")
@NotNull(message = "id不能为空")
private Long id;
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java

@ -140,6 +140,9 @@ public class PurchasereceiptRecordDetailBaseVO {
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java

@ -1,14 +1,12 @@
package com.win.module.wms.controller.purchasereturnRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -74,6 +72,9 @@ public class PurchasereturnRecordDetailBaseVO {
@Schema(description = "金额")
private BigDecimal amount;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java

@ -63,6 +63,9 @@ public class PutawayRecordDetailBaseVO {
@Schema(description = "到库区代码")
private String toAreaCode;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java

@ -107,4 +107,7 @@ public class RepleinshRecordDetailBaseVO {
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "主表ID")
private Long masterId;
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java

@ -3,10 +3,14 @@ package com.win.module.wms.controller.repleinshRecord.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import java.util.Map;
@Schema(description = "管理后台 - 补料记录子创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class RepleinshRecordDetailCreateReqVO extends RepleinshRecordDetailBaseVO {
@Schema(description = "子表记录数据")
private List<Map<String,String>> recordList;
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packagemergemain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO;
/**
* 合包记录子 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackagemergeDetailConvert {
PackagemergeDetailConvert INSTANCE = Mappers.getMapper(PackagemergeDetailConvert.class);
PackagemergeDetailDO convert(PackagemergeDetailCreateReqVO bean);
PackagemergeDetailDO convert(PackagemergeDetailUpdateReqVO bean);
PackagemergeDetailRespVO convert(PackagemergeDetailDO bean);
List<PackagemergeDetailRespVO> convertList(List<PackagemergeDetailDO> list);
PageResult<PackagemergeDetailRespVO> convertPage(PageResult<PackagemergeDetailDO> page);
List<PackagemergeDetailExcelVO> convertList02(List<PackagemergeDetailDO> list);
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packagemergemain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
/**
* 合包记录主 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackagemergeMainConvert {
PackagemergeMainConvert INSTANCE = Mappers.getMapper(PackagemergeMainConvert.class);
PackagemergeMainDO convert(PackagemergeMainCreateReqVO bean);
PackagemergeMainDO convert(PackagemergeMainUpdateReqVO bean);
PackagemergeMainRespVO convert(PackagemergeMainDO bean);
List<PackagemergeMainRespVO> convertList(List<PackagemergeMainDO> list);
PageResult<PackagemergeMainRespVO> convertPage(PageResult<PackagemergeMainDO> page);
List<PackagemergeMainExcelVO> convertList02(List<PackagemergeMainDO> list);
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packageovermain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO;
/**
* 翻包记录子 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackageoverDetailConvert {
PackageoverDetailConvert INSTANCE = Mappers.getMapper(PackageoverDetailConvert.class);
PackageoverDetailDO convert(PackageoverDetailCreateReqVO bean);
PackageoverDetailDO convert(PackageoverDetailUpdateReqVO bean);
PackageoverDetailRespVO convert(PackageoverDetailDO bean);
List<PackageoverDetailRespVO> convertList(List<PackageoverDetailDO> list);
PageResult<PackageoverDetailRespVO> convertPage(PageResult<PackageoverDetailDO> page);
List<PackageoverDetailExcelVO> convertList02(List<PackageoverDetailDO> list);
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packageovermain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
/**
* 翻包记录主 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackageoverMainConvert {
PackageoverMainConvert INSTANCE = Mappers.getMapper(PackageoverMainConvert.class);
PackageoverMainDO convert(PackageoverMainCreateReqVO bean);
PackageoverMainDO convert(PackageoverMainUpdateReqVO bean);
PackageoverMainRespVO convert(PackageoverMainDO bean);
List<PackageoverMainRespVO> convertList(List<PackageoverMainDO> list);
PageResult<PackageoverMainRespVO> convertPage(PageResult<PackageoverMainDO> page);
List<PackageoverMainExcelVO> convertList02(List<PackageoverMainDO> list);
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packagesplitmain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packagesplitmain.vo.*;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO;
/**
* 拆包记录子 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackagesplitDetailConvert {
PackagesplitDetailConvert INSTANCE = Mappers.getMapper(PackagesplitDetailConvert.class);
PackagesplitDetailDO convert(PackagesplitDetailCreateReqVO bean);
PackagesplitDetailDO convert(PackagesplitDetailUpdateReqVO bean);
PackagesplitDetailRespVO convert(PackagesplitDetailDO bean);
List<PackagesplitDetailRespVO> convertList(List<PackagesplitDetailDO> list);
PageResult<PackagesplitDetailRespVO> convertPage(PageResult<PackagesplitDetailDO> page);
List<PackagesplitDetailExcelVO> convertList02(List<PackagesplitDetailDO> list);
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java

@ -0,0 +1,34 @@
package com.win.module.wms.convert.packagesplitmain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.controller.packagesplitmain.vo.*;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO;
/**
* 拆包记录主 Convert
*
* @author 超级管理员
*/
@Mapper
public interface PackagesplitMainConvert {
PackagesplitMainConvert INSTANCE = Mappers.getMapper(PackagesplitMainConvert.class);
PackagesplitMainDO convert(PackagesplitMainCreateReqVO bean);
PackagesplitMainDO convert(PackagesplitMainUpdateReqVO bean);
PackagesplitMainRespVO convert(PackagesplitMainDO bean);
List<PackagesplitMainRespVO> convertList(List<PackagesplitMainDO> list);
PageResult<PackagesplitMainRespVO> convertPage(PageResult<PackagesplitMainDO> page);
List<PackagesplitMainExcelVO> convertList02(List<PackagesplitMainDO> list);
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java

@ -0,0 +1,136 @@
package com.win.module.wms.dal.dataobject.packagemergemain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 合包记录子 DO
*
* @author 超级管理员
*/
@TableName("record_packagemerge_detail")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackagemergeDetailDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 库位代码
*/
private String locationCode;
/**
* 库位组代码
*/
private String locationGroupCode;
/**
* 库区代码
*/
private String areaCode;
/**
* 从包装号
*/
private String fromPackingNumber;
/**
* 到包装号
*/
private String toPackingNumber;
/**
* 从批次
*/
private String fromBatch;
/**
* 到批次
*/
private String toBatch;
/**
* 从库存状态
*/
private String fromInventoryStatus;
/**
* 到库存状态
*/
private String toInventoryStatus;
/**
* 从器具号
*/
private String fromContainerNumber;
/**
* 到器具号
*/
private String toContainerNumber;
/**
* 从货主代码
*/
private String fromOwnerCode;
/**
* 到货主代码
*/
private String toOwnerCode;
/**
* 主表ID
*/
private Long masterId;
/**
* 单据号
*/
private String number;
/**
* 物品代码
*/
private String itemCode;
/**
* 备注
*/
private String remark;
/**
* 地点ID
*/
private String siteId;
/**
* 物品名称
*/
private String itemName;
/**
* 物品描述1
*/
private String itemDesc1;
/**
* 物品描述2
*/
private String itemDesc2;
/**
* 项目代码
*/
private String projectCode;
/**
* 到数量
*/
private BigDecimal toQty;
/**
* 从数量
*/
private BigDecimal fromQty;
/**
* 计量单位
*/
private String uom;
/**
* 接口类型
*/
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java

@ -0,0 +1,102 @@
package com.win.module.wms.dal.dataobject.packagemergemain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 合包记录主 DO
*
* @author 超级管理员
*/
@TableName("record_packagemerge_main")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackagemergeMainDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 仓库代码
*/
private String warehouseCode;
/**
* 明细
*/
private String details;
/**
* 出库事务类型
*/
private String outTransactionType;
/**
* 入库事务类型
*/
private String inTransactionType;
/**
* 执行时间
*/
private LocalDateTime executeTime;
/**
* 生效日期
*/
private LocalDateTime activeDate;
/**
* 是否可用
*/
private String available;
/**
* 申请时间
*/
private LocalDateTime requestTime;
/**
* 截止时间
*/
private LocalDateTime dueTime;
/**
* 部门
*/
private String departmentCode;
/**
* 用户组
*/
private String userGroupCode;
/**
* 接口类型
*/
private String interfaceType;
/**
* 单据号
*/
private String number;
/**
* 业务类型
*/
private String businessType;
/**
* 备注
*/
private String remark;
/**
* 扩展属性
*/
private String extraProperties;
/**
* 地点ID
*/
private String siteId;
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java

@ -0,0 +1,136 @@
package com.win.module.wms.dal.dataobject.packageovermain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 翻包记录子 DO
*
* @author 超级管理员
*/
@TableName("record_packageover_detail")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackageoverDetailDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 库位代码
*/
private String locationCode;
/**
* 库位组代码
*/
private String locationGroupCode;
/**
* 库区代码
*/
private String areaCode;
/**
* 从包装号
*/
private String fromPackingNumber;
/**
* 到包装号
*/
private String toPackingNumber;
/**
* 从批次
*/
private String fromBatch;
/**
* 到批次
*/
private String toBatch;
/**
* 从库存状态
*/
private String fromInventoryStatus;
/**
* 到库存状态
*/
private String toInventoryStatus;
/**
* 从器具号
*/
private String fromContainerNumber;
/**
* 到器具号
*/
private String toContainerNumber;
/**
* 从货主代码
*/
private String fromOwnerCode;
/**
* 到货主代码
*/
private String toOwnerCode;
/**
* 主表ID
*/
private Long masterId;
/**
* 单据号
*/
private String number;
/**
* 物品代码
*/
private String itemCode;
/**
* 备注
*/
private String remark;
/**
* 地点ID
*/
private String siteId;
/**
* 物品名称
*/
private String itemName;
/**
* 物品描述1
*/
private String itemDesc1;
/**
* 物品描述2
*/
private String itemDesc2;
/**
* 项目代码
*/
private String projectCode;
/**
* 到数量
*/
private BigDecimal toQty;
/**
* 从数量
*/
private BigDecimal fromQty;
/**
* 计量单位
*/
private String uom;
/**
* 接口类型
*/
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java

@ -0,0 +1,102 @@
package com.win.module.wms.dal.dataobject.packageovermain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 翻包记录主 DO
*
* @author 超级管理员
*/
@TableName("record_packageover_main")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackageoverMainDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 仓库代码
*/
private String warehouseCode;
/**
* 明细
*/
private String details;
/**
* 出库事务类型
*/
private String outTransactionType;
/**
* 入库事务类型
*/
private String inTransactionType;
/**
* 执行时间
*/
private LocalDateTime executeTime;
/**
* 生效日期
*/
private LocalDateTime activeDate;
/**
* 是否可用
*/
private String available;
/**
* 申请时间
*/
private LocalDateTime requestTime;
/**
* 截止时间
*/
private LocalDateTime dueTime;
/**
* 部门
*/
private String departmentCode;
/**
* 用户组
*/
private String userGroupCode;
/**
* 接口类型
*/
private String interfaceType;
/**
* 单据号
*/
private String number;
/**
* 业务类型
*/
private String businessType;
/**
* 备注
*/
private String remark;
/**
* 扩展属性
*/
private String extraProperties;
/**
* 地点ID
*/
private String siteId;
}

136
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java

@ -0,0 +1,136 @@
package com.win.module.wms.dal.dataobject.packagesplitmain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 拆包记录子 DO
*
* @author 超级管理员
*/
@TableName("record_packagesplit_detail")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackagesplitDetailDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 库位代码
*/
private String locationCode;
/**
* 库位组代码
*/
private String locationGroupCode;
/**
* 库区代码
*/
private String areaCode;
/**
* 从包装号
*/
private String fromPackingNumber;
/**
* 到包装号
*/
private String toPackingNumber;
/**
* 从批次
*/
private String fromBatch;
/**
* 到批次
*/
private String toBatch;
/**
* 从库存状态
*/
private String fromInventoryStatus;
/**
* 到库存状态
*/
private String toInventoryStatus;
/**
* 从器具号
*/
private String fromContainerNumber;
/**
* 到器具号
*/
private String toContainerNumber;
/**
* 从货主代码
*/
private String fromOwnerCode;
/**
* 到货主代码
*/
private String toOwnerCode;
/**
* 主表ID
*/
private Long masterId;
/**
* 单据号
*/
private String number;
/**
* 物品代码
*/
private String itemCode;
/**
* 备注
*/
private String remark;
/**
* 地点ID
*/
private String siteId;
/**
* 物品名称
*/
private String itemName;
/**
* 物品描述1
*/
private String itemDesc1;
/**
* 物品描述2
*/
private String itemDesc2;
/**
* 项目代码
*/
private String projectCode;
/**
* 到数量
*/
private BigDecimal toQty;
/**
* 从数量
*/
private BigDecimal fromQty;
/**
* 计量单位
*/
private String uom;
/**
* 接口类型
*/
private String interfaceType;
}

102
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java

@ -0,0 +1,102 @@
package com.win.module.wms.dal.dataobject.packagesplitmain;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 拆包记录主 DO
*
* @author 超级管理员
*/
@TableName("record_packagesplit_main")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PackagesplitMainDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 仓库代码
*/
private String warehouseCode;
/**
* 明细
*/
private String details;
/**
* 出库事务类型
*/
private String outTransactionType;
/**
* 入库事务类型
*/
private String inTransactionType;
/**
* 执行时间
*/
private LocalDateTime executeTime;
/**
* 生效日期
*/
private LocalDateTime activeDate;
/**
* 是否可用
*/
private String available;
/**
* 申请时间
*/
private LocalDateTime requestTime;
/**
* 截止时间
*/
private LocalDateTime dueTime;
/**
* 部门
*/
private String departmentCode;
/**
* 用户组
*/
private String userGroupCode;
/**
* 接口类型
*/
private String interfaceType;
/**
* 单据号
*/
private String number;
/**
* 业务类型
*/
private String businessType;
/**
* 备注
*/
private String remark;
/**
* 扩展属性
*/
private String extraProperties;
/**
* 地点ID
*/
private String siteId;
}

84
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java

@ -0,0 +1,84 @@
package com.win.module.wms.dal.mysql.packagemergemain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packagemergemain.vo.*;
/**
* 合包记录子 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackagemergeDetailMapper extends BaseMapperX<PackagemergeDetailDO> {
default PageResult<PackagemergeDetailDO> selectPage(PackagemergeDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackagemergeDetailDO>()
.eqIfPresent(PackagemergeDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackagemergeDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackagemergeDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackagemergeDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackagemergeDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackagemergeDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackagemergeDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackagemergeDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackagemergeDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackagemergeDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackagemergeDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackagemergeDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackagemergeDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackagemergeDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackagemergeDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagemergeDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackagemergeDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagemergeDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagemergeDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackagemergeDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackagemergeDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackagemergeDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackagemergeDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackagemergeDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackagemergeDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackagemergeDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackagemergeDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackagemergeDetailDO::getId));
}
default List<PackagemergeDetailDO> selectList(PackagemergeDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackagemergeDetailDO>()
.eqIfPresent(PackagemergeDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackagemergeDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackagemergeDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackagemergeDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackagemergeDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackagemergeDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackagemergeDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackagemergeDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackagemergeDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackagemergeDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackagemergeDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackagemergeDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackagemergeDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackagemergeDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackagemergeDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagemergeDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackagemergeDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagemergeDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagemergeDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackagemergeDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackagemergeDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackagemergeDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackagemergeDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackagemergeDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackagemergeDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackagemergeDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackagemergeDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackagemergeDetailDO::getId));
}
}

72
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java

@ -0,0 +1,72 @@
package com.win.module.wms.dal.mysql.packagemergemain;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packagemergemain.vo.*;
/**
* 合包记录主 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackagemergeMainMapper extends BaseMapperX<PackagemergeMainDO> {
default PageResult<PackagemergeMainDO> selectPage(PackagemergeMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackagemergeMainDO>()
.eqIfPresent(PackagemergeMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackagemergeMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackagemergeMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackagemergeMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackagemergeMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackagemergeMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackagemergeMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackagemergeMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackagemergeMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackagemergeMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackagemergeMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackagemergeMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackagemergeMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagemergeMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackagemergeMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagemergeMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagemergeMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackagemergeMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackagemergeMainDO::getId));
}
default List<PackagemergeMainDO> selectList(PackagemergeMainExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackagemergeMainDO>()
.eqIfPresent(PackagemergeMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackagemergeMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackagemergeMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackagemergeMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackagemergeMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackagemergeMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackagemergeMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackagemergeMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackagemergeMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackagemergeMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackagemergeMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackagemergeMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackagemergeMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagemergeMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackagemergeMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagemergeMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagemergeMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackagemergeMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackagemergeMainDO::getId));
}
default PageResult<PackagemergeMainDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
}

84
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java

@ -0,0 +1,84 @@
package com.win.module.wms.dal.mysql.packageovermain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packageovermain.vo.*;
/**
* 翻包记录子 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackageoverDetailMapper extends BaseMapperX<PackageoverDetailDO> {
default PageResult<PackageoverDetailDO> selectPage(PackageoverDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackageoverDetailDO>()
.eqIfPresent(PackageoverDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackageoverDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackageoverDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackageoverDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackageoverDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackageoverDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackageoverDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackageoverDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackageoverDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackageoverDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackageoverDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackageoverDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackageoverDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackageoverDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackageoverDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackageoverDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackageoverDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackageoverDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackageoverDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackageoverDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackageoverDetailDO::getId));
}
default List<PackageoverDetailDO> selectList(PackageoverDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackageoverDetailDO>()
.eqIfPresent(PackageoverDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackageoverDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackageoverDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackageoverDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackageoverDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackageoverDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackageoverDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackageoverDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackageoverDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackageoverDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackageoverDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackageoverDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackageoverDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackageoverDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackageoverDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackageoverDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackageoverDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackageoverDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackageoverDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackageoverDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackageoverDetailDO::getId));
}
}

71
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java

@ -0,0 +1,71 @@
package com.win.module.wms.dal.mysql.packageovermain;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packageovermain.vo.*;
/**
* 翻包记录主 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackageoverMainMapper extends BaseMapperX<PackageoverMainDO> {
default PageResult<PackageoverMainDO> selectPage(PackageoverMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackageoverMainDO>()
.eqIfPresent(PackageoverMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackageoverMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackageoverMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackageoverMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackageoverMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackageoverMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackageoverMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackageoverMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackageoverMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackageoverMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackageoverMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackageoverMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackageoverMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackageoverMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackageoverMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackageoverMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackageoverMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackageoverMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackageoverMainDO::getId));
}
default List<PackageoverMainDO> selectList(PackageoverMainExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackageoverMainDO>()
.eqIfPresent(PackageoverMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackageoverMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackageoverMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackageoverMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackageoverMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackageoverMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackageoverMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackageoverMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackageoverMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackageoverMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackageoverMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackageoverMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackageoverMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackageoverMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackageoverMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackageoverMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackageoverMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackageoverMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackageoverMainDO::getId));
}
default PageResult<PackageoverMainDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
}

84
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java

@ -0,0 +1,84 @@
package com.win.module.wms.dal.mysql.packagesplitmain;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packagesplitmain.vo.*;
/**
* 拆包记录子 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackagesplitDetailMapper extends BaseMapperX<PackagesplitDetailDO> {
default PageResult<PackagesplitDetailDO> selectPage(PackagesplitDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackagesplitDetailDO>()
.eqIfPresent(PackagesplitDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackagesplitDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackagesplitDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackagesplitDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackagesplitDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackagesplitDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackagesplitDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackagesplitDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackagesplitDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackagesplitDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackagesplitDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackagesplitDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackagesplitDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackagesplitDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackagesplitDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagesplitDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackagesplitDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagesplitDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagesplitDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackagesplitDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackagesplitDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackagesplitDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackagesplitDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackagesplitDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackagesplitDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackagesplitDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackagesplitDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackagesplitDetailDO::getId));
}
default List<PackagesplitDetailDO> selectList(PackagesplitDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackagesplitDetailDO>()
.eqIfPresent(PackagesplitDetailDO::getLocationCode, reqVO.getLocationCode())
.eqIfPresent(PackagesplitDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())
.eqIfPresent(PackagesplitDetailDO::getAreaCode, reqVO.getAreaCode())
.eqIfPresent(PackagesplitDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(PackagesplitDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
.eqIfPresent(PackagesplitDetailDO::getFromBatch, reqVO.getFromBatch())
.eqIfPresent(PackagesplitDetailDO::getToBatch, reqVO.getToBatch())
.eqIfPresent(PackagesplitDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus())
.eqIfPresent(PackagesplitDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus())
.eqIfPresent(PackagesplitDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(PackagesplitDetailDO::getToContainerNumber, reqVO.getToContainerNumber())
.eqIfPresent(PackagesplitDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(PackagesplitDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
.eqIfPresent(PackagesplitDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(PackagesplitDetailDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagesplitDetailDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(PackagesplitDetailDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagesplitDetailDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagesplitDetailDO::getSiteId, reqVO.getSiteId())
.likeIfPresent(PackagesplitDetailDO::getItemName, reqVO.getItemName())
.eqIfPresent(PackagesplitDetailDO::getItemDesc1, reqVO.getItemDesc1())
.eqIfPresent(PackagesplitDetailDO::getItemDesc2, reqVO.getItemDesc2())
.eqIfPresent(PackagesplitDetailDO::getProjectCode, reqVO.getProjectCode())
.eqIfPresent(PackagesplitDetailDO::getToQty, reqVO.getToQty())
.eqIfPresent(PackagesplitDetailDO::getFromQty, reqVO.getFromQty())
.eqIfPresent(PackagesplitDetailDO::getUom, reqVO.getUom())
.eqIfPresent(PackagesplitDetailDO::getInterfaceType, reqVO.getInterfaceType())
.orderByDesc(PackagesplitDetailDO::getId));
}
}

71
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java

@ -0,0 +1,71 @@
package com.win.module.wms.dal.mysql.packagesplitmain;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO;
import org.apache.ibatis.annotations.Mapper;
import com.win.module.wms.controller.packagesplitmain.vo.*;
/**
* 拆包记录主 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface PackagesplitMainMapper extends BaseMapperX<PackagesplitMainDO> {
default PageResult<PackagesplitMainDO> selectPage(PackagesplitMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PackagesplitMainDO>()
.eqIfPresent(PackagesplitMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackagesplitMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackagesplitMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackagesplitMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackagesplitMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackagesplitMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackagesplitMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackagesplitMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackagesplitMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackagesplitMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackagesplitMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackagesplitMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackagesplitMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagesplitMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackagesplitMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagesplitMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagesplitMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackagesplitMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackagesplitMainDO::getId));
}
default List<PackagesplitMainDO> selectList(PackagesplitMainExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<PackagesplitMainDO>()
.eqIfPresent(PackagesplitMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(PackagesplitMainDO::getDetails, reqVO.getDetails())
.eqIfPresent(PackagesplitMainDO::getOutTransactionType, reqVO.getOutTransactionType())
.eqIfPresent(PackagesplitMainDO::getInTransactionType, reqVO.getInTransactionType())
.betweenIfPresent(PackagesplitMainDO::getExecuteTime, reqVO.getExecuteTime())
.betweenIfPresent(PackagesplitMainDO::getActiveDate, reqVO.getActiveDate())
.eqIfPresent(PackagesplitMainDO::getAvailable, reqVO.getAvailable())
.betweenIfPresent(PackagesplitMainDO::getRequestTime, reqVO.getRequestTime())
.betweenIfPresent(PackagesplitMainDO::getDueTime, reqVO.getDueTime())
.eqIfPresent(PackagesplitMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PackagesplitMainDO::getUserGroupCode, reqVO.getUserGroupCode())
.eqIfPresent(PackagesplitMainDO::getInterfaceType, reqVO.getInterfaceType())
.eqIfPresent(PackagesplitMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PackagesplitMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PackagesplitMainDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PackagesplitMainDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PackagesplitMainDO::getExtraProperties, reqVO.getExtraProperties())
.eqIfPresent(PackagesplitMainDO::getSiteId, reqVO.getSiteId())
.orderByDesc(PackagesplitMainDO::getId));
}
default PageResult<PackagesplitMainDO> selectSenior(CustomConditions conditions) {
return selectPage(conditions, QueryWrapperUtils.structure(conditions));
}
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java

@ -104,4 +104,9 @@ public interface CountJobMainService {
*/
String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO);
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getCountJobCountPda();
}

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@ -265,6 +265,13 @@ public class CountJobMainServiceImpl implements CountJobMainService {
return number;
}
@Override
public Long getCountJobCountPda() {
QueryWrapper<CountJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return countJobMainMapper.selectCount(queryWrapper);
}
private CountJobMainDO validateCountJobMainExists(Long id) {
CountJobMainDO countJobMainDO = countJobMainMapper.selectById(id);
if (countJobMainDO == null) {

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java

@ -86,6 +86,14 @@ public interface CountRequestMainService {
*/
Integer closeCountRequestMain(Long id);
/**
* 重新添加盘点申请主
*
* @param id 退货申请主ID
* @return 更新数量
*/
Integer reAddCountRequestMain(Long id);
/**
* 提交盘点申请主
*
@ -109,12 +117,12 @@ public interface CountRequestMainService {
*/
Integer handleCountRequestMain(Long id);
/**
* 审批拒绝盘点申请主
* 审批驳回盘点申请主
*
* @param id 盘点申请主ID
* @return 更新数量
*/
Integer abortCountRequestMain(Long id);
Integer refusedCountRequestMain(Long id);
/**
* 生成重盘任务
*

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@ -277,6 +277,21 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
return countRequestMainMapper.updateById(mainDO);
}
@Override
@Transactional
public Integer reAddCountRequestMain(Long id) {
// 校验存在存在下级单据
CountRequestMainDO mainDO = validateCountRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.reAdd();
if (!flag) {
throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_RE_ADD);
}
mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
trendsApi.createTrends(id, "countRequest", "打开了盘点申请", TrendsTypeEnum.UPDATE);
return countRequestMainMapper.updateById(mainDO);
}
@Override
@Transactional
public Integer submitCountRequestMain(Long id) {
@ -334,7 +349,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
@Override
@Transactional
public Integer abortCountRequestMain(Long id) {
public Integer refusedCountRequestMain(Long id) {
// 校验存在
CountRequestMainDO mainDO = validateCountRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java

@ -55,7 +55,7 @@ public interface CountadjustRequestMainService {
Integer closeCountadjustRequestMain(Long id);
/**
* 重新添加退货申请主
* 重新添加盘点调整申请主
*
* @param id 退货申请主ID
* @return 更新数量

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java

@ -1,19 +1,21 @@
package com.win.module.wms.service.customerreturnJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
import org.springframework.lang.Nullable;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 客户退货任务主 Service 接口
*
@ -142,4 +144,10 @@ public interface CustomerreturnJobMainService {
* @return
*/
String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO);
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getCustomerreturnJobCountPda();
}

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java

@ -3,28 +3,27 @@ package com.win.module.wms.service.customerreturnJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailUpdateReqVO;
import com.win.module.wms.controller.customerreturnJob.vo.*;
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO;
import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO;
import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper;
import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordDetailMapper;
import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordMainMapper;
import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestMainMapper;
@ -39,23 +38,18 @@ import com.win.module.wms.service.transaction.TransactionService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert;
import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS;
import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR;
/**
* 客户退货任务主 Service 实现类
@ -350,4 +344,12 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
trendsApi.createTrends(customerreturnJobMainDO.getId(), "CustomerRejectJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE);
return number;
}
@Override
public Long getCustomerreturnJobCountPda() {
QueryWrapper<CustomerreturnJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return customerreturnJobMainMapper.selectCount(queryWrapper);
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java

@ -291,7 +291,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
//添加库存事务list
TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO);
TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java

@ -1,19 +1,21 @@
package com.win.module.wms.service.deliverJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
import org.springframework.lang.Nullable;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 发货任务主 Service 接口
*
@ -122,26 +124,32 @@ public interface DeliverJobMainService {
* @param id
* @return
*/
public Integer closeDeliverJobMain(Long id);
Integer closeDeliverJobMain(Long id);
/**
* 承接
* @param id
* @return
*/
public Integer acceptDeliverJobMain(Long id);
Integer acceptDeliverJobMain(Long id);
/**
* 取消
* @param id
* @return
*/
public Integer abandonDeliverJobMain(Long id);
Integer abandonDeliverJobMain(Long id);
/**
* 执行
* @param updateReqVO
* @return
*/
public String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO);
String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO);
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getDeliverJobCountPda();
}

28
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java

@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.serialnumber.SerialNumberApi;
@ -13,14 +14,11 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe
import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO;
import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO;
import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO;
import com.win.module.wms.controller.deliverJob.vo.*;
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert;
import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert;
import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO;
@ -34,6 +32,7 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper;
import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper;
import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper;
import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordMainMapper;
import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper;
@ -42,7 +41,6 @@ import com.win.module.wms.enums.job.JobStatusState;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestMainService;
import com.win.module.wms.service.customersettleRequest.CustomersettleRequestMainService;
import com.win.module.wms.service.deliverPlan.DeliverPlanMainService;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchase.PurchaseMainService;
@ -52,23 +50,18 @@ import com.win.module.wms.service.transaction.TransactionService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_NOT_EXISTS;
import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_STATUS_ERROR;
/**
* 发货任务主 Service 实现类
@ -443,4 +436,11 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
trendsApi.createTrends(deliverJobMainDO.getId(), "deliverJob", "执行了发货任务", TrendsTypeEnum.UPDATE);
return number;
}
@Override
public Long getDeliverJobCountPda() {
QueryWrapper<DeliverJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return deliverJobMainMapper.selectCount(queryWrapper);
}
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java

@ -117,4 +117,10 @@ public interface InspectJobMainService {
* @return 未处理的任务数
*/
Long getInspectJobCount();
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getInspectJobCountPda();
}

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@ -422,6 +422,13 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
return inspectJobMainMapper.selectCount(queryWrapper);
}
@Override
public Long getInspectJobCountPda() {
QueryWrapper<InspectJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return inspectJobMainMapper.selectCount(queryWrapper);
}
private InspectJobMainDO validateInspectJobMainExists(Long id) {
InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectById(id);
if (inspectJobMainDO == null) {

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@ -18,14 +18,10 @@ import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -47,6 +43,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
@ -115,6 +112,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
private ExpectoutService expectoutService;
@Resource
private ExpectinService expectinService;
@Resource
private InspectRecordMainService inspectRecordMainService;
@Override
@Transactional
@ -377,30 +376,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
* @param detailDOList 收货检验子
*/
private void generateJob(InspectRequestMainDO mainDO, List<InspectRequestDetailDO> detailDOList) {
//跳过任务直接生成记录
if("TRUE".equals(mainDO.getDirectCreateRecord())) {
InspectRecordMainCreateReqVO inspectRecordMainCreateReqVO = new InspectRecordMainCreateReqVO();
BeanUtils.copyProperties(mainDO, inspectRecordMainCreateReqVO);
inspectRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode());
inspectRecordMainCreateReqVO.setNumber(number);
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
inspectRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
inspectRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
inspectRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
inspectRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
inspectRecordMainCreateReqVO.setId(null);
inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO));
for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO();
BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO);
inspectRecordDetailCreateReqVO.setNumber(number);
inspectRecordDetailMapper.insert(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetailCreateReqVO));
}
return;
}
//检验不能跳过任务直接生成记录
List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java

@ -1,18 +1,19 @@
package com.win.module.wms.service.inventorymoveJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO;
import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO;
import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO;
import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
import org.springframework.lang.Nullable;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 库存转移任务主 Service 接口
*
@ -102,28 +103,34 @@ public interface InventorymoveJobMainService {
* @param id
* @return
*/
public Integer closeInventorymoveJobMain(Long id);
Integer closeInventorymoveJobMain(Long id);
/**
* 承接
* @param id
* @return
*/
public Integer acceptInventorymoveJobMain(Long id);
Integer acceptInventorymoveJobMain(Long id);
/**
* 取消
* @param id
* @return
*/
public Integer abandonInventorymoveJobMain(Long id);
Integer abandonInventorymoveJobMain(Long id);
/**
* 执行
* @param updateReqVO
* @return
*/
public String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO);
String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO);
List<InventorymoveJobMainDO> getInventorymoveJobMainList(CustomConditions conditions);
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getInventorymoveJobCountPda();
}

28
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java

@ -3,26 +3,25 @@ package com.win.module.wms.service.inventorymoveJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
import com.win.module.wms.controller.inventorymoveJob.vo.*;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailUpdateReqVO;
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO;
import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO;
import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO;
import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO;
import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper;
import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper;
import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordDetailMapper;
import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordMainMapper;
import com.win.module.wms.enums.job.JobStatusEnum;
@ -35,22 +34,14 @@ import com.win.module.wms.service.transaction.TransactionService;
import com.win.module.wms.util.JobUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert;
import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
@ -155,7 +146,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
@Override
public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) {
QueryWrapper queryWrapper = new QueryWrapper();
QueryWrapper<InventorymoveJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("number", pnumber);
queryWrapper.eq("status", pstatus);
InventorymoveJobMainDO inventorymoveJobMainDO = inventorymoveJobMainMapper.selectOne(queryWrapper);
@ -171,6 +162,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
return inventorymoveJobMainMapper.selectSeniorList(conditions);
}
@Override
public Long getInventorymoveJobCountPda() {
QueryWrapper<InventorymoveJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return inventorymoveJobMainMapper.selectCount(queryWrapper);
}
@Override
public Map<String, Integer> getCountByStatus(Collection<String> types) {
Long l = inventorymoveJobMainMapper.selectListCount(types);

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java

@ -109,4 +109,10 @@ public interface IssueJobMainService {
* @return 未处理的任务数
*/
Long getIssueJobCount();
/**
* pda未处理的任务数
* @return pda未处理的任务数
*/
Long getIssueJobCountPda();
}

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java

@ -377,6 +377,13 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
return issueJobMainMapper.selectCount(queryWrapper);
}
@Override
public Long getIssueJobCountPda() {
QueryWrapper<IssueJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return issueJobMainMapper.selectCount(queryWrapper);
}
/**
* 创建 生产收料任务
* @param issueRecordMainDO

71
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java

@ -0,0 +1,71 @@
package com.win.module.wms.service.packagemergemain;
import java.util.*;
import javax.validation.*;
import com.win.module.wms.controller.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO;
import com.win.framework.common.pojo.PageResult;
/**
* 合包记录子 Service 接口
*
* @author 超级管理员
*/
public interface PackagemergeDetailService {
/**
* 创建合包记录子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPackagemergeDetail(@Valid PackagemergeDetailCreateReqVO createReqVO);
/**
* 更新合包记录子
*
* @param updateReqVO 更新信息
*/
Integer updatePackagemergeDetail(@Valid PackagemergeDetailUpdateReqVO updateReqVO);
/**
* 删除合包记录子
*
* @param id 编号
*/
Integer deletePackagemergeDetail(Long id);
/**
* 获得合包记录子
*
* @param id 编号
* @return 合包记录子
*/
PackagemergeDetailDO getPackagemergeDetail(Long id);
/**
* 获得合包记录子列表
*
* @param ids 编号
* @return 合包记录子列表
*/
List<PackagemergeDetailDO> getPackagemergeDetailList(Collection<Long> ids);
/**
* 获得合包记录子分页
*
* @param pageReqVO 分页查询
* @return 合包记录子分页
*/
PageResult<PackagemergeDetailDO> getPackagemergeDetailPage(PackagemergeDetailPageReqVO pageReqVO);
/**
* 获得合包记录子列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 合包记录子列表
*/
List<PackagemergeDetailDO> getPackagemergeDetailList(PackagemergeDetailExportReqVO exportReqVO);
}

82
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java

@ -0,0 +1,82 @@
package com.win.module.wms.service.packagemergemain;
import com.win.module.wms.controller.packagemergemain.vo.*;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.packagemergemain.PackagemergeDetailConvert;
import com.win.module.wms.dal.mysql.packagemergemain.PackagemergeDetailMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGEMERGE_DETAIL_NOT_EXISTS;
/**
* 合包记录子 Service 实现类
*
* @author 超级管理员
*/
@Service
@Validated
public class PackagemergeDetailServiceImpl implements PackagemergeDetailService {
@Resource
private PackagemergeDetailMapper packagemergeDetailMapper;
@Override
public Long createPackagemergeDetail(PackagemergeDetailCreateReqVO createReqVO) {
// 插入
PackagemergeDetailDO packagemergeDetail = PackagemergeDetailConvert.INSTANCE.convert(createReqVO);
packagemergeDetailMapper.insert(packagemergeDetail);
// 返回
return packagemergeDetail.getId();
}
@Override
public Integer updatePackagemergeDetail(PackagemergeDetailUpdateReqVO updateReqVO) {
// 校验存在
validatePackagemergeDetailExists(updateReqVO.getId());
// 更新
PackagemergeDetailDO updateObj = PackagemergeDetailConvert.INSTANCE.convert(updateReqVO);
return packagemergeDetailMapper.updateById(updateObj);
}
@Override
public Integer deletePackagemergeDetail(Long id) {
// 校验存在
validatePackagemergeDetailExists(id);
// 删除
return packagemergeDetailMapper.deleteById(id);
}
private void validatePackagemergeDetailExists(Long id) {
if (packagemergeDetailMapper.selectById(id) == null) {
throw exception(PACKAGEMERGE_DETAIL_NOT_EXISTS);
}
}
@Override
public PackagemergeDetailDO getPackagemergeDetail(Long id) {
return packagemergeDetailMapper.selectById(id);
}
@Override
public List<PackagemergeDetailDO> getPackagemergeDetailList(Collection<Long> ids) {
return packagemergeDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<PackagemergeDetailDO> getPackagemergeDetailPage(PackagemergeDetailPageReqVO pageReqVO) {
return packagemergeDetailMapper.selectPage(pageReqVO);
}
@Override
public List<PackagemergeDetailDO> getPackagemergeDetailList(PackagemergeDetailExportReqVO exportReqVO) {
return packagemergeDetailMapper.selectList(exportReqVO);
}
}

73
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java

@ -0,0 +1,73 @@
package com.win.module.wms.service.packagemergemain;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
import com.win.framework.common.pojo.PageResult;
/**
* 合包记录主 Service 接口
*
* @author 超级管理员
*/
public interface PackagemergeMainService {
/**
* 创建合包记录主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPackagemergeMain(@Valid PackagemergeMainCreateReqVO createReqVO);
/**
* 更新合包记录主
*
* @param updateReqVO 更新信息
*/
Integer updatePackagemergeMain(@Valid PackagemergeMainUpdateReqVO updateReqVO);
/**
* 删除合包记录主
*
* @param id 编号
*/
Integer deletePackagemergeMain(Long id);
/**
* 获得合包记录主
*
* @param id 编号
* @return 合包记录主
*/
PackagemergeMainDO getPackagemergeMain(Long id);
/**
* 获得合包记录主列表
*
* @param ids 编号
* @return 合包记录主列表
*/
List<PackagemergeMainDO> getPackagemergeMainList(Collection<Long> ids);
/**
* 获得合包记录主分页
*
* @param pageReqVO 分页查询
* @return 合包记录主分页
*/
PageResult<PackagemergeMainDO> getPackagemergeMainPage(PackagemergeMainPageReqVO pageReqVO);
/**
* 获得合包记录主列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 合包记录主列表
*/
List<PackagemergeMainDO> getPackagemergeMainList(PackagemergeMainExportReqVO exportReqVO);
PageResult<PackagemergeMainDO> getPackagemergeMainSenior(CustomConditions conditions);
}

87
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java

@ -0,0 +1,87 @@
package com.win.module.wms.service.packagemergemain;
import com.win.framework.common.pojo.CustomConditions;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.controller.packagemergemain.vo.*;
import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert;
import com.win.module.wms.dal.mysql.packagemergemain.PackagemergeMainMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
/**
* 合包记录主 Service 实现类
*
* @author 超级管理员
*/
@Service
@Validated
public class PackagemergeMainServiceImpl implements PackagemergeMainService {
@Resource
private PackagemergeMainMapper packagemergeMainMapper;
@Override
public Long createPackagemergeMain(PackagemergeMainCreateReqVO createReqVO) {
// 插入
PackagemergeMainDO packagemergeMain = PackagemergeMainConvert.INSTANCE.convert(createReqVO);
packagemergeMainMapper.insert(packagemergeMain);
// 返回
return packagemergeMain.getId();
}
@Override
public Integer updatePackagemergeMain(PackagemergeMainUpdateReqVO updateReqVO) {
// 校验存在
validatePackagemergeMainExists(updateReqVO.getId());
// 更新
PackagemergeMainDO updateObj = PackagemergeMainConvert.INSTANCE.convert(updateReqVO);
return packagemergeMainMapper.updateById(updateObj);
}
@Override
public Integer deletePackagemergeMain(Long id) {
// 校验存在
validatePackagemergeMainExists(id);
// 删除
return packagemergeMainMapper.deleteById(id);
}
private void validatePackagemergeMainExists(Long id) {
if (packagemergeMainMapper.selectById(id) == null) {
throw exception(PACKAGEMERGE_MAIN_NOT_EXISTS);
}
}
@Override
public PackagemergeMainDO getPackagemergeMain(Long id) {
return packagemergeMainMapper.selectById(id);
}
@Override
public List<PackagemergeMainDO> getPackagemergeMainList(Collection<Long> ids) {
return packagemergeMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<PackagemergeMainDO> getPackagemergeMainPage(PackagemergeMainPageReqVO pageReqVO) {
return packagemergeMainMapper.selectPage(pageReqVO);
}
@Override
public List<PackagemergeMainDO> getPackagemergeMainList(PackagemergeMainExportReqVO exportReqVO) {
return packagemergeMainMapper.selectList(exportReqVO);
}
@Override
public PageResult<PackagemergeMainDO> getPackagemergeMainSenior(CustomConditions conditions) {
return packagemergeMainMapper.selectSenior(conditions);
}
}

71
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java

@ -0,0 +1,71 @@
package com.win.module.wms.service.packageovermain;
import java.util.*;
import javax.validation.*;
import com.win.module.wms.controller.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO;
import com.win.framework.common.pojo.PageResult;
/**
* 翻包记录子 Service 接口
*
* @author 超级管理员
*/
public interface PackageoverDetailService {
/**
* 创建翻包记录子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPackageoverDetail(@Valid PackageoverDetailCreateReqVO createReqVO);
/**
* 更新翻包记录子
*
* @param updateReqVO 更新信息
*/
Integer updatePackageoverDetail(@Valid PackageoverDetailUpdateReqVO updateReqVO);
/**
* 删除翻包记录子
*
* @param id 编号
*/
Integer deletePackageoverDetail(Long id);
/**
* 获得翻包记录子
*
* @param id 编号
* @return 翻包记录子
*/
PackageoverDetailDO getPackageoverDetail(Long id);
/**
* 获得翻包记录子列表
*
* @param ids 编号
* @return 翻包记录子列表
*/
List<PackageoverDetailDO> getPackageoverDetailList(Collection<Long> ids);
/**
* 获得翻包记录子分页
*
* @param pageReqVO 分页查询
* @return 翻包记录子分页
*/
PageResult<PackageoverDetailDO> getPackageoverDetailPage(PackageoverDetailPageReqVO pageReqVO);
/**
* 获得翻包记录子列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 翻包记录子列表
*/
List<PackageoverDetailDO> getPackageoverDetailList(PackageoverDetailExportReqVO exportReqVO);
}

83
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java

@ -0,0 +1,83 @@
package com.win.module.wms.service.packageovermain;
import com.win.module.wms.controller.packageovermain.vo.*;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.packageovermain.PackageoverDetailConvert;
import com.win.module.wms.dal.mysql.packageovermain.PackageoverDetailMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGEOVER_DETAIL_NOT_EXISTS;
/**
* 翻包记录子 Service 实现类
*
* @author 超级管理员
*/
@Service
@Validated
public class PackageoverDetailServiceImpl implements PackageoverDetailService {
@Resource
private PackageoverDetailMapper packageoverDetailMapper;
@Override
public Long createPackageoverDetail(PackageoverDetailCreateReqVO createReqVO) {
// 插入
PackageoverDetailDO packageoverDetail = PackageoverDetailConvert.INSTANCE.convert(createReqVO);
packageoverDetailMapper.insert(packageoverDetail);
// 返回
return packageoverDetail.getId();
}
@Override
public Integer updatePackageoverDetail(PackageoverDetailUpdateReqVO updateReqVO) {
// 校验存在
validatePackageoverDetailExists(updateReqVO.getId());
// 更新
PackageoverDetailDO updateObj = PackageoverDetailConvert.INSTANCE.convert(updateReqVO);
return packageoverDetailMapper.updateById(updateObj);
}
@Override
public Integer deletePackageoverDetail(Long id) {
// 校验存在
validatePackageoverDetailExists(id);
// 删除
return packageoverDetailMapper.deleteById(id);
}
private void validatePackageoverDetailExists(Long id) {
if (packageoverDetailMapper.selectById(id) == null) {
throw exception(PACKAGEOVER_DETAIL_NOT_EXISTS);
}
}
@Override
public PackageoverDetailDO getPackageoverDetail(Long id) {
return packageoverDetailMapper.selectById(id);
}
@Override
public List<PackageoverDetailDO> getPackageoverDetailList(Collection<Long> ids) {
return packageoverDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<PackageoverDetailDO> getPackageoverDetailPage(PackageoverDetailPageReqVO pageReqVO) {
return packageoverDetailMapper.selectPage(pageReqVO);
}
@Override
public List<PackageoverDetailDO> getPackageoverDetailList(PackageoverDetailExportReqVO exportReqVO) {
return packageoverDetailMapper.selectList(exportReqVO);
}
}

73
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java

@ -0,0 +1,73 @@
package com.win.module.wms.service.packageovermain;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
import com.win.framework.common.pojo.PageResult;
/**
* 翻包记录主 Service 接口
*
* @author 超级管理员
*/
public interface PackageoverMainService {
/**
* 创建翻包记录主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPackageoverMain(@Valid PackageoverMainCreateReqVO createReqVO);
/**
* 更新翻包记录主
*
* @param updateReqVO 更新信息
*/
Integer updatePackageoverMain(@Valid PackageoverMainUpdateReqVO updateReqVO);
/**
* 删除翻包记录主
*
* @param id 编号
*/
Integer deletePackageoverMain(Long id);
/**
* 获得翻包记录主
*
* @param id 编号
* @return 翻包记录主
*/
PackageoverMainDO getPackageoverMain(Long id);
/**
* 获得翻包记录主列表
*
* @param ids 编号
* @return 翻包记录主列表
*/
List<PackageoverMainDO> getPackageoverMainList(Collection<Long> ids);
/**
* 获得翻包记录主分页
*
* @param pageReqVO 分页查询
* @return 翻包记录主分页
*/
PageResult<PackageoverMainDO> getPackageoverMainPage(PackageoverMainPageReqVO pageReqVO);
/**
* 获得翻包记录主列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 翻包记录主列表
*/
List<PackageoverMainDO> getPackageoverMainList(PackageoverMainExportReqVO exportReqVO);
PageResult<PackageoverMainDO> getPackageoverMainSenior(CustomConditions conditions);
}

88
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java

@ -0,0 +1,88 @@
package com.win.module.wms.service.packageovermain;
import com.win.framework.common.pojo.CustomConditions;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.controller.packageovermain.vo.*;
import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.packageovermain.PackageoverMainConvert;
import com.win.module.wms.dal.mysql.packageovermain.PackageoverMainMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
/**
* 翻包记录主 Service 实现类
*
* @author 超级管理员
*/
@Service
@Validated
public class PackageoverMainServiceImpl implements PackageoverMainService {
@Resource
private PackageoverMainMapper packageoverMainMapper;
@Override
public Long createPackageoverMain(PackageoverMainCreateReqVO createReqVO) {
// 插入
PackageoverMainDO packageoverMain = PackageoverMainConvert.INSTANCE.convert(createReqVO);
packageoverMainMapper.insert(packageoverMain);
// 返回
return packageoverMain.getId();
}
@Override
public Integer updatePackageoverMain(PackageoverMainUpdateReqVO updateReqVO) {
// 校验存在
validatePackageoverMainExists(updateReqVO.getId());
// 更新
PackageoverMainDO updateObj = PackageoverMainConvert.INSTANCE.convert(updateReqVO);
return packageoverMainMapper.updateById(updateObj);
}
@Override
public Integer deletePackageoverMain(Long id) {
// 校验存在
validatePackageoverMainExists(id);
// 删除
return packageoverMainMapper.deleteById(id);
}
private void validatePackageoverMainExists(Long id) {
if (packageoverMainMapper.selectById(id) == null) {
throw exception(PACKAGEOVER_MAIN_NOT_EXISTS);
}
}
@Override
public PackageoverMainDO getPackageoverMain(Long id) {
return packageoverMainMapper.selectById(id);
}
@Override
public List<PackageoverMainDO> getPackageoverMainList(Collection<Long> ids) {
return packageoverMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<PackageoverMainDO> getPackageoverMainPage(PackageoverMainPageReqVO pageReqVO) {
return packageoverMainMapper.selectPage(pageReqVO);
}
@Override
public List<PackageoverMainDO> getPackageoverMainList(PackageoverMainExportReqVO exportReqVO) {
return packageoverMainMapper.selectList(exportReqVO);
}
@Override
public PageResult<PackageoverMainDO> getPackageoverMainSenior(CustomConditions conditions) {
return packageoverMainMapper.selectSenior(conditions);
}
}

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

Loading…
Cancel
Save