Browse Source

导入模板必填字段表示,主子表字段标识,补充筛选导出接口,当前完成至库存转移

master_hella_20240701
chenfang 1 year ago
parent
commit
ff764b88fa
  1. 1
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarExportReqVO.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarPageReqVO.java
  4. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarRespVO.java
  5. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java
  6. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicPageReqVO.java
  7. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicRespVO.java
  8. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java
  9. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java
  10. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomExportReqVO.java
  11. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomPageReqVO.java
  12. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomRespVO.java
  13. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java
  14. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java
  15. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeRespVO.java
  16. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java
  17. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java
  18. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierRespVO.java
  19. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java
  20. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java
  21. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java
  22. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailRespVO.java
  23. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java
  24. 59
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java
  25. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java
  26. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java
  27. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java
  28. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java
  29. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java
  30. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java
  31. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java
  32. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java
  33. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java
  34. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java
  35. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java
  36. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java
  37. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java
  38. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java
  39. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeExcelVO.java
  40. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeExportReqVO.java
  41. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeImportErrorVO.java
  42. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeImportExcelVo.java
  43. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangePageReqVO.java
  44. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeRespVO.java
  45. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerExcelVO.java
  46. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerExportReqVO.java
  47. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerImportErrorVO.java
  48. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerImportExcelVo.java
  49. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerPageReqVO.java
  50. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerRespVO.java
  51. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockExcelVO.java
  52. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockExportReqVO.java
  53. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockImportExcelVo.java
  54. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockPageReqVO.java
  55. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockRespVO.java
  56. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java
  57. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java
  58. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemImportExcelVO.java
  59. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java
  60. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java
  61. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java
  62. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java
  63. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java
  64. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java
  65. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExportReqVO.java
  66. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainPageReqVO.java
  67. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java
  68. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java
  69. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java
  70. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java
  71. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java
  72. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java
  73. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExportReqVO.java
  74. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainPageReqVO.java
  75. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java
  76. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java
  77. 50
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java
  78. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java
  79. 58
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingMainExcelVO.java
  80. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockExcelVO.java
  81. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockExportReqVO.java
  82. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockImportExcelVO.java
  83. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockPageReqVO.java
  84. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockRespVO.java
  85. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java
  86. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingExcelVO.java
  87. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingExportReqVO.java
  88. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingPageReqVO.java
  89. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingRespVO.java
  90. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/enterprise/vo/EnterpriseRespVO.java
  91. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java
  92. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java
  93. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java
  94. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java
  95. 26
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  96. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java
  97. 52
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java
  98. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java
  99. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java
  100. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

1
win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@ -93,4 +93,5 @@ public interface DictTypeConstants {
String UNPLANNED_RECEIPT_REASON="unplanned_receipt_reason";//计划外入库原因
String MANAGEMENT_MODE="management_mode";//管理精度
String PACK_UNIT_TYPE="pack_unit_type";//包装规格类型
String PREDICT_TIME_TYPE="predict_time_type";//预测时间类型
}

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

@ -51,7 +51,7 @@ public class AccountcalendarExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

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

@ -56,7 +56,7 @@ public class AccountcalendarPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

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

@ -16,7 +16,7 @@ public class AccountcalendarRespVO extends AccountcalendarBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java

@ -45,7 +45,7 @@ public class AreabasicExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicPageReqVO.java

@ -53,7 +53,7 @@ public class AreabasicPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicRespVO.java

@ -16,7 +16,7 @@ public class AreabasicRespVO extends AreabasicBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java

@ -23,6 +23,6 @@ public class BalanceRespVO extends BalanceBaseVO {
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeRespVO.java

@ -19,7 +19,7 @@ public class BarcodeRespVO extends BarcodeBaseVO {
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomExportReqVO.java

@ -52,7 +52,7 @@ public class BomExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomPageReqVO.java

@ -57,7 +57,7 @@ public class BomPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomRespVO.java

@ -16,7 +16,7 @@ public class BomRespVO extends BomBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java

@ -70,7 +70,7 @@ public class BusinesstypeExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否使用在途库")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java

@ -72,7 +72,7 @@ public class BusinesstypePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否使用在途库")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeRespVO.java

@ -13,7 +13,7 @@ public class BusinesstypeRespVO extends BusinesstypeBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java

@ -70,7 +70,7 @@ public class CarrierExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否可用")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java

@ -75,7 +75,7 @@ public class CarrierPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否可用")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierRespVO.java

@ -13,7 +13,7 @@ public class CarrierRespVO extends CarrierBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionRespVO.java

@ -13,7 +13,7 @@ public class ConditionRespVO extends ConditionBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationRespVO.java

@ -13,7 +13,7 @@ public class ConfigurationRespVO extends ConfigurationBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingRespVO.java

@ -13,6 +13,6 @@ public class ConfigurationsettingRespVO extends ConfigurationsettingBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -14,7 +14,7 @@ public class ContainerDetailRespVO extends ContainerDetailBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -14,7 +14,7 @@ public class ContainerMainRespVO extends ContainerMainBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
@Schema(description = "子表列表数据")

59
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java

@ -6,10 +6,16 @@ import com.win.framework.common.pojo.PageResult;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordMainExcelVO;
import com.win.module.wms.controller.containerinit.vo.*;
import com.win.module.wms.convert.containerBind.ContainerBindRecordMainConvert;
import com.win.module.wms.convert.containerinit.ContainerInitRecordMainConvert;
import com.win.module.wms.dal.dataobject.containerBind.ContainerBindRecordDetailDO;
import com.win.module.wms.dal.dataobject.containerBind.ContainerBindRecordMainDO;
import com.win.module.wms.dal.dataobject.containerinit.ContainerInitRecordDetailDO;
import com.win.module.wms.dal.dataobject.containerinit.ContainerInitRecordMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.containerinit.ContainerInitRecordDetailService;
import com.win.module.wms.service.containerinit.ContainerInitRecordMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -40,6 +46,9 @@ public class ContainerInitRecordMainController {
@Resource
private ContainerInitRecordMainService containerInitRecordMainService;
@Resource
private ContainerInitRecordDetailService containerInitRecordDetailService;
@PostMapping("/create")
@Operation(summary = "创建器具初始化记录主")
@PreAuthorize("@ss.hasPermission('wms:container-init-record-main:create')")
@ -96,32 +105,42 @@ public class ContainerInitRecordMainController {
@OperateLog(type = EXPORT)
public void exportContainerInitRecordMainExcel(@Valid ContainerInitRecordMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ContainerInitRecordMainDO> list = containerInitRecordMainService.getContainerInitRecordMainList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ContainerInitRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
// 导出 Excel
ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出器具初始化记录主子 Excel")
@PreAuthorize("@ss.hasPermission('wms:container-init-record-main:export')")
@OperateLog(type = EXPORT)
public void exportContainerInitRecordMainExcel(@Valid @RequestBody CustomConditions conditions,
HttpServletResponse response) throws IOException {
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ContainerInitRecordMainDO> list = containerInitRecordMainService.getContainerInitRecordMainList(conditions);
// 导出 Excel
ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainDO.class, list, mapDropDown);
}
private List<ContainerInitRecordMainExcelVO> getExcelVo(List<ContainerInitRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] componentContainerType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_TYPE);
mapDropDown.put(3, componentContainerType);
String[] componentContainerStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS);
mapDropDown.put(5, componentContainerStatus);
List<ContainerInitRecordMainExcelVO> list = containerInitRecordMainService.getContainerInitRecordMainList(exportReqVO);
// 导出 Excel
ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainExcelVO.class, list,mapDropDown);
List<ContainerInitRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for (ContainerInitRecordMainDO mainDO : list) {
List<ContainerInitRecordDetailDO> subList = containerInitRecordDetailService.selectListByID(mainDO.getId());
for (ContainerInitRecordDetailDO detailDO : subList) {
ContainerInitRecordMainExcelVO vo = ContainerInitRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
resultList.add(vo);
}
}
return resultList;
}
// @GetMapping("/export-excel-senior")
// @Operation(summary = "导出器具初始化记录主子 Excel")
// @PreAuthorize("@ss.hasPermission('wms:container-init-record-main:export')")
// @OperateLog(type = EXPORT)
// public void exportContainerInitRecordMainExcel(@Valid @RequestBody CustomConditions conditions,
// HttpServletResponse response) throws IOException {
// Map<Integer, String[]> mapDropDown = new HashMap<>();
// String[] componentContainerType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_TYPE);
// mapDropDown.put(3, componentContainerType);
// String[] componentContainerStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS);
// mapDropDown.put(5, componentContainerStatus);
// List<ContainerInitRecordMainExcelVO> list = containerInitRecordMainService.getContainerInitRecordMainList(conditions);
// // 导出 Excel
// ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainExcelVO.class, list,mapDropDown);
// }
//
@GetMapping("/get-import-template")
@Operation(summary = "获得导入器具初始化记录主模板")

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

@ -141,18 +141,18 @@ public class CountJobMainController {
private List<CountJobMainExcelVO> getExcelVo(List<CountJobMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] countStage = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.COUNT_STAGE);
mapDropDown.put(2, countStage);
mapDropDown.put(3, countStage);
String[] requestStatus = RequestStatusEnum.getStatusNameArray();
mapDropDown.put(7, requestStatus);
mapDropDown.put(9, requestStatus);
String[] jobStageStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STAGE_STATUS);
mapDropDown.put(9, jobStageStatus);
mapDropDown.put(11, jobStageStatus);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(17, locationType);
mapDropDown.put(18, locationType);
mapDropDown.put(19, locationType);
mapDropDown.put(20, locationType);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(38, inventoryStatus);
mapDropDown.put(39, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(45, uom);
mapDropDown.put(46, uom);
List<CountJobMainExcelVO> resultList = new ArrayList<>();
// 导出
for (CountJobMainDO mainDO : list) {

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java

@ -55,7 +55,7 @@ public class CountJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -103,7 +103,7 @@ public class CountJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "地点ID", example = "19294")

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.countJob.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
@ -20,6 +21,9 @@ import java.time.LocalDateTime;
@Data
public class CountJobMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("申请单号")
private String requestNumber;
@ -40,15 +44,19 @@ public class CountJobMainExcelVO {
private String locationCode;
@ExcelProperty("申请时间")
@ColumnWidth(value = 16)
private LocalDateTime requestTime;
@ExcelProperty("要求截止时间")
@ColumnWidth(value = 16)
private LocalDateTime requestDueTime;
@ExcelProperty(value = "状态", converter = RequestStatusConverter.class)
@DictFormat(DictTypeConstants.REQUEST_STATUS)
private String status;
@ExcelProperty("过期时间")
@ColumnWidth(value = 16)
private LocalDateTime expiredTime;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@ -68,12 +76,14 @@ public class CountJobMainExcelVO {
private String acceptUserId;
@ExcelProperty("承接时间")
@ColumnWidth(value = 16)
private LocalDateTime acceptTime;
@ExcelProperty("完成人用户ID")
private String completeUserId;
@ExcelProperty("完成时间")
@ColumnWidth(value = 16)
private LocalDateTime completeTime;
@ExcelProperty(value = "从库区类型范围", converter = DictConvert.class)
@ -84,9 +94,6 @@ public class CountJobMainExcelVO {
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String toAreaTypes;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -171,15 +178,17 @@ public class CountJobMainExcelVO {
private String detailRemark;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty("最后更新时间")
@ColumnWidth(value = 16)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
@ExcelProperty("最后更新者名称")
private String updater;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java

@ -49,7 +49,7 @@ public class CountJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -97,7 +97,7 @@ public class CountJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "地点ID", example = "19294")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java

@ -54,7 +54,7 @@ public class CountJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -102,7 +102,7 @@ public class CountJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "地点ID", example = "19294")

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

@ -123,9 +123,9 @@ public class CountPlanMainController {
private List<CountPlanMainExcelVO> getExcelVo(List<CountPlanMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] countType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.COUNT_TYPE);
mapDropDown.put(0, countType);
mapDropDown.put(1, countType);
String[] countDimension = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.COUNT_DIMENSION);
mapDropDown.put(2, countDimension);
mapDropDown.put(3, countDimension);
String[] planStatus = PlanStatusEnum.getStatusNameArray();
mapDropDown.put(12, planStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java

@ -19,6 +19,9 @@ import java.time.LocalDateTime;
@Data
public class CountPlanMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty(value = "盘点类型", converter = DictConvert.class)
@DictFormat(DictTypeConstants.COUNT_TYPE)
private String type;
@ -39,9 +42,6 @@ public class CountPlanMainExcelVO {
@ExcelProperty("库位忽略名单")
private String ignoreListOfLocation;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;

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

@ -100,13 +100,15 @@ public class CountRecordMainController {
private List<CountRecordMainExcelVO> getExcelVo(List<CountRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] countStage = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.COUNT_STAGE);
mapDropDown.put(3, countStage);
mapDropDown.put(4, countStage);
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(12, interfaceType);
mapDropDown.put(14, interfaceType);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(18, trueFalse);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(26, inventoryStatus);
mapDropDown.put(27, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(36, uom);
mapDropDown.put(37, uom);
List<CountRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(CountRecordMainDO mainDO : list) {

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

@ -14,7 +14,7 @@ public class CountRecordDetailRespVO extends CountRecordDetailBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java

@ -20,6 +20,9 @@ import java.time.LocalDateTime;
@Data
public class CountRecordMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("申请单号")
private String requestNumber;
@ -46,15 +49,19 @@ public class CountRecordMainExcelVO {
private String inTransactionType;
@ExcelProperty("执行时间")
@ColumnWidth(value = 16)
private LocalDateTime executeTime;
@ExcelProperty("生效日期")
@ColumnWidth(value = 16)
private LocalDateTime activeDate;
@ExcelProperty("申请时间")
@ColumnWidth(value = 16)
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
@ColumnWidth(value = 16)
private LocalDateTime dueTime;
@ExcelProperty("部门")
@ -67,16 +74,14 @@ public class CountRecordMainExcelVO {
@ExcelProperty("代码")
private String code;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("是否可用")
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String available;
@ExcelProperty("盘点明细号")
@ -111,6 +116,7 @@ public class CountRecordMainExcelVO {
private BigDecimal countQty;
@ExcelProperty("盘点时间")
@ColumnWidth(value = 16)
private LocalDateTime countTime;
@ExcelProperty("盘点人")

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.countRequest.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
@ -19,6 +20,9 @@ import java.time.LocalDateTime;
@Data
public class CountRequestMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("计划单号")
private String planNumber;
@ -32,9 +36,6 @@ public class CountRequestMainExcelVO {
@ExcelProperty("仓库代码")
private String warehouseCode;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -42,9 +43,11 @@ public class CountRequestMainExcelVO {
private String remark;
@ExcelProperty("申请时间")
@ColumnWidth(value = 16)
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
@ColumnWidth(value = 16)
private LocalDateTime dueTime;
@ExcelProperty("部门")
@ -114,12 +117,14 @@ public class CountRequestMainExcelVO {
private String detailRemark;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")
private String creator;
@ExcelProperty("最后更新时间")
@ColumnWidth(value = 16)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")

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

@ -102,10 +102,12 @@ public class CountadjustRecordMainController {
//组装vo
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(15, trueFalse);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(23, inventoryStatus);
mapDropDown.put(22, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(32, uom);
mapDropDown.put(31, uom);
List<CountadjustRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(CountadjustRecordMainDO mainDO : list) {

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java

@ -21,6 +21,10 @@ import java.time.LocalDateTime;
@Data
public class CountadjustRecordMainExcelVO {
@ExcelProperty("单据号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String number;
@ExcelProperty("盘点申请单号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String countRequestNumber;
@ -74,10 +78,6 @@ public class CountadjustRecordMainExcelVO {
@Colour(IndexedColors.LIGHT_YELLOW)
private String code;
@ExcelProperty("单据号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String number;
@ExcelProperty("业务类型")
@Colour(IndexedColors.LIGHT_YELLOW)
private String businessType;
@ -86,7 +86,8 @@ public class CountadjustRecordMainExcelVO {
@Colour(IndexedColors.LIGHT_YELLOW)
private String remark;
@ExcelProperty("是否可用")
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INTERFACE_TYPE)
@Colour(IndexedColors.LIGHT_YELLOW)
private String available;
@ -145,6 +146,7 @@ public class CountadjustRecordMainExcelVO {
private String itemCode;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者名称")

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.countadjustRequest.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
@ -18,15 +19,15 @@ import java.time.LocalDateTime;
@Data
public class CountadjustRequestMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("盘点申请单号")
private String countRequestNumber;
@ExcelProperty("仓库代码")
private String warehouseCode;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -34,15 +35,18 @@ public class CountadjustRequestMainExcelVO {
private String remark;
@ExcelProperty("申请时间")
@ColumnWidth(value = 16)
private LocalDateTime requestTime;
@ExcelProperty("截止时间")
@ColumnWidth(value = 16)
private LocalDateTime dueTime;
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty(value = "状态", converter = RequestStatusConverter.class)
@DictFormat(DictTypeConstants.REQUEST_STATUS)
private String status;
@ExcelProperty("自动提交")
@ -56,7 +60,7 @@ public class CountadjustRequestMainExcelVO {
@ExcelProperty("直接生成记录")
private String directCreateRecord;
//子表数据
@ExcelProperty("盘点明细号")
private String countDetailNumber;
@ -111,6 +115,7 @@ public class CountadjustRequestMainExcelVO {
private String itemCode;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeExcelVO.java

@ -49,7 +49,7 @@ public class CurrencyexchangeExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeExportReqVO.java

@ -40,7 +40,7 @@ public class CurrencyexchangeExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeImportErrorVO.java

@ -43,7 +43,7 @@ public class CurrencyexchangeImportErrorVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty(value = "导入状态", index = 0)

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeImportExcelVo.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.currencyexchange.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
@ -23,10 +24,12 @@ public class CurrencyexchangeImportExcelVo {
@ExcelProperty(value = "货币", converter = DictConvert.class)
@DictFormat(DictTypeConstants.CURRENCY)
@ExcelValid(message = "必填")
private String currency;
@ExcelProperty(value = "基础货币", converter = DictConvert.class)
@DictFormat(DictTypeConstants.BASIC_CURRENCY)
@ExcelValid(message = "必填")
private String basiccurrency;
@ExcelProperty("比率")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangePageReqVO.java

@ -45,7 +45,7 @@ public class CurrencyexchangePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeRespVO.java

@ -16,7 +16,7 @@ public class CurrencyexchangeRespVO extends CurrencyexchangeBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerExcelVO.java

@ -81,7 +81,7 @@ public class CustomerExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerExportReqVO.java

@ -73,7 +73,7 @@ public class CustomerExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerImportErrorVO.java

@ -77,7 +77,7 @@ public class CustomerImportErrorVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty(value = "导入状态", index = 0)

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerImportExcelVo.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.customer.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
@ -23,12 +24,14 @@ public class CustomerImportExcelVo {
@ExcelProperty("代码")
@ExcelValid(message = "必填")
private String code;
@ExcelProperty("名称")
private String name;
@ExcelProperty("简称")
@ExcelValid(message = "必填")
private String shortName;
@ExcelProperty("地址")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerPageReqVO.java

@ -78,7 +78,7 @@ public class CustomerPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerRespVO.java

@ -16,7 +16,7 @@ public class CustomerRespVO extends CustomerBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockExcelVO.java

@ -66,7 +66,7 @@ public class CustomerdockExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockExportReqVO.java

@ -60,7 +60,7 @@ public class CustomerdockExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockImportExcelVo.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.customerdock.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
@ -21,6 +22,7 @@ import java.time.LocalDateTime;
public class CustomerdockImportExcelVo {
@ExcelProperty("代码")
@ExcelValid(message = "必填")
private String code;
@ExcelProperty("名称")
@ -42,12 +44,14 @@ public class CustomerdockImportExcelVo {
private String contactPhone;
@ExcelProperty("客户代码")
@ExcelValid(message = "必填")
private String customerCode;
@ExcelProperty("仓库")
private String warehouseCode;
@ExcelProperty("默认库位")
@ExcelValid(message = "必填")
private String defaultLocationCode;
@ExcelProperty(value = "是否可用", converter = DictConvert.class)

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockPageReqVO.java

@ -65,7 +65,7 @@ public class CustomerdockPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockRespVO.java

@ -16,7 +16,7 @@ public class CustomerdockRespVO extends CustomerdockBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java

@ -70,7 +70,7 @@ public class CustomeritemExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java

@ -61,7 +61,7 @@ public class CustomeritemExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemImportExcelVO.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.customeritem.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
@ -21,9 +22,11 @@ import java.time.LocalDateTime;
public class CustomeritemImportExcelVO {
@ExcelProperty("客户代码")
@ExcelValid(message = "必填")
private String customerCode;
@ExcelProperty("物料代码")
@ExcelValid(message = "必填")
private String itemCode;
@ExcelProperty("客户物料代码")
@ -38,9 +41,11 @@ public class CustomeritemImportExcelVO {
@ExcelProperty(value = "客户包装单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.PACK_UNIT)
@ExcelValid(message = "必填")
private String packUnit;
@ExcelProperty("客户包装量")
@ExcelValid(message = "必填")
private BigDecimal packQty;
@ExcelProperty(value = "客户替代包装单位", converter = DictConvert.class)
@ -51,6 +56,7 @@ public class CustomeritemImportExcelVO {
private String altPackQty;
@ExcelProperty("每器具包装数")
@ExcelValid(message = "必填")
private Integer packQtyOfContainer;
@ExcelProperty(value = "是否可用", converter = DictConvert.class)

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java

@ -66,7 +66,7 @@ public class CustomeritemPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java

@ -16,7 +16,7 @@ public class CustomeritemRespVO extends CustomeritemBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -132,11 +132,11 @@ public class CustomerreceiptRecordMainController {
// 导出 Excel
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerreceiptRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "发货任务.xls", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown);
ExcelUtils.write(response, "客户收货记录.xls", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出客户退货任务 Excel")
@Operation(summary = "导出客户收货记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:export')")
@OperateLog(type = EXPORT)
public void exportCustomerreceiptRecordMainSeniorExcel(@Valid CustomerreceiptRecordMainExportReqVO exportReqVO,
@ -145,7 +145,7 @@ public class CustomerreceiptRecordMainController {
// 导出 Excel
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerreceiptRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "发货任务.xls", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown);
ExcelUtils.write(response, "客户收货记录.xls", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown);
}
private List<CustomerreceiptRecordMainExcelVO> getExcelVo(List<CustomerreceiptRecordMainDO> list, Map<Integer, String[]> mapDropDown) {

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

@ -151,7 +151,7 @@ public class CustomerreturnJobMainController {
// 导出 Excel
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerreturnJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "发货任务.xls", "数据", CustomerreturnJobMainExcelVO.class, resultList,mapDropDown);
ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, resultList,mapDropDown);
}
private List<CustomerreturnJobMainExcelVO> getExcelVo(List<CustomerreturnJobMainDO> list, Map<Integer, String[]> mapDropDown) {
@ -195,11 +195,6 @@ public class CustomerreturnJobMainController {
if(result==null) {
return success(result);
};
// CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO();
// reqVO.setMasterId(result.getId());
// List<CustomerreturnJobDetailDO> customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO);
// List<CustomerreturnJobDetailExcelVO> customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList);
// result.setSubList(customerreturnJobDetailExcelVOS);
List<CustomerreturnJobDetailDO> subList = customerreturnJobDetailService.selectList(id);
result.setSubList(subList);
return success(result);

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java

@ -78,7 +78,7 @@ public class CustomerreturnJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -127,7 +127,7 @@ public class CustomerreturnJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "从库区代码范围")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java

@ -77,7 +77,7 @@ public class CustomerreturnJobMainExcelVO {
@ColumnWidth(value = 22)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
@ExcelProperty("最后更新者名称")
private String updater;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@ -125,7 +125,7 @@ public class CustomerreturnJobMainExcelVO {
@ColumnWidth(value = 22)
private LocalDateTime createTime;
@ExcelProperty("创建者id")
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty("从库区代码范围")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExportReqVO.java

@ -65,7 +65,7 @@ public class CustomerreturnJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -113,7 +113,7 @@ public class CustomerreturnJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "从库区代码范围")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainPageReqVO.java

@ -67,7 +67,7 @@ public class CustomerreturnJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -115,7 +115,7 @@ public class CustomerreturnJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "从库区代码范围")

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

@ -142,7 +142,7 @@ public class CustomerreturnRecordMainController {
// 导出 Excel
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerreturnRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户收货申请.xls", "数据", CustomerreturnRecordMainExcelVO.class, resultList,mapDropDown);
ExcelUtils.write(response, "客户退货记录主.xls", "数据", CustomerreturnRecordMainExcelVO.class, resultList,mapDropDown);
}
private List<CustomerreturnRecordMainExcelVO> getExcelVo(List<CustomerreturnRecordMainDO> list, Map<Integer, String[]> mapDropDown) {

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

@ -14,7 +14,7 @@ public class CustomerreturnRecordMainRespVO extends CustomerreturnRecordMainBase
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -195,11 +195,11 @@ public class CustomerreturnRequestMainController {
List<CustomerreturnRequestImportVO> list = Arrays.asList();
Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
mapDropDown.put(3, transferMode);
mapDropDown.put(4, transferMode);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(10, uom);
mapDropDown.put(11, uom);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(11, inventoryStatus);
mapDropDown.put(12, inventoryStatus);
// 输出
ExcelUtils.write(response, "客户退货申请信息导入模板.xls", "客户退货申请信息列表", CustomerreturnRequestImportVO.class, list,mapDropDown);
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java

@ -2,13 +2,16 @@ package com.win.module.wms.controller.customerreturnRequest.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.Colour;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.math.BigDecimal;
@ -20,19 +23,29 @@ public class CustomerreturnRequestImportVO {
//主表字段
@ExcelProperty("单据号")
@ExcelValid(message = "必填")
@Colour(IndexedColors.LIGHT_YELLOW)
private String number;
@ExcelProperty("发货记录单号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String deliverRecordNumber;
@ExcelProperty("客户代码")
@Colour(IndexedColors.LIGHT_YELLOW)
private String customerCode;
@ExcelProperty("承运商")
@Colour(IndexedColors.LIGHT_YELLOW)
private String carrierCode;
@ExcelProperty(value = "运输方式", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRANSFER_MODE)
@Colour(IndexedColors.LIGHT_YELLOW)
private String transferMode;
@ExcelProperty("车牌号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String vehiclePlateNumber;
//子表字段

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java

@ -72,7 +72,7 @@ public class DeliverJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -121,7 +121,7 @@ public class DeliverJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "权限所属人员id")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java

@ -77,7 +77,7 @@ public class DeliverJobMainExcelVO {
@ColumnWidth(value = 22)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
@ExcelProperty("最后更新者名称")
private String updater;
@ExcelProperty(value = "任务阶段状态", converter = DictConvert.class)
@ -125,7 +125,7 @@ public class DeliverJobMainExcelVO {
@ColumnWidth(value = 22)
private LocalDateTime createTime;
@ExcelProperty("创建者id")
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty("权限所属人员id")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExportReqVO.java

@ -64,7 +64,7 @@ public class DeliverJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -112,7 +112,7 @@ public class DeliverJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "权限所属人员id")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainPageReqVO.java

@ -66,7 +66,7 @@ public class DeliverJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -114,7 +114,7 @@ public class DeliverJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "权限所属人员id")

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java

@ -2,13 +2,16 @@ package com.win.module.wms.controller.deliverPlan.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.Colour;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ -26,19 +29,25 @@ import java.time.LocalDateTime;
public class DeliverPlanMainImportVO {
@ExcelProperty("单据号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String number;
@ExcelProperty("客户")
@ExcelValid(message = "必填")
@Colour(IndexedColors.LIGHT_YELLOW)
private String customerCode;
@ExcelProperty("计划日期")
@Colour(IndexedColors.LIGHT_YELLOW)
private String planDate;
@ExcelProperty("开始日期")
@Colour(IndexedColors.LIGHT_YELLOW)
@ColumnWidth(value = 21)
private LocalDateTime beginTime;
@ExcelProperty("结束日期")
@Colour(IndexedColors.LIGHT_YELLOW)
@ColumnWidth(value = 21)
private LocalDateTime endTime;

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java

@ -2,7 +2,9 @@ package com.win.module.wms.controller.deliverRequest.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.Colour;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import java.math.BigDecimal;
@ -12,11 +14,11 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 采购索赔申请子 Excel VO
* 发货申请主 Excel VO
*
* @author 超级管理员
*/
@ -27,16 +29,22 @@ import lombok.experimental.Accessors;
public class DeliverRequestImportVO {
@ExcelProperty("单据号")
@ExcelValid(message = "必填")
@Colour(IndexedColors.LIGHT_YELLOW)
private String number;
@ExcelProperty("客户")
@ExcelValid(message = "必填")
@Colour(IndexedColors.LIGHT_YELLOW)
private String customerCode;
@ExcelProperty("截止时间")
@ColumnWidth(value = 21)
@Colour(IndexedColors.LIGHT_YELLOW)
private LocalDateTime dueTime;
@ExcelProperty("发货计划单号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String deliverPlanNumber;
//子表数据

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

@ -3,14 +3,19 @@ package com.win.module.wms.controller.demandforecasting;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.framework.excel.core.util.ConvertUtil;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.demandforecasting.vo.DemandforecastingMainExcelVO;
import com.win.module.wms.controller.demandforecasting.vo.*;
import com.win.module.wms.convert.demandforecasting.DemandforecastingMainConvert;
import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingDetailDO;
import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.demandforecasting.DemandforecastingDetailService;
import com.win.module.wms.service.demandforecasting.DemandforecastingMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -40,6 +45,8 @@ public class DemandforecastingMainController {
@Resource
private DemandforecastingMainService demandforecastingMainService;
@Resource
private DemandforecastingDetailService demandforecastingDetailService;
@Resource
private AdminUserApi userApi;
@ -114,14 +121,45 @@ public class DemandforecastingMainController {
public void exportDemandforecastingMainExcel(@Valid DemandforecastingMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<DemandforecastingMainDO> list = demandforecastingMainService.getDemandforecastingMainList(exportReqVO);
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<DemandforecastingMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "要货预测主.xls", "数据", DemandforecastingMainExcelVO.class, resultList,mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出要货预测主 Excel")
@PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:export')")
@OperateLog(type = EXPORT)
public void exportDemandforecastingMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<DemandforecastingMainDO> list = demandforecastingMainService.getDemandforecastingMainList(conditions);
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<DemandforecastingMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
// 导出 Excel
List<DemandforecastingMainExcelVO> datas = DemandforecastingMainConvert.INSTANCE.convertList02(list);
for(DemandforecastingMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
ExcelUtils.write(response, "发货申请.xlsx", "数据", DemandforecastingMainExcelVO.class, resultList, mapDropDown);
}
private List<DemandforecastingMainExcelVO> getExcelVo(List<DemandforecastingMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(13, available);
mapDropDown.put(26, available);
String[] predictTimeType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PREDICT_TIME_TYPE);
mapDropDown.put(14, predictTimeType);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(23, uom);
List<DemandforecastingMainExcelVO> resultList = new ArrayList<>();
// 导出
for(DemandforecastingMainDO mainDO : list) {
List<DemandforecastingDetailDO> subList = demandforecastingDetailService.selectListByID(mainDO.getId());
for(DemandforecastingDetailDO detailDO : subList) {
DemandforecastingMainExcelVO vo = DemandforecastingMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator()));
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "要货预测主.xls", "数据", DemandforecastingMainExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@ -132,8 +170,6 @@ public class DemandforecastingMainController {
Map<Integer, String[]> mapDropDown = new HashMap<>();
// String[] purchaseReturnReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PURCHASE_RETURN_REASON);
// mapDropDown.put(16, purchaseReturnReason);
// String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
// mapDropDown.put(25, uom);
// 输出
ExcelUtils.write(response, "要货预测信息导入模板.xlsx", "要货预测信息列表", DemandforecastingImportVO.class, list, mapDropDown);
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java

@ -2,16 +2,19 @@ package com.win.module.wms.controller.demandforecasting.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.Colour;
import com.win.framework.excel.core.annotations.ExcelValid;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.time.LocalDateTime;
/**
* 采购索赔申请 Excel VO
* 要货预测 Excel VO
*
* @author 超级管理员
*/
@ -22,9 +25,11 @@ import java.time.LocalDateTime;
public class DemandforecastingImportVO {
@ExcelProperty("供应商代码")
@Colour(IndexedColors.LIGHT_YELLOW)
private String supplierCode;
@ExcelProperty("版本号")
@Colour(IndexedColors.LIGHT_YELLOW)
private String version;
//子表数据
@ -32,14 +37,16 @@ public class DemandforecastingImportVO {
private String predictTimeType;
@ExcelProperty("预测日期")
@ColumnWidth(value = 16)
@ExcelValid(message = "必填")
private LocalDateTime predictTime;
@ExcelProperty("订单号")
@ColumnWidth(value = 16)
@ExcelValid(message = "必填")
private String po_number;
@ExcelProperty("订单行")
@ColumnWidth(value = 16)
@ExcelValid(message = "必填")
private LocalDateTime dueTime;
@ExcelProperty("物料代码")

58
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingMainExcelVO.java

@ -1,7 +1,10 @@
package com.win.module.wms.controller.demandforecasting.vo;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -22,6 +25,9 @@ import com.win.framework.excel.core.convert.DictConvert;
@Data
public class DemandforecastingMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("供应商代码")
private String supplierCode;
@ -29,11 +35,9 @@ public class DemandforecastingMainExcelVO {
private String version;
@ExcelProperty("发布时间")
@ColumnWidth(value = 16)
private LocalDateTime publishTime;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -41,21 +45,25 @@ public class DemandforecastingMainExcelVO {
private String remark;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")
private String creator;
@ExcelProperty("开始时间")
@ColumnWidth(value = 16)
private LocalDateTime beginTime;
@ExcelProperty("结束时间")
@ColumnWidth(value = 16)
private LocalDateTime endTime;
@ExcelProperty("状态")
private String status;
@ExcelProperty("最后更新时间")
@ColumnWidth(value = 16)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")
@ -64,5 +72,49 @@ public class DemandforecastingMainExcelVO {
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String available;
//子表
@ExcelProperty(value = "预测时间类型", converter = DictConvert.class)
@DictFormat("predict_time_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String predictTimeType;
@ExcelProperty("预测日期")
@ColumnWidth(value = 16)
private LocalDateTime predictTime;
@ExcelProperty("物料代码")
private String itemCode;
@ExcelProperty("订单号")
private String poNumber;
@ExcelProperty("订单行")
private String poLine;
@ExcelProperty("备注")
private String remarkDetail;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTimeDetail;
@ExcelProperty("创建者用户名")
private String creatorDetail;
@ExcelProperty("计划数量")
private BigDecimal planQty;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String uom;
@ExcelProperty("最后更新时间")
@ColumnWidth(value = 16)
private LocalDateTime updateTimeDetail;
@ExcelProperty("最后更新者用户名")
private String updaterDetail;
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String availableDetail;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockExcelVO.java

@ -67,7 +67,7 @@ public class DockExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockExportReqVO.java

@ -60,7 +60,7 @@ public class DockExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockImportExcelVO.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.dock.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.annotations.ExcelValid;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.AllArgsConstructor;
@ -20,6 +21,7 @@ import java.time.LocalDateTime;
public class DockImportExcelVO {
@ExcelProperty("代码")
@ExcelValid(message = "必填")
private String code;
@ExcelProperty("名称")
@ -33,12 +35,15 @@ public class DockImportExcelVO {
@ExcelProperty(value = "类型", converter = DictConvert.class)
@DictFormat(DictTypeConstants.DOCK_TYPE)
@ExcelValid(message = "必填")
private String type;
@ExcelProperty("仓库代码")
@ExcelValid(message = "必填")
private String warehouseCode;
@ExcelProperty("默认库位代码")
@ExcelValid(message = "必填")
private String defaultLocationCode;
@ExcelProperty("联系人姓名")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockPageReqVO.java

@ -65,7 +65,7 @@ public class DockPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockRespVO.java

@ -16,7 +16,7 @@ public class DockRespVO extends DockBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -17,6 +17,6 @@ public class SwitchRespVO extends SwitchBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingExcelVO.java

@ -66,7 +66,7 @@ public class DocumentsettingExcelVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty("是否可用")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingExportReqVO.java

@ -58,7 +58,7 @@ public class DocumentsettingExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否可用")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingPageReqVO.java

@ -60,7 +60,7 @@ public class DocumentsettingPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者ID")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "是否可用")

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingRespVO.java

@ -13,7 +13,7 @@ public class DocumentsettingRespVO extends DocumentsettingBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/enterprise/vo/EnterpriseRespVO.java

@ -16,7 +16,7 @@ public class EnterpriseRespVO extends EnterpriseBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java

@ -57,7 +57,7 @@ public class ExpectinExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

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

@ -14,7 +14,7 @@ public class ExpectinRespVO extends ExpectinBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java

@ -59,7 +59,7 @@ public class ExpectoutExcelVO {
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
@ExcelProperty("创建者名称")
private String creator;
}

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

@ -14,7 +14,7 @@ public class ExpectoutRespVO extends ExpectoutBaseVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "创建者名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String creator;
}

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

@ -103,9 +103,7 @@ public class InspectJobMainController {
private List<InspectJobMainExcelVO> getExcelVo(List<InspectJobMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] status = JobStatusEnum.getStatusNameArray();
mapDropDown.put(6, status);
String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
mapDropDown.put(6, transferMode);
mapDropDown.put(7, status);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(24, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
@ -114,17 +112,17 @@ public class InspectJobMainController {
mapDropDown.put(26, sampleMethod);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(27, uom);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(31, trueFalse);
mapDropDown.put(32, trueFalse);
mapDropDown.put(33, trueFalse);
mapDropDown.put(34, trueFalse);
mapDropDown.put(35, trueFalse);
mapDropDown.put(36, trueFalse);
mapDropDown.put(37, trueFalse);
mapDropDown.put(38, trueFalse);
mapDropDown.put(39, trueFalse);
mapDropDown.put(40, trueFalse);
// String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
// mapDropDown.put(31, trueFalse);
// mapDropDown.put(32, trueFalse);
// mapDropDown.put(33, trueFalse);
// mapDropDown.put(34, trueFalse);
// mapDropDown.put(35, trueFalse);
// mapDropDown.put(36, trueFalse);
// mapDropDown.put(37, trueFalse);
// mapDropDown.put(38, trueFalse);
// mapDropDown.put(39, trueFalse);
// mapDropDown.put(40, trueFalse);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(43, inventoryStatus);
List<InspectJobMainExcelVO> resultList = new ArrayList<>();

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java

@ -55,7 +55,7 @@ public class InspectJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -103,7 +103,7 @@ public class InspectJobMainBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)

52
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java

@ -1,6 +1,7 @@
package com.win.module.wms.controller.inspectJob.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
@ -19,6 +20,9 @@ import java.time.LocalDateTime;
@Data
public class InspectJobMainExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("申请单号")
private String requestNumber;
@ -32,15 +36,18 @@ public class InspectJobMainExcelVO {
private String warehouseCode;
@ExcelProperty("申请时间")
@ColumnWidth(value = 16)
private LocalDateTime requestTime;
@ExcelProperty("要求截止时间")
@ColumnWidth(value = 16)
private LocalDateTime requestDueTime;
@ExcelProperty(value = "状态", converter = JobStatusConverter.class)
private String status;
@ExcelProperty("过期时间")
@ColumnWidth(value = 16)
private LocalDateTime expiredTime;
@ExcelProperty("优先级")
@ -52,16 +59,18 @@ public class InspectJobMainExcelVO {
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty("承接人用户ID")
@ExcelProperty("承接人用户名称")
private String acceptUserId;
@ExcelProperty("承接时间")
@ColumnWidth(value = 16)
private LocalDateTime acceptTime;
@ExcelProperty("完成人用户ID")
@ExcelProperty("完成人用户名称")
private String completeUserId;
@ExcelProperty("完成时间")
@ColumnWidth(value = 16)
private LocalDateTime completeTime;
@ExcelProperty("从库区类型范围")
@ -70,9 +79,6 @@ public class InspectJobMainExcelVO {
@ExcelProperty("到库区类型范围")
private String toAreaTypes;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -116,46 +122,36 @@ public class InspectJobMainExcelVO {
@ExcelProperty("货主代码")
private String owner;
@ExcelProperty(value = "自动完成", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("自动完成")
private String autoComplete;
@ExcelProperty(value = "允许修改库位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许修改库位")
private String allowModifyLocation;
@ExcelProperty(value = "允许修改数量", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许修改数量")
private String allowModifyQty;
@ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许大于推荐数量")
private String allowBiggerQty;
@ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许小于推荐数量")
private String allowSmallerQty;
@ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许修改库存状态")
private String allowModifyInventoryStatus;
@ExcelProperty(value = "允许连续扫描", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许连续扫描")
private String allowContinuousScanning;
@ExcelProperty(value = "允许部分完成", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许部分完成")
private String allowPartialComplete;
@ExcelProperty(value = "允许修改批次", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许修改批次")
private String allowModifyBatch;
@ExcelProperty(value = "允许修改箱码", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
@ExcelProperty("允许修改箱码")
private String allowModifyPackingNumber;
//子表
@ExcelProperty("包装号")
private String packingNumber;
@ -185,15 +181,17 @@ public class InspectJobMainExcelVO {
private BigDecimal qty;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者名称")
private String creator;
@ExcelProperty("最后更新时间")
@ColumnWidth(value = 16)
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
@ExcelProperty("最后更新者名称")
private String updater;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java

@ -44,7 +44,7 @@ public class InspectJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -92,7 +92,7 @@ public class InspectJobMainExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "订单号")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java

@ -50,7 +50,7 @@ public class InspectJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "最后更新者Id")
@Schema(description = "最后更新者名称")
private String updater;
@Schema(description = "状态")
@ -98,7 +98,7 @@ public class InspectJobMainPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建者id")
@Schema(description = "创建者名称")
private String creator;
@Schema(description = "订单号")

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

@ -97,7 +97,7 @@ public class InspectRecordMainController {
private List<InspectRecordMainExcelVO> getExcelVo(List<InspectRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
mapDropDown.put(12, interfaceType);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(18, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);

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

Loading…
Cancel
Save