Browse Source

Merge remote-tracking branch 'origin/master'

master
陈薪名 2 years ago
parent
commit
da2cd1daea
  1. 6
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java
  2. 22
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java
  3. 39
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java
  4. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java
  5. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java
  6. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java
  7. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java
  8. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java
  9. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java
  10. 44
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java
  11. 35
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java
  12. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java
  13. 41
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java
  14. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java
  15. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java
  16. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java
  17. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java
  18. 96
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java
  19. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java
  20. 98
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java
  21. 93
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java
  22. 173
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  23. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java
  24. 106
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java
  25. 94
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java
  26. 149
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java
  27. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java
  28. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java
  29. 118
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java
  30. 72
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java
  31. 151
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java
  32. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java
  33. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java
  34. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java
  35. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java
  36. 73
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java
  37. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java
  38. 45
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java
  39. 49
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java
  40. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java
  41. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java
  42. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java
  43. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java
  44. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java
  45. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java
  46. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java
  47. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java
  48. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java
  49. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java
  50. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java
  51. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java
  52. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java
  53. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java
  54. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java
  55. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java
  56. 21
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java
  57. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java
  58. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java
  59. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java
  60. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java
  61. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java
  62. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java
  63. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java
  64. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java
  65. 30
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java
  66. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java
  67. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java
  68. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java
  69. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java
  70. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java
  71. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java
  72. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java
  73. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java
  74. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java
  75. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java
  76. 43
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java
  77. 39
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java
  78. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java
  79. 34
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java
  80. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java
  81. 41
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java
  82. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java
  83. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java
  84. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java
  85. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java
  86. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java
  87. 23
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java
  88. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java
  89. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java
  90. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java
  91. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java
  92. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java
  93. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java
  94. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java
  95. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java
  96. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java
  97. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java
  98. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java
  99. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java
  100. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java

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

@ -65,9 +65,15 @@ public interface DictTypeConstants {
String CARRIER_TYPE = "carrier_type";//承运商类型
String INVENTORY_STATUS = "inventory_status";//库存状态
String REQUEST_STATUS = "request_status";//请求状态
String PLAN_STATUS = "plan_status";//计划状态
String PURCHASE_RETURN_REASON = "purchase_return_reason";//原因
String TRANSFER_MODE = "transfer_mode";//运输方式
String FAILED_REASON = "failed_reason";//采购收货不合格原因
String INSPECT_TYPE = "inspect_type";//检验类型
String NEXT_ACTION = "next_action";//下一步检验动作
String SAMPLE_METHOD = "sample_method";//抽检方式
String INSPECT_FAILED_REASON = "inspect_failed_reason";//不合格原因
String INSPECT_RESULT = "inspect_result";//检验结果
}

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

@ -424,10 +424,15 @@ public interface ErrorCodeConstants {
ErrorCode PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_073_002, "采购收货任务状态错误");
ErrorCode PURCHASERECEIPT_REQUEST_STATUS_NOT_NEW = new ErrorCode(1_000_073_003, "采购收货不是新增状态");
ErrorCode PURCHASERECEIPT_REQUEST_JOB_EXISTS = new ErrorCode(1_000_073_004, "采购收货存在采购收货任务单");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_073_004, "采购收货状态不支持关闭");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_073_005, "采购收货状态不支持关闭");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_073_006, "采购收货状态不支持提交");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_073_007, "采购收货状态不支持审批同意");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_073_008, "采购收货状态不支持处理");
ErrorCode PURCHASERECEIPT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_073_009, "采购收货状态不支持审批拒绝");
//采购收货任务子ErrorCode
ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在");
ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在");
ErrorCode PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_074_002, "采购收货记录明细问题【{}】");
//采购退货申请主ErrorCode
ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在");
//采购退货申请子ErrorCode
@ -444,10 +449,16 @@ public interface ErrorCodeConstants {
//采购退货记录子ErrorCode
ErrorCode PURCHASERETURN_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_077_001, "采购退货记录子不存在");
//检验申请主ErrorCode
ErrorCode INSPECT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_078_000, "检验申请主不存在");
ErrorCode INSPECT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_078_000, "到货检验申请主不存在");
//检验申请子ErrorCode
ErrorCode INSPECT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_078_001, "检验申请子不存在");
ErrorCode INSPECT_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_078_002, "检验申请导入数据不能为空");
ErrorCode INSPECT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_078_001, "到货检验申请子不存在");
ErrorCode INSPECT_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_078_002, "到货检验申请导入数据不能为空");
ErrorCode INSPECT_REQUEST_JOB_EXISTS = new ErrorCode(1_000_078_003, "到货检验申请存在采购收货任务单");
ErrorCode INSPECT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "到货检验申请状态不支持关闭");
ErrorCode INSPECT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "到货检验申请状态不支持提交");
ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意");
ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理");
ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝");
//检验任务主ErrorCode
ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在");
//检验任务子ErrorCode
@ -671,6 +682,7 @@ public interface ErrorCodeConstants {
ErrorCode DELIVERPLAN_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入发货计划不能为空");
ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划主不存在");
ErrorCode DELIVER_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_118_001, "发货计划子不存在");
ErrorCode DELIVER_PLAN_STATUS_NOT_NEW = new ErrorCode(1_000_118_002, "发货计划不是新增状态");
//发货申请ErrorCode
ErrorCode DELIVER_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_119_000, "发货申请主不存在");
ErrorCode DELIVER_REQUEST_NOT_EXISTS = new ErrorCode(1_000_119_000, "发货申请不存在");
@ -682,6 +694,8 @@ public interface ErrorCodeConstants {
//发货记录ErrorCode
ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_121_000, "发货记录主不存在");
ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_121_001, "发货记录子不存在");
ErrorCode DELIVER_RECORD_DETAIL_EXCEPTION = new ErrorCode(1_000_121_002, "发货记录问题:【{}】");
ErrorCode DELIVER_ORDER_DETAIL_EXCEPTION = new ErrorCode(1_000_121_003, "发货订单问题:【{}】");
//客户收货申请ErrorCode
ErrorCode CUSTOMERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "客户收货申请主不存在");
ErrorCode CUSTOMERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "客户收货申请主不存在");

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

@ -9,10 +9,13 @@ 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.accountcalendar.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarRespVO;
import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert;
import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.accountcalendar.AccountcalendarService;
import io.swagger.v3.oas.annotations.Operation;
@ -80,15 +83,6 @@ public class AccountcalendarController {
return success(AccountcalendarConvert.INSTANCE.convert(accountcalendar));
}
@GetMapping("/list")
@Operation(summary = "获得账期日历列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
public CommonResult<List<AccountcalendarRespVO>> getAccountcalendarList(@RequestParam("ids") Collection<Long> ids) {
List<AccountcalendarDO> list = accountcalendarService.getAccountcalendarList(ids);
return success(AccountcalendarConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得账期日历分页")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
@ -123,16 +117,31 @@ public class AccountcalendarController {
public void exportAccountcalendarExcel(@Valid AccountcalendarExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<AccountcalendarDO> list = accountcalendarService.getAccountcalendarList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<AccountcalendarExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出账期日历 Excel")
@PreAuthorize("@ss.hasPermission('wms:accountcalendar:export')")
@OperateLog(type = EXPORT)
public void exportAccountcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<AccountcalendarDO> list = accountcalendarService.getAccountcalendarList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<AccountcalendarExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "账期日历.xlsx", "数据", AccountcalendarExcelVO.class, resultList, mapDropDown);
}
private List<AccountcalendarExcelVO> getExcelVo(List<AccountcalendarDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(6, available);
// 导出 Excel
List<AccountcalendarExcelVO> datas = AccountcalendarConvert.INSTANCE.convertList02(list);
for(AccountcalendarExcelVO vo : datas) {
List<AccountcalendarExcelVO> resultList = AccountcalendarConvert.INSTANCE.convertList02(list);
for(AccountcalendarExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(6, available);
ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas,mapDropDown);
}
return resultList;
}
@GetMapping("/get-import-template")

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java

@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.areabasic.vo.*;
import com.win.module.wms.controller.dock.vo.DockRespVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.convert.areabasic.AreabasicConvert;
import com.win.module.wms.convert.dock.DockConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.areabasic.AreabasicService;
import io.swagger.v3.oas.annotations.Operation;
@ -109,15 +112,31 @@ public class AreabasicController {
public void exportAreabasicExcel(@Valid AreabasicExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<AreabasicDO> list = areabasicService.getAreabasicList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<AreabasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出库区 Excel")
@PreAuthorize("@ss.hasPermission('wms:areabasic:export')")
@OperateLog(type = EXPORT)
public void exportAreabasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<AreabasicDO> list = areabasicService.getAreabasicList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<AreabasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown);
}
private List<AreabasicExcelVO> getExcelVo(List<AreabasicDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<AreabasicExcelVO> datas = AreabasicConvert.INSTANCE.convertList02(list);
for(AreabasicExcelVO vo : datas) {
List<AreabasicExcelVO> resultList = AreabasicConvert.INSTANCE.convertList02(list);
for(AreabasicExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas);
return resultList;
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库区分页")
@PreAuthorize("@ss.hasPermission('wms:areabasic:query')")

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java

@ -9,10 +9,13 @@ 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.bom.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO;
import com.win.module.wms.convert.bom.BomConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
import com.win.module.wms.dal.dataobject.bom.BomDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.bom.BomService;
import io.swagger.v3.oas.annotations.Operation;
@ -80,14 +83,6 @@ public class BomController {
return success(BomConvert.INSTANCE.convert(bom));
}
@GetMapping("/list")
@Operation(summary = "获得物料清单列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:bom:query')")
public CommonResult<List<BomRespVO>> getBomList(@RequestParam("ids") Collection<Long> ids) {
List<BomDO> list = bomService.getBomList(ids);
return success(BomConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得物料清单分页")
@ -125,21 +120,34 @@ public class BomController {
public void exportBomExcel(@Valid BomExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<BomDO> list = bomService.getBomList(exportReqVO);
// 导出 Excel
List<BomExcelVO> datas = BomConvert.INSTANCE.convertList02(list);
for(BomExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<BomExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出物料清单 Excel")
@PreAuthorize("@ss.hasPermission('wms:bom:export')")
@OperateLog(type = EXPORT)
public void exportBomExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<BomDO> list = bomService.getBomList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<BomExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物料清单.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown);
}
private List<BomExcelVO> getExcelVo(List<BomDO> list, Map<Integer, String[]> mapDropDown) {
String[] componentUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(2, componentUom);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(7, available);
ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<BomExcelVO> resultList = BomConvert.INSTANCE.convertList02(list);
for(BomExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入物料清单模板")
public void importTemplate(HttpServletResponse response) throws IOException {

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java

@ -78,15 +78,9 @@ public class CountRequestDetailBaseVO {
private String itemCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
private String packingNumber;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
private String containerNumber;
}

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

@ -77,15 +77,8 @@ public class CountRequestDetailExcelVO {
private String itemCode;
@ExcelProperty("从包装号")
private String fromPackingNumber;
@ExcelProperty("到包装号")
private String toPackingNumber;
private String packingNumber;
@ExcelProperty("从器具号")
private String fromContainerNumber;
@ExcelProperty("到器具号")
private String toContainerNumber;
private String containerNumber;
}

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

@ -72,15 +72,8 @@ public class CountRequestDetailExportReqVO {
private String itemCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
private String packingNumber;
@Schema(description = "从器具号")
private String fromContainerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
private String containerNumber;
}

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java

@ -74,15 +74,10 @@ public class CountRequestDetailPageReqVO extends PageParam {
private String itemCode;
@Schema(description = "从包装号")
private String fromPackingNumber;
@Schema(description = "到包装号")
private String toPackingNumber;
private String packingNumber;
@Schema(description = "从器具号")
private String fromContainerNumber;
private String containerNumber;
@Schema(description = "到器具号")
private String toContainerNumber;
}

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

@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarRespVO;
import com.win.module.wms.controller.currencyexchange.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert;
import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.currencyexchange.CurrencyexchangeService;
import io.swagger.v3.oas.annotations.Operation;
@ -80,15 +83,6 @@ public class CurrencyexchangeController {
return success(CurrencyexchangeConvert.INSTANCE.convert(currencyexchange));
}
@GetMapping("/list")
@Operation(summary = "获得货币转换列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')")
public CommonResult<List<CurrencyexchangeRespVO>> getCurrencyexchangeList(@RequestParam("ids") Collection<Long> ids) {
List<CurrencyexchangeDO> list = currencyexchangeService.getCurrencyexchangeList(ids);
return success(CurrencyexchangeConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得货币转换分页")
@PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')")
@ -122,19 +116,35 @@ public class CurrencyexchangeController {
public void exportCurrencyexchangeExcel(@Valid CurrencyexchangeExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CurrencyexchangeDO> list = currencyexchangeService.getCurrencyexchangeList(exportReqVO);
// 导出 Excel
List<CurrencyexchangeExcelVO> datas = CurrencyexchangeConvert.INSTANCE.convertList02(list);
for(CurrencyexchangeExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CurrencyexchangeExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出货币转换 Excel")
@PreAuthorize("@ss.hasPermission('wms:currencyexchange:export')")
@OperateLog(type = EXPORT)
public void exportCurrencyexchangeExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CurrencyexchangeDO> list = currencyexchangeService.getCurrencyexchangeList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CurrencyexchangeExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "货币转换.xlsx", "数据", CurrencyexchangeExcelVO.class, resultList, mapDropDown);
}
private List<CurrencyexchangeExcelVO> getExcelVo(List<CurrencyexchangeDO> list, Map<Integer, String[]> mapDropDown) {
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(0, currency);
String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(3, isRequired);
ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<CurrencyexchangeExcelVO> resultList = CurrencyexchangeConvert.INSTANCE.convertList02(list);
for(CurrencyexchangeExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入货币转换模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -10,10 +10,13 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
import com.win.module.wms.controller.customer.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO;
import com.win.module.wms.convert.customer.CustomerConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
import com.win.module.wms.dal.dataobject.customer.CustomerDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.customer.CustomerService;
import io.swagger.v3.oas.annotations.Operation;
@ -122,22 +125,38 @@ public class CustomerController {
public void exportCustomerExcel(@Valid CustomerExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CustomerDO> list = customerService.getCustomerList(exportReqVO);
// 导出 Excel
List<CustomerExcelVO> datas = CustomerConvert.INSTANCE.convertList02(list);
for(CustomerExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出客户 Excel")
@PreAuthorize("@ss.hasPermission('wms:customer:export')")
@OperateLog(type = EXPORT)
public void exportCustomerExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CustomerDO> list = customerService.getCustomerList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户.xlsx", "数据", CustomerExcelVO.class, resultList, mapDropDown);
}
private List<CustomerExcelVO> getExcelVo(List<CustomerDO> list, Map<Integer, String[]> mapDropDown) {
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(11, currency);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE);
mapDropDown.put(13, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(14, available);
ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<CustomerExcelVO> resultList = CustomerConvert.INSTANCE.convertList02(list);
for(CustomerExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入客户模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.customer.vo.CustomerRespVO;
import com.win.module.wms.controller.customerdock.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.convert.customer.CustomerConvert;
import com.win.module.wms.convert.customerdock.CustomerdockConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.customerdock.CustomerdockService;
import io.swagger.v3.oas.annotations.Operation;
@ -80,15 +83,6 @@ public class CustomerdockController {
return success(CustomerdockConvert.INSTANCE.convert(customerdock));
}
@GetMapping("/list")
@Operation(summary = "获得客户月台列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:customerdock:query')")
public CommonResult<List<CustomerdockRespVO>> getCustomerdockList(@RequestParam("ids") Collection<Long> ids) {
List<CustomerdockDO> list = customerdockService.getCustomerdockList(ids);
return success(CustomerdockConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得客户月台分页")
@PreAuthorize("@ss.hasPermission('wms:customerdock:query')")
@ -122,15 +116,31 @@ public class CustomerdockController {
public void exportCustomerdockExcel(@Valid CustomerdockExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CustomerdockDO> list = customerdockService.getCustomerdockList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerdockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出客户月台 Excel")
@PreAuthorize("@ss.hasPermission('wms:customerdock:export')")
@OperateLog(type = EXPORT)
public void exportCustomerdockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CustomerdockDO> list = customerdockService.getCustomerdockList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomerdockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户月台.xlsx", "数据", CustomerdockExcelVO.class, resultList, mapDropDown);
}
private List<CustomerdockExcelVO> getExcelVo(List<CustomerdockDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<CustomerdockExcelVO> datas = CustomerdockConvert.INSTANCE.convertList02(list);
for(CustomerdockExcelVO vo : datas) {
List<CustomerdockExcelVO> resultList =CustomerdockConvert.INSTANCE.convertList02(list);
for(CustomerdockExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "客户月台.xls", "数据", CustomerdockExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入客户月台模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -10,9 +10,12 @@ import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.customerdock.vo.CustomerdockRespVO;
import com.win.module.wms.controller.customeritem.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.convert.customerdock.CustomerdockConvert;
import com.win.module.wms.convert.customeritem.CustomeritemConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.customeritem.CustomeritemService;
import io.swagger.v3.oas.annotations.Operation;
@ -80,14 +83,6 @@ public class CustomeritemController {
return success(CustomeritemConvert.INSTANCE.convert(customeritem));
}
@GetMapping("/list")
@Operation(summary = "获得客户物品列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
public CommonResult<List<CustomeritemRespVO>> getCustomeritemList(@RequestParam("ids") Collection<Long> ids) {
List<CustomeritemDO> list = customeritemService.getCustomeritemList(ids);
return success(CustomeritemConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得客户物品分页")
@ -122,14 +117,21 @@ public class CustomeritemController {
public void exportCustomeritemExcel(@Valid CustomeritemExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<CustomeritemDO> list = customeritemService.getCustomeritemList(exportReqVO);
// 导出 Excel
List<CustomeritemExcelVO> datas = CustomeritemConvert.INSTANCE.convertList02(list);
for(CustomeritemExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomeritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出客户物品 Excel")
@PreAuthorize("@ss.hasPermission('wms:customeritem:export')")
@OperateLog(type = EXPORT)
public void exportCustomeritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<CustomeritemDO> list = customeritemService.getCustomeritemList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<CustomeritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
}
private List<CustomeritemExcelVO> getExcelVo(List<CustomeritemDO> list, Map<Integer, String[]> mapDropDown) {
String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(3, cusotmerUom);
String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
@ -138,7 +140,14 @@ public class CustomeritemController {
mapDropDown.put(7, altPackUnit);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(10, available);
ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<CustomeritemExcelVO> resultList = CustomeritemConvert.INSTANCE.convertList02(list);
for(CustomeritemExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java

@ -88,4 +88,7 @@ public class CustomerreturnRequestDetailExcelVO {
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("到库位代码")
private String toLocationCode;
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java

@ -83,6 +83,9 @@ public class CustomerreturnRequestDetailExportReqVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "到库位代码")
private String toLocationCode;
@Schema(description = "主表id")
private Long masterId;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java

@ -85,4 +85,7 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "到库位代码")
private String toLocationCode;
}

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

@ -8,10 +8,13 @@ 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.dock.vo.*;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO;
import com.win.module.wms.convert.dock.DockConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.warehouse.WarehouseConvert;
import com.win.module.wms.dal.dataobject.dock.DockDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.mysql.dock.DockMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.dock.DockService;
@ -124,19 +127,33 @@ public class DockController {
public void exportDockExcel(@Valid DockExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<DockDO> list = dockService.getDockList(exportReqVO);
// 导出 Excel
List<DockExcelVO> datas = DockConvert.INSTANCE.convertList02(list);
for(DockExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<DockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出月台 Excel")
@PreAuthorize("@ss.hasPermission('wms:dock:export')")
@OperateLog(type = EXPORT)
public void exportDockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<DockDO> list = dockService.getDockList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<DockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown);
}
private List<DockExcelVO> getExcelVo(List<DockDO> list, Map<Integer, String[]> mapDropDown) {
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE);
mapDropDown.put(5, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(10, available);;
ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<DockExcelVO> resultList = DockConvert.INSTANCE.convertList02(list);
for(DockExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")

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

@ -1,34 +1,34 @@
package com.win.module.wms.controller.expectin;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.expectin.vo.ExpectinExcelVO;
import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO;
import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO;
import com.win.module.wms.controller.expectin.vo.ExpectinRespVO;
import com.win.module.wms.convert.expectin.ExpectinConvert;
import com.win.module.wms.dal.dataobject.expectin.ExpectinDO;
import com.win.module.wms.service.expectin.ExpectinService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.expectin.vo.*;
import com.win.module.wms.dal.dataobject.expectin.ExpectinDO;
import com.win.module.wms.convert.expectin.ExpectinConvert;
import com.win.module.wms.service.expectin.ExpectinService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 预计入库存")
@RestController
@ -42,28 +42,22 @@ public class ExpectinController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建预计入库存")
@PreAuthorize("@ss.hasPermission('wms:expectin:create')")
public CommonResult<String> createExpectin(@Valid @RequestBody ExpectinCreateReqVO createReqVO) {
return success(expectinService.createExpectin(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新预计入库存")
@PreAuthorize("@ss.hasPermission('wms:expectin:update')")
public CommonResult<Boolean> updateExpectin(@Valid @RequestBody ExpectinUpdateReqVO updateReqVO) {
expectinService.updateExpectin(updateReqVO);
return success(true);
@DeleteMapping("/delete")
@Operation(summary = "根据任务号删除预计入库存")
@Parameter(name = "jobNumber", description = "任务号", required = true)
@PreAuthorize("@ss.hasPermission('wms:expectin:delete')")
public CommonResult<Boolean> deleteExpectin(@RequestParam("jobNumber") String jobNumber) {
Integer result = expectinService.deleteExpectinByJobNumber(jobNumber);
return success(result > 0);
}
@DeleteMapping("/delete")
@DeleteMapping("/deleteByJobNumber")
@Operation(summary = "删除预计入库存")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:expectin:delete')")
public CommonResult<Boolean> deleteExpectin(@RequestParam("id") Long id) {
expectinService.deleteExpectin(id);
return success(true);
Integer result = expectinService.deleteExpectin(id);
return success(result > 0);
}
@GetMapping("/get")
@ -75,15 +69,6 @@ public class ExpectinController {
return success(ExpectinConvert.INSTANCE.convert(expectin));
}
@GetMapping("/list")
@Operation(summary = "获得预计入库存列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:expectin:query')")
public CommonResult<List<ExpectinRespVO>> getExpectinList(@RequestParam("ids") Collection<String> ids) {
List<ExpectinDO> list = expectinService.getExpectinList(ids);
return success(ExpectinConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得预计入库存分页")
@PreAuthorize("@ss.hasPermission('wms:expectin:query')")
@ -110,14 +95,25 @@ public class ExpectinController {
@Operation(summary = "导出预计入库存 Excel")
@PreAuthorize("@ss.hasPermission('wms:expectin:export')")
@OperateLog(type = EXPORT)
public void exportExpectinExcel(@Valid ExpectinExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportExpectinExcel(@Valid ExpectinExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<ExpectinDO> list = expectinService.getExpectinList(exportReqVO);
// 导出 Excel
List<ExpectinExcelVO> datas = ExpectinConvert.INSTANCE.convertList02(list);
for(ExpectinExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出预计入库存 Excel")
@PreAuthorize("@ss.hasPermission('wms:expectin:export')")
@OperateLog(type = EXPORT)
public void exportExpectinExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ExpectinDO> list = expectinService.getExpectinList(conditions);
List<ExpectinExcelVO> datas = ExpectinConvert.INSTANCE.convertList02(list);
for(ExpectinExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas);

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java

@ -1,10 +1,10 @@
package com.win.module.wms.controller.expectin.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import javax.validation.constraints.*;
/**
* 预计入库存 Base VO提供给添加修改详细的子 VO 使用

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

@ -1,34 +1,34 @@
package com.win.module.wms.controller.expectout;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.expectout.vo.ExpectoutExcelVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutRespVO;
import com.win.module.wms.convert.expectout.ExpectoutConvert;
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
import com.win.module.wms.service.expectout.ExpectoutService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.expectout.vo.*;
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
import com.win.module.wms.convert.expectout.ExpectoutConvert;
import com.win.module.wms.service.expectout.ExpectoutService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 预计出库存")
@RestController
@ -42,28 +42,22 @@ public class ExpectoutController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建预计出库存")
@PreAuthorize("@ss.hasPermission('wms:expectout:create')")
public CommonResult<String> createExpectout(@Valid @RequestBody ExpectoutCreateReqVO createReqVO) {
return success(expectoutService.createExpectout(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新预计出库存")
@PreAuthorize("@ss.hasPermission('wms:expectout:update')")
public CommonResult<Boolean> updateExpectout(@Valid @RequestBody ExpectoutUpdateReqVO updateReqVO) {
expectoutService.updateExpectout(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除预计出库存")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:expectout:delete')")
public CommonResult<Boolean> deleteExpectout(@RequestParam("id") Long id) {
expectoutService.deleteExpectout(id);
return success(true);
int result = expectoutService.deleteExpectout(id);
return success(result > 0);
}
@DeleteMapping("/deleteByJobNumber")
@Operation(summary = "根据任务号删除预计出库存")
@Parameter(name = "jobNumber", description = "任务号", required = true)
@PreAuthorize("@ss.hasPermission('wms:expectout:delete')")
public CommonResult<Boolean> deleteExpectout(@RequestParam("jobNumber") String jobNumber) {
int result = expectoutService.deleteExpectoutByJobNumber(jobNumber);
return success(result > 0);
}
@GetMapping("/get")
@ -75,15 +69,6 @@ public class ExpectoutController {
return success(ExpectoutConvert.INSTANCE.convert(expectout));
}
@GetMapping("/list")
@Operation(summary = "获得预计出库存列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:expectout:query')")
public CommonResult<List<ExpectoutRespVO>> getExpectoutList(@RequestParam("ids") Collection<String> ids) {
List<ExpectoutDO> list = expectoutService.getExpectoutList(ids);
return success(ExpectoutConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得预计出库存分页")
@PreAuthorize("@ss.hasPermission('wms:expectout:query')")
@ -110,14 +95,25 @@ public class ExpectoutController {
@Operation(summary = "导出预计出库存 Excel")
@PreAuthorize("@ss.hasPermission('wms:expectout:export')")
@OperateLog(type = EXPORT)
public void exportExpectoutExcel(@Valid ExpectoutExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportExpectoutExcel(@Valid ExpectoutExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<ExpectoutDO> list = expectoutService.getExpectoutList(exportReqVO);
// 导出 Excel
List<ExpectoutExcelVO> datas = ExpectoutConvert.INSTANCE.convertList02(list);
for(ExpectoutExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出预计出库存 Excel")
@PreAuthorize("@ss.hasPermission('wms:expectout:export')")
@OperateLog(type = EXPORT)
public void exportExpectoutExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ExpectoutDO> list = expectoutService.getExpectoutList(conditions);
List<ExpectoutExcelVO> datas = ExpectoutConvert.INSTANCE.convertList02(list);
for(ExpectoutExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas);

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

@ -1,35 +1,26 @@
package com.win.module.wms.controller.inspectJob;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
@Tag(name = "管理后台 - 检验任务子")
@RestController
@RequestMapping("/wms/inspect-job-detail")
@ -42,48 +33,6 @@ public class InspectJobDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验任务子")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:create')")
public CommonResult<Long> createInspectJobDetail(@Valid @RequestBody InspectJobDetailCreateReqVO createReqVO) {
return success(inspectJobDetailService.createInspectJobDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验任务子")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:update')")
public CommonResult<Boolean> updateInspectJobDetail(@Valid @RequestBody InspectJobDetailUpdateReqVO updateReqVO) {
inspectJobDetailService.updateInspectJobDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验任务子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:delete')")
public CommonResult<Boolean> deleteInspectJobDetail(@RequestParam("id") Long id) {
inspectJobDetailService.deleteInspectJobDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验任务子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
public CommonResult<InspectJobDetailRespVO> getInspectJobDetail(@RequestParam("id") Long id) {
InspectJobDetailDO inspectJobDetail = inspectJobDetailService.getInspectJobDetail(id);
return success(InspectJobDetailConvert.INSTANCE.convert(inspectJobDetail));
}
@GetMapping("/list")
@Operation(summary = "获得检验任务子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
public CommonResult<List<InspectJobDetailRespVO>> getInspectJobDetailList(@RequestParam("ids") Collection<Long> ids) {
List<InspectJobDetailDO> list = inspectJobDetailService.getInspectJobDetailList(ids);
return success(InspectJobDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验任务子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
@ -105,21 +54,5 @@ public class InspectJobDetailController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验任务子 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobDetailExcel(@Valid InspectJobDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<InspectJobDetailDO> list = inspectJobDetailService.getInspectJobDetailList(exportReqVO);
// 导出 Excel
List<InspectJobDetailExcelVO> datas = InspectJobDetailConvert.INSTANCE.convertList02(list);
for(InspectJobDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "检验任务子.xls", "数据", InspectJobDetailExcelVO.class, datas);
}
}

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

@ -1,38 +1,41 @@
package com.win.module.wms.controller.inspectJob;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
import com.win.module.wms.service.inspectJob.InspectJobMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jodd.util.StringUtil;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.service.inspectJob.InspectJobMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 检验任务主")
@RestController
@ -49,48 +52,6 @@ public class InspectJobMainController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验任务主")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:create')")
public CommonResult<Long> createInspectJobMain(@Valid @RequestBody InspectJobMainCreateReqVO createReqVO) {
return success(inspectJobMainService.createInspectJobMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验任务主")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:update')")
public CommonResult<Boolean> updateInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
inspectJobMainService.updateInspectJobMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验任务主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:delete')")
public CommonResult<Boolean> deleteInspectJobMain(@RequestParam("id") Long id) {
inspectJobMainService.deleteInspectJobMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验任务主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<InspectJobMainRespVO> getInspectJobMain(@RequestParam("id") Long id) {
InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
return success(InspectJobMainConvert.INSTANCE.convert(inspectJobMain));
}
@GetMapping("/list")
@Operation(summary = "获得检验任务主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<List<InspectJobMainRespVO>> getInspectJobMainList(@RequestParam("ids") Collection<Long> ids) {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(ids);
return success(InspectJobMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验任务主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
@ -112,21 +73,66 @@ public class InspectJobMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(exportReqVO);
// 导出 Excel
List<InspectJobMainExcelVO> datas = InspectJobMainConvert.INSTANCE.convertList02(list);
for(InspectJobMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出检验任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown);
}
private List<InspectJobMainExcelVO> getExcelVo(List<InspectJobMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] status = JobStatusEnum.getStatusNameArray();
mapDropDown.put(6, status);
String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
mapDropDown.put(6, transferMode);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(24, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
mapDropDown.put(25, nextAction);
String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
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[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(43, inventoryStatus);
List<InspectJobMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InspectJobMainDO mainDO : list) {
List<InspectJobDetailDO> subList = inspectJobDetailService.selectList(mainDO.getId());
for(InspectJobDetailDO detailDO : subList) {
InspectJobMainExcelVO vo = InspectJobMainConvert.INSTANCE.convert(mainDO, detailDO);
resultList.add(vo);
}
}
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas);
return resultList;
}
@GetMapping("/getInspectJobById")
@ -184,4 +190,29 @@ public class InspectJobMainController {
return success(countByStatus);
}
@Operation(summary = "承接任务")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')")
@PostMapping(value = "/accept/{id}")
public CommonResult<Boolean> acceptInspectJobMain(@PathVariable("id") Long id) {
int result = inspectJobMainService.acceptInspectJobMain(id);
return success(result > 0);
}
@Operation(summary = "取消承接任务")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')")
@PostMapping(value = "/cancelAccept/{id}")
public CommonResult<Boolean> cancelAcceptInspectJobMain(@PathVariable("id") Long id) {
int result = inspectJobMainService.cancelAcceptInspectJobMain(id);
return success(result > 0);
}
@PutMapping("/execute")
@Operation(summary = "执行任务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')")
public CommonResult<Boolean> excuteInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
Integer count = inspectJobMainService.excuteInspectJobMain(updateReqVO);
return success(count > 0);
}
}

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

@ -1,12 +1,13 @@
package com.win.module.wms.controller.inspectJob.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -63,4 +64,7 @@ public class InspectJobDetailPageReqVO extends PageParam {
@Schema(description = "计量单位")
private String uom;
@Schema(description = "主表ID", example = "6060")
private Long masterId;
}

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

@ -1,21 +1,14 @@
package com.win.module.wms.controller.inspectJob.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusConverter;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -44,23 +37,12 @@ public class InspectJobMainExcelVO {
@ExcelProperty("要求截止时间")
private LocalDateTime requestDueTime;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@ExcelProperty(value = "状态", converter = JobStatusConverter.class)
private String status;
@ExcelProperty("过期时间")
private LocalDateTime expiredTime;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_stage_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String jobStageStatus;
@ExcelProperty("优先级")
private Integer priority;
@ -97,12 +79,6 @@ public class InspectJobMainExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者id")
private String creator;
@ExcelProperty("订单号")
private String poUmber;
@ -116,19 +92,19 @@ public class InspectJobMainExcelVO {
private String itemCode;
@ExcelProperty(value = "检验类型", converter = DictConvert.class)
@DictFormat("inspect_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INSPECT_TYPE)
private String inspectType;
@ExcelProperty(value = "下一步检验动作", converter = DictConvert.class)
@DictFormat("next_action") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.NEXT_ACTION)
private String nextAction;
@ExcelProperty(value = "抽检方式", converter = DictConvert.class)
@DictFormat("sample_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.SAMPLE_METHOD)
private String sampleMethod;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("收货数量")
@ -141,43 +117,83 @@ public class InspectJobMainExcelVO {
private String owner;
@ExcelProperty(value = "自动完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String autoComplete;
@ExcelProperty(value = "允许修改库位", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyLocation;
@ExcelProperty(value = "允许修改数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyQty;
@ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowBiggerQty;
@ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowSmallerQty;
@ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyInventoryStatus;
@ExcelProperty(value = "允许连续扫描", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowContinuousScanning;
@ExcelProperty(value = "允许部分完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowPartialComplete;
@ExcelProperty(value = "允许修改批次", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyBatch;
@ExcelProperty(value = "允许修改箱码", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyPackingNumber;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private BigDecimal qty;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
}

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

@ -1,35 +1,26 @@
package com.win.module.wms.controller.inspectRecord;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailRespVO;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.inspectRecord.vo.*;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
@Tag(name = "管理后台 - 检验记录子")
@RestController
@RequestMapping("/wms/inspect-record-detail")
@ -42,48 +33,6 @@ public class InspectRecordDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验记录子")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:create')")
public CommonResult<Long> createInspectRecordDetail(@Valid @RequestBody InspectRecordDetailCreateReqVO createReqVO) {
return success(inspectRecordDetailService.createInspectRecordDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验记录子")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:update')")
public CommonResult<Boolean> updateInspectRecordDetail(@Valid @RequestBody InspectRecordDetailUpdateReqVO updateReqVO) {
inspectRecordDetailService.updateInspectRecordDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:delete')")
public CommonResult<Boolean> deleteInspectRecordDetail(@RequestParam("id") Long id) {
inspectRecordDetailService.deleteInspectRecordDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
public CommonResult<InspectRecordDetailRespVO> getInspectRecordDetail(@RequestParam("id") Long id) {
InspectRecordDetailDO inspectRecordDetail = inspectRecordDetailService.getInspectRecordDetail(id);
return success(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetail));
}
@GetMapping("/list")
@Operation(summary = "获得检验记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
public CommonResult<List<InspectRecordDetailRespVO>> getInspectRecordDetailList(@RequestParam("ids") Collection<Long> ids) {
List<InspectRecordDetailDO> list = inspectRecordDetailService.getInspectRecordDetailList(ids);
return success(InspectRecordDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验记录子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
@ -105,22 +54,5 @@ public class InspectRecordDetailController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordDetailExcel(@Valid InspectRecordDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<InspectRecordDetailDO> list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO);
// 导出 Excel
List<InspectRecordDetailExcelVO> datas = InspectRecordDetailConvert.INSTANCE.convertList02(list);
for(InspectRecordDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "检验记录子.xls", "数据", InspectRecordDetailExcelVO.class, datas);
}
}

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

@ -1,34 +1,40 @@
package com.win.module.wms.controller.inspectRecord;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.inspectRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 检验记录主")
@RestController
@ -38,52 +44,12 @@ public class InspectRecordMainController {
@Resource
private InspectRecordMainService inspectRecordMainService;
@Resource
private InspectRecordDetailService inspectRecordDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验记录主")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')")
public CommonResult<Long> createInspectRecordMain(@Valid @RequestBody InspectRecordMainCreateReqVO createReqVO) {
return success(inspectRecordMainService.createInspectRecordMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验记录主")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:update')")
public CommonResult<Boolean> updateInspectRecordMain(@Valid @RequestBody InspectRecordMainUpdateReqVO updateReqVO) {
inspectRecordMainService.updateInspectRecordMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:delete')")
public CommonResult<Boolean> deleteInspectRecordMain(@RequestParam("id") Long id) {
inspectRecordMainService.deleteInspectRecordMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
public CommonResult<InspectRecordMainRespVO> getInspectRecordMain(@RequestParam("id") Long id) {
InspectRecordMainDO inspectRecordMain = inspectRecordMainService.getInspectRecordMain(id);
return success(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMain));
}
@GetMapping("/list")
@Operation(summary = "获得检验记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
public CommonResult<List<InspectRecordMainRespVO>> getInspectRecordMainList(@RequestParam("ids") Collection<Long> ids) {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(ids);
return success(InspectRecordMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
@ -105,21 +71,60 @@ public class InspectRecordMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(exportReqVO);
// 导出 Excel
List<InspectRecordMainExcelVO> datas = InspectRecordMainConvert.INSTANCE.convertList02(list);
for(InspectRecordMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出检验记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown);
}
private List<InspectRecordMainExcelVO> getExcelVo(List<InspectRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(18, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
mapDropDown.put(19, nextAction);
String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
mapDropDown.put(20, sampleMethod);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(21, uom);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(33, locationType);
String[] inspectFailedReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_FAILED_REASON);
mapDropDown.put(43, inspectFailedReason);
String[] inspectResult = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_RESULT);
mapDropDown.put(46, inspectResult);
List<InspectRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InspectRecordMainDO mainDO : list) {
List<InspectRecordDetailDO> subList = inspectRecordDetailService.selectList(mainDO.getId());
for(InspectRecordDetailDO detailDO : subList) {
InspectRecordMainExcelVO vo = InspectRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, datas);
return resultList;
}
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java

@ -1,13 +1,11 @@
package com.win.module.wms.controller.inspectRecord.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -109,4 +107,6 @@ public class InspectRecordDetailExportReqVO {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.inspectRecord.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -111,4 +112,6 @@ public class InspectRecordDetailPageReqVO extends PageParam {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

118
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java

@ -1,23 +1,13 @@
package com.win.module.wms.controller.inspectRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -62,7 +52,7 @@ public class InspectRecordMainExcelVO {
private String departmentCode;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INTERFACE_TYPE)
private String interfaceType;
@ExcelProperty("单据号")
@ -71,15 +61,6 @@ public class InspectRecordMainExcelVO {
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("代码")
private String code;
@ -93,19 +74,19 @@ public class InspectRecordMainExcelVO {
private String batch;
@ExcelProperty(value = "检验类型", converter = DictConvert.class)
@DictFormat("inspect_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INSPECT_TYPE)
private String inspectType;
@ExcelProperty(value = "下一步检验动作", converter = DictConvert.class)
@DictFormat("next_action") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.NEXT_ACTION)
private String nextAction;
@ExcelProperty(value = "抽检方式", converter = DictConvert.class)
@DictFormat("sample_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.SAMPLE_METHOD)
private String sampleMethod;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("收货数量")
@ -142,7 +123,84 @@ public class InspectRecordMainExcelVO {
private BigDecimal sampleQty;
@ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String fromLocationTypes;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("从库位组代码")
private String fromLocationGroupCode;
@ExcelProperty("从库区代码")
private String fromAreaCode;
@ExcelProperty("合格数量")
private BigDecimal goodQty;
@ExcelProperty("不合格数量")
private BigDecimal failedQty;
@ExcelProperty("破坏数量")
private BigDecimal crackQty;
@ExcelProperty("最终不合格数量")
private BigDecimal notPassedQty;
@ExcelProperty(value = "不合格原因", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INSPECT_FAILED_REASON)
private String failedReason;
@ExcelProperty("异常照片")
private String photos;
@ExcelProperty("检验人")
private String inspectUser;
@ExcelProperty(value = "检验结果", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INSPECT_RESULT)
private String inspectResult;
@ExcelProperty("外观")
private String appearance;
@ExcelProperty("尺寸")
private String volume;
@ExcelProperty("重量")
private String weight;
@ExcelProperty("其他属性")
private String otherProperties;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("任务明细ID")
private String jobDetailId;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
}

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

@ -1,35 +1,29 @@
package com.win.module.wms.controller.inspectRequest;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailRespVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.service.inspectRequest.InspectRequestDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.service.inspectRequest.InspectRequestDetailService;
@Tag(name = "管理后台 - 检验申请子")
@RestController
@RequestMapping("/wms/inspect-request-detail")
@ -53,8 +47,8 @@ public class InspectRequestDetailController {
@Operation(summary = "更新检验申请子")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:update')")
public CommonResult<Boolean> updateInspectRequestDetail(@Valid @RequestBody InspectRequestDetailUpdateReqVO updateReqVO) {
inspectRequestDetailService.updateInspectRequestDetail(updateReqVO);
return success(true);
int result = inspectRequestDetailService.updateInspectRequestDetail(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@ -62,8 +56,8 @@ public class InspectRequestDetailController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:delete')")
public CommonResult<Boolean> deleteInspectRequestDetail(@RequestParam("id") Long id) {
inspectRequestDetailService.deleteInspectRequestDetail(id);
return success(true);
int result = inspectRequestDetailService.deleteInspectRequestDetail(id);
return success(result > 0);
}
@GetMapping("/get")
@ -75,15 +69,6 @@ public class InspectRequestDetailController {
return success(InspectRequestDetailConvert.INSTANCE.convert(inspectRequestDetail));
}
@GetMapping("/list")
@Operation(summary = "获得检验申请子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')")
public CommonResult<List<InspectRequestDetailRespVO>> getInspectRequestDetailList(@RequestParam("ids") Collection<Long> ids) {
List<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(ids);
return success(InspectRequestDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验申请子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')")
@ -105,22 +90,5 @@ public class InspectRequestDetailController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验申请子 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:export')")
@OperateLog(type = EXPORT)
public void exportInspectRequestDetailExcel(@Valid InspectRequestDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(exportReqVO);
// 导出 Excel
List<InspectRequestDetailExcelVO> datas = InspectRequestDetailConvert.INSTANCE.convertList02(list);
for(InspectRequestDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "检验申请子.xls", "数据", InspectRequestDetailExcelVO.class, datas);
}
}

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

@ -1,41 +1,40 @@
package com.win.module.wms.controller.inspectRequest;
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.inspectRequest.vo.*;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.inspectRequest.InspectRequestDetailService;
import com.win.module.wms.service.inspectRequest.InspectRequestMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.*;
import javax.servlet.http.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import java.io.IOException;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.service.inspectRequest.InspectRequestMainService;
import org.springframework.web.multipart.MultipartFile;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 检验申请主")
@RestController
@ -46,6 +45,8 @@ public class InspectRequestMainController {
@Resource
private InspectRequestMainService inspectRequestMainService;
@Resource
private InspectRequestDetailService inspectRequestDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@ -59,8 +60,8 @@ public class InspectRequestMainController {
@Operation(summary = "更新检验申请主")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:update')")
public CommonResult<Boolean> updateInspectRequestMain(@Valid @RequestBody InspectRequestMainUpdateReqVO updateReqVO) {
inspectRequestMainService.updateInspectRequestMain(updateReqVO);
return success(true);
int result = inspectRequestMainService.updateInspectRequestMain(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@ -68,8 +69,8 @@ public class InspectRequestMainController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:delete')")
public CommonResult<Boolean> deleteInspectRequestMain(@RequestParam("id") Long id) {
inspectRequestMainService.deleteInspectRequestMain(id);
return success(true);
int result = inspectRequestMainService.deleteInspectRequestMain(id);
return success(result > 0);
}
@GetMapping("/get")
@ -110,21 +111,57 @@ public class InspectRequestMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验申请主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRequestMainExcel(@Valid InspectRequestMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportInspectRequestMainExcel(@Valid InspectRequestMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectRequestMainDO> list = inspectRequestMainService.getInspectRequestMainList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出检验申请主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRequestMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectRequestMainDO> list = inspectRequestMainService.getInspectRequestMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRequestMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown);
}
private List<InspectRequestMainExcelVO> getExcelVo(List<InspectRequestMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(6, locationType);
String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
mapDropDown.put(11, requestStatus);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(15, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
mapDropDown.put(16, nextAction);
String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
mapDropDown.put(17, sampleMethod);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(18, uom);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(28, inventoryStatus);
// 导出 Excel
List<InspectRequestMainExcelVO> datas = InspectRequestMainConvert.INSTANCE.convertList02(list);
for(InspectRequestMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
List<InspectRequestMainExcelVO> resultList = new ArrayList<>();
for(InspectRequestMainDO mainDO : list) {
List<InspectRequestDetailDO> subList = inspectRequestDetailService.selectList(mainDO.getId());
for(InspectRequestDetailDO detailDO : subList) {
InspectRequestMainExcelVO vo = InspectRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@ -161,9 +198,55 @@ public class InspectRequestMainController {
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("errorCount", errorList.size());
if(!errorList.isEmpty()) {
String url = ExcelUtils.writeLocalFile("检验申请基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
String url = ExcelUtils.writeLocalFile("到货检验申请基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xlsx", "错误列表", errorList);
returnMap.put("errorFile", url);
}
return success(returnMap);
}
@PutMapping("/close")
@Operation(summary = "关闭到货检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:close')")
public CommonResult<Boolean> closeInspectRequestMain(@RequestParam("id") Long id) {
Integer count = inspectRequestMainService.closeInspectRequestMain(id);
return success(count > 0);
}
@PutMapping("/submit")
@Operation(summary = "提交到货检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:submit')")
public CommonResult<Boolean> submitInspectRequestMain(@RequestParam("id") Long id) {
Integer count = inspectRequestMainService.submitInspectRequestMain(id);
return success(count > 0);
}
@PutMapping("/agree")
@Operation(summary = "审批通过到货检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:agree')")
public CommonResult<Boolean> agreeInspectRequestMain(@RequestParam("id") Long id) {
Integer count = inspectRequestMainService.agreeInspectRequestMain(id);
return success(count > 0);
}
@PutMapping("/handle")
@Operation(summary = "执行到货检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:handle')")
public CommonResult<Boolean> handleInspectRequestMain(@RequestParam("id") Long id) {
Integer count = inspectRequestMainService.handleInspectRequestMain(id);
return success(count > 0);
}
@PutMapping("/abort")
@Operation(summary = "审批拒绝到货检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-request-main:abort')")
public CommonResult<Boolean> abortInspectRequestMain(@RequestParam("id") Long id) {
Integer count = inspectRequestMainService.abortInspectRequestMain(id);
return success(count > 0);
}
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java

@ -1,13 +1,13 @@
package com.win.module.wms.controller.inspectRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import javax.validation.constraints.*;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
@ -20,6 +20,10 @@ public class InspectRequestDetailBaseVO {
@Schema(description = "id", example = "id")
private Long id;
@Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "单据号不能为空")
private String number;
@Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "包装号不能为空")
private String packingNumber;
@ -27,6 +31,9 @@ public class InspectRequestDetailBaseVO {
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "库存状态")
private String inventoryStatus;

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java

@ -1,15 +1,13 @@
package com.win.module.wms.controller.inspectRequest.vo;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
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 lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -20,12 +18,18 @@ import com.win.framework.excel.core.convert.DictConvert;
@Data
public class InspectRequestDetailExcelVO {
@ExcelProperty("单据号")
private String number;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("主表ID")
private Long masterId;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat("inventory_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String inventoryStatus;

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

@ -1,13 +1,11 @@
package com.win.module.wms.controller.inspectRequest.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -15,12 +13,18 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@Data
public class InspectRequestDetailExportReqVO {
@Schema(description = "单据号")
private String number;
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "库存状态")
private String inventoryStatus;
@ -55,4 +59,5 @@ public class InspectRequestDetailExportReqVO {
@Schema(description = "计量单位")
private String uom;
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.inspectRequest.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -17,12 +18,18 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@ToString(callSuper = true)
public class InspectRequestDetailPageReqVO extends PageParam {
@Schema(description = "单据号")
private String number;
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "库存状态")
private String inventoryStatus;

73
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java

@ -1,8 +1,10 @@
package com.win.module.wms.controller.inspectRequest.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;
import lombok.Data;
import java.math.BigDecimal;
@ -36,18 +38,12 @@ public class InspectRequestMainExcelVO {
private String fromAreaCodes;
@ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String fromLocationTypes;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者用户名")
private String creator;
@ExcelProperty("申请时间")
private LocalDateTime requestTime;
@ -58,15 +54,9 @@ public class InspectRequestMainExcelVO {
private String departmentCode;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("request_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.REQUEST_STATUS)
private String status;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")
private String updater;
@ExcelProperty("订单号")
private String poNumber;
@ -76,23 +66,20 @@ public class InspectRequestMainExcelVO {
@ExcelProperty("批次")
private String batch;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty(value = "检验类型", converter = DictConvert.class)
@DictFormat("inspect_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INSPECT_TYPE)
private String inspectType;
@ExcelProperty(value = "下一步检验动作", converter = DictConvert.class)
@DictFormat("next_action") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.NEXT_ACTION)
private String nextAction;
@ExcelProperty(value = "抽检方式", converter = DictConvert.class)
@DictFormat("sample_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.SAMPLE_METHOD)
private String sampleMethod;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("收货数量")
@ -116,4 +103,48 @@ public class InspectRequestMainExcelVO {
@ExcelProperty("直接生成记录")
private String directCreateRecord;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private BigDecimal qty;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;
@ExcelProperty("创建者ID")
private String creator;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者用户名")
private String updater;
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java

@ -3,10 +3,15 @@ package com.win.module.wms.controller.inspectRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@Schema(description = "管理后台 - 检验申请主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class InspectRequestMainRespVO extends InspectRequestMainBaseVO {
@Schema(description = "检验申请子表request_inspect_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

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

@ -9,6 +9,8 @@ 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.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.controller.itembasic.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
@ -20,6 +22,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -105,15 +108,6 @@ public class ItembasicController {
return success(ItembasicConvert.INSTANCE.convert(itembasic));
}
@GetMapping("/list")
@Operation(summary = "获得物品基本信息列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
public CommonResult<List<ItembasicRespVO>> getItembasicList(@RequestParam("ids") Collection<Long> ids) {
List<ItembasicDO> list = itembasicService.getItembasicList(ids);
return success(ItembasicConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得物品基本信息分页")
@PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
@ -149,21 +143,28 @@ public class ItembasicController {
public void exportItembasicExcel(@Valid ItembasicExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ItembasicDO> list = itembasicService.getItembasicList(exportReqVO);
// 导出 Excel
List<ItembasicExcelVO> datas = ItembasicConvert.INSTANCE.convertList02(list);
for(ItembasicExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ItembasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出物品基本信息 Excel")
@PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
@OperateLog(type = EXPORT)
public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ItembasicDO> list = itembasicService.getItembasicList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ItembasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown);
}
private List<ItembasicExcelVO> getExcelVo(List<ItembasicDO> list, Map<Integer, String[]> mapDropDown) {
String[] status = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS);
mapDropDown.put(4, status);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(5, uom);
String[] altUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(6, altUom);
mapDropDown.put(6, altUom);
String[] isStdPack = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(7, isStdPack);
String[] enableBuy = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
@ -192,8 +193,16 @@ public class ItembasicController {
mapDropDown.put(20, eqLevel);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(22, available);
ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<ItembasicExcelVO> resultList = ItembasicConvert.INSTANCE.convertList02(list);
for(ItembasicExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入物品基本信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -8,10 +8,12 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO;
import com.win.module.wms.controller.itempackaging.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.itempackaging.ItempackagingService;
@ -79,14 +81,14 @@ public class ItempackagingController {
return success(ItempackagingConvert.INSTANCE.convert(itempackaging));
}
@GetMapping("/list")
@Operation(summary = "获得物品包装信息 列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
public CommonResult<List<ItempackagingRespVO>> getItempackagingList(@RequestParam("ids") Collection<Long> ids) {
List<ItempackagingDO> list = itempackagingService.getItempackagingList(ids);
return success(ItempackagingConvert.INSTANCE.convertList(list));
}
// @GetMapping("/list")
// @Operation(summary = "获得物品包装信息 列表")
// @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
// @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
// public CommonResult<List<ItempackagingRespVO>> getItempackagingList(@RequestParam("ids") Collection<Long> ids) {
// List<ItempackagingDO> list = itempackagingService.getItempackagingList(ids);
// return success(ItempackagingConvert.INSTANCE.convertList(list));
// }
@GetMapping("/page")
@Operation(summary = "获得物品包装信息分页")
@ -122,14 +124,21 @@ public class ItempackagingController {
public void exportItempackagingExcel(@Valid ItempackagingExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ItempackagingDO> list = itempackagingService.getItempackagingList(exportReqVO);
// 导出 Excel
List<ItempackagingExcelVO> datas = ItempackagingConvert.INSTANCE.convertList02(list);
for(ItempackagingExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ItempackagingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出物品包装信息 Excel")
@PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
@OperateLog(type = EXPORT)
public void exportItempackagingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ItempackagingDO> list = itempackagingService.getItempackagingList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ItempackagingExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "物品包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown);
}
private List<ItempackagingExcelVO> getExcelVo(List<ItempackagingDO> list, Map<Integer, String[]> mapDropDown) {
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(1, uom);
String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
@ -144,9 +153,17 @@ public class ItempackagingController {
mapDropDown.put(11, altPackUnit4);;
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(13, available);;
ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<ItempackagingExcelVO> resultList = ItempackagingConvert.INSTANCE.convertList02(list);
for(ItempackagingExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入物品包装信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -9,10 +9,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.location.vo.*;
import com.win.module.wms.controller.locationgroup.vo.LocationgroupRespVO;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.location.LocationConvert;
import com.win.module.wms.convert.locationgroup.LocationgroupConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.mysql.balance.BalanceMapper;
import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
@ -140,14 +143,21 @@ public class LocationController {
public void exportLocationExcel(@Valid LocationExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<LocationDO> list = locationService.getLocationList(exportReqVO);
// 导出 Excel
List<LocationExcelVO> datas = LocationConvert.INSTANCE.convertList02(list);
for(LocationExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<LocationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出库位 Excel")
@PreAuthorize("@ss.hasPermission('wms:location:export')")
@OperateLog(type = EXPORT)
public void exportLocationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<LocationDO> list = locationService.getLocationList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<LocationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown);
}
private List<LocationExcelVO> getExcelVo(List<LocationDO> list, Map<Integer, String[]> mapDropDown) {
String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
mapDropDown.put(3, warehouseCode);
String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
@ -158,8 +168,16 @@ public class LocationController {
mapDropDown.put(7, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(18, available);;
ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<LocationExcelVO> resultList =LocationConvert.INSTANCE.convertList02(list);
for(LocationExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入库位模板")
public void importTemplate(HttpServletResponse response) throws IOException {

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

@ -9,9 +9,12 @@ 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.areabasic.vo.AreabasicRespVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.locationgroup.vo.*;
import com.win.module.wms.convert.areabasic.AreabasicConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.locationgroup.LocationgroupConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.locationgroup.LocationgroupService;
@ -121,22 +124,37 @@ public class LocationgroupController {
public void exportLocationgroupExcel(@Valid LocationgroupExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<LocationgroupDO> list = locationgroupService.getLocationgroupList(exportReqVO);
// 导出 Excel
List<LocationgroupExcelVO> datas = LocationgroupConvert.INSTANCE.convertList02(list);
for(LocationgroupExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<LocationgroupExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出库位组 Excel")
@PreAuthorize("@ss.hasPermission('wms:locationgroup:export')")
@OperateLog(type = EXPORT)
public void exportLocationgroupExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<LocationgroupDO> list = locationgroupService.getLocationgroupList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<LocationgroupExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown);
}
private List<LocationgroupExcelVO> getExcelVo(List<LocationgroupDO> list, Map<Integer, String[]> mapDropDown) {
String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
mapDropDown.put(3, warehouseCode);
String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
mapDropDown.put(4, areaCode);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
mapDropDown.put(5, available);;
ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<LocationgroupExcelVO> resultList = LocationgroupConvert.INSTANCE.convertList02(list);
for(LocationgroupExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入库位组模板")
public void importTemplate(HttpServletResponse response) throws IOException {

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java

@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.process.vo.*;
import com.win.module.wms.controller.workstation.vo.WorkstationRespVO;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.process.ProcessConvert;
import com.win.module.wms.convert.workstation.WorkstationConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.process.ProcessDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.process.ProcessService;
@ -80,14 +83,6 @@ public class ProcessController {
return success(ProcessConvert.INSTANCE.convert(process));
}
@GetMapping("/list")
@Operation(summary = "获得工序列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:process:query')")
public CommonResult<List<ProcessRespVO>> getProcessList(@RequestParam("ids") Collection<Long> ids) {
List<ProcessDO> list = processService.getProcessList(ids);
return success(ProcessConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得工序分页")
@ -110,15 +105,31 @@ public class ProcessController {
public void exportProcessExcel(@Valid ProcessExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ProcessDO> list = processService.getProcessList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProcessExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出工序 Excel")
@PreAuthorize("@ss.hasPermission('wms:process:export')")
@OperateLog(type = EXPORT)
public void exportProcessExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ProcessDO> list = processService.getProcessList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProcessExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown);
}
private List<ProcessExcelVO> getExcelVo(List<ProcessDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<ProcessExcelVO> datas = ProcessConvert.INSTANCE.convertList02(list);
for(ProcessExcelVO vo : datas) {
List<ProcessExcelVO> resultList = ProcessConvert.INSTANCE.convertList02(list);
for(ProcessExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "工序.xls", "数据", ProcessExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入参数设置模板")
public void importTemplate(HttpServletResponse response) throws IOException {

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java

@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.productionline.vo.*;
import com.win.module.wms.controller.workshop.vo.WorkshopRespVO;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.productionline.ProductionlineConvert;
import com.win.module.wms.convert.workshop.WorkshopConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.productionline.ProductionlineService;
@ -79,14 +82,6 @@ public class ProductionlineController {
return success(ProductionlineConvert.INSTANCE.convert(productionline));
}
@GetMapping("/list")
@Operation(summary = "获得生产线列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:productionline:query')")
public CommonResult<List<ProductionlineRespVO>> getProductionlineList(@RequestParam("ids") Collection<Long> ids) {
List<ProductionlineDO> list = productionlineService.getProductionlineList(ids);
return success(ProductionlineConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得生产线分页")
@ -109,15 +104,31 @@ public class ProductionlineController {
public void exportProductionlineExcel(@Valid ProductionlineExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ProductionlineDO> list = productionlineService.getProductionlineList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProductionlineExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出生产线 Excel")
@PreAuthorize("@ss.hasPermission('wms:productionline:export')")
@OperateLog(type = EXPORT)
public void exportProductionlineExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ProductionlineDO> list = productionlineService.getProductionlineList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProductionlineExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown);
}
private List<ProductionlineExcelVO> getExcelVo(List<ProductionlineDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<ProductionlineExcelVO> datas = ProductionlineConvert.INSTANCE.convertList02(list);
for(ProductionlineExcelVO vo : datas) {
List<ProductionlineExcelVO> resultList = ProductionlineConvert.INSTANCE.convertList02(list);
for(ProductionlineExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "生产线.xls", "数据", ProductionlineExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入参数设置模板")
public void importTemplate(HttpServletResponse response) throws IOException {

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java

@ -8,8 +8,11 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.productionlineitem.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.productionlineitem.ProductionlineitemService;
@ -78,15 +81,6 @@ public class ProductionlineitemController {
return success(ProductionlineitemConvert.INSTANCE.convert(productionlineitem));
}
@GetMapping("/list")
@Operation(summary = "获得生产线物料关系列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')")
public CommonResult<List<ProductionlineitemRespVO>> getProductionlineitemList(@RequestParam("ids") Collection<Long> ids) {
List<ProductionlineitemDO> list = productionlineitemService.getProductionlineitemList(ids);
return success(ProductionlineitemConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得生产线物料关系分页")
@PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')")
@ -102,14 +96,29 @@ public class ProductionlineitemController {
public void exportProductionlineitemExcel(@Valid ProductionlineitemExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ProductionlineitemDO> list = productionlineitemService.getProductionlineitemList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProductionlineitemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出生产线物料关系 Excel")
@PreAuthorize("@ss.hasPermission('wms:productionlineitem:export')")
@OperateLog(type = EXPORT)
public void exportProductionlineitemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ProductionlineitemDO> list = productionlineitemService.getProductionlineitemList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProductionlineitemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown);
}
private List<ProductionlineitemExcelVO> getExcelVo(List<ProductionlineitemDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<ProductionlineitemExcelVO> datas = ProductionlineitemConvert.INSTANCE.convertList02(list);
for(ProductionlineitemExcelVO vo : datas) {
List<ProductionlineitemExcelVO> resultList = ProductionlineitemConvert.INSTANCE.convertList02(list);
for(ProductionlineitemExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "生产线物料关系.xls", "数据", ProductionlineitemExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入生产线物料关系模板")

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java

@ -23,6 +23,9 @@ public class ProductionlineItemImportExcelVO {
@ExcelProperty("完工收货库位")
private String fgLocationCode;
@ExcelProperty("原料库位")
private String rawLocationCode;
@ExcelProperty("产线代码")
private String productionLineCode;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java

@ -20,6 +20,9 @@ public class ProductionlineitemExcelVO {
@ExcelProperty("完工收货库位")
private String fgLocationCode;
@ExcelProperty("原料库位")
private String rawLocationCode;
@ExcelProperty("产线代码")
private String productionLineCode;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java

@ -113,4 +113,6 @@ public class ProductreceiptRequestDetailBaseVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "到库位代码")
private String toLocationCode;
}

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java

@ -9,9 +9,12 @@ 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.customeritem.vo.CustomeritemRespVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.project.vo.*;
import com.win.module.wms.convert.customeritem.CustomeritemConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.project.ProjectConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.project.ProjectDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.project.ProjectService;
@ -91,14 +94,6 @@ public class ProjectController {
}
return success(result);
}
@GetMapping("/list")
@Operation(summary = "获得项目列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:project:query')")
public CommonResult<List<ProjectRespVO>> getProjectList(@RequestParam("ids") Collection<Long> ids) {
List<ProjectDO> list = projectService.getProjectList(ids);
return success(ProjectConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得项目分页")
@ -121,15 +116,32 @@ public class ProjectController {
public void exportProjectExcel(@Valid ProjectExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<ProjectDO> list = projectService.getProjectList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProjectExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出项目 Excel")
@PreAuthorize("@ss.hasPermission('wms:project:export')")
@OperateLog(type = EXPORT)
public void exportProjectExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<ProjectDO> list = projectService.getProjectList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<ProjectExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "项目.xlsx", "数据",ProjectExcelVO.class, resultList, mapDropDown);
}
private List<ProjectExcelVO> getExcelVo(List<ProjectDO> list, Map<Integer, String[]> mapDropDown) {
// 导出 Excel
List<ProjectExcelVO> datas = ProjectConvert.INSTANCE.convertList02(list);
for(ProjectExcelVO vo : datas) {
List<ProjectExcelVO> resultList = ProjectConvert.INSTANCE.convertList02(list);
for(ProjectExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "项目.xls", "数据", ProjectExcelVO.class, datas);
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入参数设置模板")
public void importTemplate(HttpServletResponse response) throws IOException {

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java

@ -48,6 +48,10 @@ public class PurchaseDetailBaseVO {
@NotNull(message = "转换率不能为空")
private BigDecimal convertRate;
@Schema(description = "已计划数量", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "已计划数量不能为空")
private BigDecimal plannedQty;
@Schema(description = "已发货数量", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "已发货数量不能为空")
private BigDecimal shippedQty;

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java

@ -56,6 +56,9 @@ public class PurchaseDetailExcelVO {
@ExcelProperty("转换率")
private BigDecimal convertRate;
@ExcelProperty("已计划数量")
private BigDecimal plannedQty;
@ExcelProperty("已发货数量")
private BigDecimal shippedQty;
@ -108,6 +111,7 @@ public class PurchaseDetailExcelVO {
@ExcelProperty("并发乐观锁")
private String concurrencyStamp;
@ExcelProperty(value = "明细状态", converter = DictConvert.class)
@DictFormat("purchase_order_detail_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String status;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java

@ -98,4 +98,7 @@ public class PurchaseDetailExportReqVO {
@Schema(description = "是否可用")
private String available;
@Schema(description = "已计划数量")
private BigDecimal plannedQty;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java

@ -100,4 +100,6 @@ public class PurchaseDetailPageReqVO extends PageParam {
@Schema(description = "是否可用")
private String available;
@Schema(description = "已计划数量")
private BigDecimal plannedQty;
}

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java

@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.purchaseprice.vo.*;
import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceRespVO;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert;
import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.purchaseprice.PurchasepriceService;
@ -91,14 +94,6 @@ public class PurchasepriceController {
return success(PurchasepriceConvert.INSTANCE.convert(purchaseprice));
}
@GetMapping("/list")
@Operation(summary = "获得采购价格单列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')")
public CommonResult<List<PurchasepriceRespVO>> getPurchasepriceList(@RequestParam("ids") Collection<Long> ids) {
List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(ids);
return success(PurchasepriceConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购价格单分页")
@ -121,18 +116,33 @@ public class PurchasepriceController {
public void exportPurchasepriceExcel(@Valid PurchasepriceExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(exportReqVO);
// 导出 Excel
List<PurchasepriceExcelVO> datas = PurchasepriceConvert.INSTANCE.convertList02(list);
for(PurchasepriceExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<PurchasepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出采购价格单 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchaseprice:export')")
@OperateLog(type = EXPORT)
public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<PurchasepriceDO> list = purchasepriceService.getPurchasepriceList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<PurchasepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "采购价格单.xlsx", "数据",PurchasepriceExcelVO.class, resultList, mapDropDown);
}
private List<PurchasepriceExcelVO> getExcelVo(List<PurchasepriceDO> list, Map<Integer, String[]> mapDropDown) {
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(2, currency);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(4, available);
ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<PurchasepriceExcelVO> resultList = PurchasepriceConvert.INSTANCE.convertList02(list);
for(PurchasepriceExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入采购价格单模板")

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java

@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailCon
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -34,15 +33,6 @@ public class PurchasereceiptJobDetailController {
@Resource
private AdminUserApi userApi;
@GetMapping("/get")
@Operation(summary = "获得采购收货任务子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")
public CommonResult<PurchasereceiptJobDetailRespVO> getPurchasereceiptJobDetail(@RequestParam("id") Long id) {
PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id);
return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得采购收货任务子信息分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@ -176,16 +176,16 @@ public class PurchasereceiptJobMainController {
@Operation(summary = "承接任务")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')")
@PostMapping(value = "/accept/{id}")
public CommonResult<Boolean> accept(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.accept(id);
public CommonResult<Boolean> acceptPurchasereceiptJobMain(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.acceptPurchasereceiptJobMain(id);
return success(result > 0);
}
@Operation(summary = "取消承接任务")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')")
@PostMapping(value = "/cancelAccept/{id}")
public CommonResult<Boolean> cancelAccept(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.cancelAccept(id);
public CommonResult<Boolean> cancelAcceptPurchasereceiptJobMain(@PathVariable("id") Long id) {
int result = purchasereceiptJobMainService.cancelAcceptPurchasereceiptJobMain(id);
return success(result > 0);
}

21
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java

@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDet
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.pojo.CommonResult.success;
@ -36,24 +33,6 @@ public class PurchasereceiptRecordDetailController {
@Resource
private AdminUserApi userApi;
@GetMapping("/get")
@Operation(summary = "获得采购收货记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")
public CommonResult<PurchasereceiptRecordDetailRespVO> getPurchasereceiptRecordDetail(@RequestParam("id") Long id) {
PurchasereceiptRecordDetailDO purchasereceiptRecordDetail = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetail(id);
return success(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetail));
}
@GetMapping("/list")
@Operation(summary = "获得采购收货记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")
public CommonResult<List<PurchasereceiptRecordDetailRespVO>> getPurchasereceiptRecordDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PurchasereceiptRecordDetailDO> list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(ids);
return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购收货记录子分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java

@ -59,10 +59,10 @@ public class PurchaseshortageDetailExportReqVO {
private String toLocationGroupCode;
@Schema(description = "从库区代码")
private String fromAreaCodes;
private String fromAreaCode;
@Schema(description = "到库区代码")
private String toAreaCodes;
private String toAreaCode;
@Schema(description = "订单号")
private String poNumber;

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java

@ -64,10 +64,10 @@ public class PurchaseshortageDetailPageReqVO extends PageParam {
private String toLocationGroupCode;
@Schema(description = "从库区代码")
private String fromAreaCodes;
private String fromAreaCode;
@Schema(description = "到库区代码")
private String toAreaCodes;
private String toAreaCode;
@Schema(description = "订单号")
private String poNumber;

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java

@ -61,8 +61,8 @@ public class PurchasereceiptRequestDetailController {
@Operation(summary = "更新采购收货申请子")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')")
public CommonResult<Boolean> updatePurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailUpdateReqVO updateReqVO) {
purchasereceiptRequestDetailService.updatePurchasereceiptRequestDetail(updateReqVO);
return success(true);
int result = purchasereceiptRequestDetailService.updatePurchasereceiptRequestDetail(updateReqVO);
return success(result > 0);
}
@DeleteMapping("/delete")
@ -70,8 +70,8 @@ public class PurchasereceiptRequestDetailController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:delete')")
public CommonResult<Boolean> deletePurchasereceiptRequestDetail(@RequestParam("id") Long id) {
purchasereceiptRequestDetailService.deletePurchasereceiptRequestDetail(id);
return success(true);
int result = purchasereceiptRequestDetailService.deletePurchasereceiptRequestDetail(id);
return success(result > 0);
}
@GetMapping("/get")

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java

@ -127,7 +127,7 @@ public class PurchasereceiptRequestMainController {
ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@PostMapping("/export-excel-senior")
@Operation(summary = "导出采购收货申请主 Excel")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:export')")
@OperateLog(type = EXPORT)
@ -161,11 +161,14 @@ public class PurchasereceiptRequestMainController {
List<PurchasereceiptRequestDetailDO> subList = purchasereceiptRequestDetailService.selectList(mainDO.getId());
for(PurchasereceiptRequestDetailDO detailDO : subList) {
PurchasereceiptRequestMainExcelVO vo = PurchasereceiptRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator()));
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入采购收货申请信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java

@ -31,7 +31,7 @@ public class PurchasereceiptRequestMainExcelVO {
private String carrierCode;
@ExcelProperty(value = "运输方式", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRANSFER_MODE) // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRANSFER_MODE)
private String transferMode;
@ExcelProperty("从仓库代码")

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java

@ -8,11 +8,14 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.project.vo.ProjectRespVO;
import com.win.module.wms.controller.saleprice.vo.*;
import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.project.ProjectConvert;
import com.win.module.wms.convert.saleprice.SalepriceConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.saleprice.SalepriceService;
@ -81,14 +84,6 @@ public class SalepriceController {
return success(SalepriceConvert.INSTANCE.convert(saleprice));
}
@GetMapping("/list")
@Operation(summary = "获得销售价格单列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:saleprice:query')")
public CommonResult<List<SalepriceRespVO>> getSalepriceList(@RequestParam("ids") Collection<Long> ids) {
List<SalepriceDO> list = salepriceService.getSalepriceList(ids);
return success(SalepriceConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得销售价格单分页")
@ -123,20 +118,35 @@ public class SalepriceController {
public void exportSalepriceExcel(@Valid SalepriceExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<SalepriceDO> list = salepriceService.getSalepriceList(exportReqVO);
// 导出 Excel
List<SalepriceExcelVO> datas = SalepriceConvert.INSTANCE.convertList02(list);
for(SalepriceExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SalepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出销售价格单 Excel")
@PreAuthorize("@ss.hasPermission('wms:saleprice:export')")
@OperateLog(type = EXPORT)
public void exportSalepriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<SalepriceDO> list =salepriceService.getSalepriceList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SalepriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "销售价格单.xlsx", "数据", SalepriceExcelVO.class, resultList, mapDropDown);
}
private List<SalepriceExcelVO> getExcelVo(List<SalepriceDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(4, available);
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(2, currency);
ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<SalepriceExcelVO> resultList = SalepriceConvert.INSTANCE.convertList02(list);
for(SalepriceExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导销售价格单信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java

@ -9,11 +9,14 @@ 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.bom.vo.BomRespVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.stdcostprice.vo.*;
import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceImportExcelVo;
import com.win.module.wms.convert.bom.BomConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert;
import com.win.module.wms.dal.dataobject.bom.BomDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.stdcostprice.StdcostpriceService;
@ -82,14 +85,6 @@ public class StdcostpriceController {
return success(StdcostpriceConvert.INSTANCE.convert(stdcostprice));
}
@GetMapping("/list")
@Operation(summary = "获得标准成本价格单列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:stdcostprice:query')")
public CommonResult<List<StdcostpriceRespVO>> getStdcostpriceList(@RequestParam("ids") Collection<Long> ids) {
List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(ids);
return success(StdcostpriceConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得标准成本价格单分页")
@ -126,18 +121,33 @@ public class StdcostpriceController {
public void exportStdcostpriceExcel(@Valid StdcostpriceExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(exportReqVO);
// 导出 Excel
List<StdcostpriceExcelVO> datas = StdcostpriceConvert.INSTANCE.convertList02(list);
for(StdcostpriceExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<StdcostpriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出标准成本价格单 Excel")
@PreAuthorize("@ss.hasPermission('wms:stdcostprice:export')")
@OperateLog(type = EXPORT)
public void exportStdcostpriceExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<StdcostpriceDO> list = stdcostpriceService.getStdcostpriceList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<StdcostpriceExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "标准成本价格单.xlsx", "数据", StdcostpriceExcelVO.class, resultList, mapDropDown);
}
private List<StdcostpriceExcelVO> getExcelVo(List<StdcostpriceDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(4, available);
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(2, currency);
ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<StdcostpriceExcelVO> resultList = StdcostpriceConvert.INSTANCE.convertList02(list);
for(StdcostpriceExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入标准成本价格单信息模板")

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java

@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO;
import com.win.module.wms.controller.supplier.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
import com.win.module.wms.convert.supplier.SupplierConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.supplier.SupplierService;
@ -121,20 +124,35 @@ public class SupplierController {
public void exportSupplierExcel(@Valid SupplierExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<SupplierDO> list = supplierService.getSupplierList(exportReqVO);
// 导出 Excel
List<SupplierExcelVO> datas = SupplierConvert.INSTANCE.convertList02(list);
for(SupplierExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SupplierExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出供应商 Excel")
@PreAuthorize("@ss.hasPermission('wms:supplier:export')")
@OperateLog(type = EXPORT)
public void exportSupplierExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<SupplierDO> list = supplierService.getSupplierList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SupplierExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "供应商.xlsx", "数据", SupplierExcelVO.class, resultList, mapDropDown);
}
private List<SupplierExcelVO> getExcelVo(List<SupplierDO> list, Map<Integer, String[]> mapDropDown) {
String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
mapDropDown.put(11, currency);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE);
mapDropDown.put(13, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(14, available);
ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<SupplierExcelVO> resultList = SupplierConvert.INSTANCE.convertList02(list);
for(SupplierExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入供应商模板")

30
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java

@ -3,7 +3,17 @@ package com.win.module.wms.controller.supplierdeliverRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExcelVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainRespVO;
import com.win.module.wms.controller.supplierdeliverRecord.vo.*;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -34,6 +44,8 @@ public class SupplierdeliverRecordMainController {
@Resource
private SupplierdeliverRecordMainService supplierdeliverRecordMainService;
@Resource
private SupplierdeliverRecordDetailService supplierdeliverRecordDetailService;
@Resource
private AdminUserApi userApi;
@ -112,4 +124,22 @@ public class SupplierdeliverRecordMainController {
ExcelUtils.write(response, "供应商发货记录主.xls", "数据", SupplierdeliverRecordMainExcelVO.class, datas);
}
@GetMapping("/getSupplierdeliverRecordById")
@Operation(summary = "APP获得供应商发货记录主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')")
public CommonResult<SupplierdeliverRecordMainRespVO> getSupplierdeliverRecordById(@RequestParam("id") Long id) {
SupplierdeliverRecordMainDO supplierdeliverRecordMain = supplierdeliverRecordMainService.getSupplierdeliverRecordMain(id);
SupplierdeliverRecordMainRespVO result = SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMain);
if(result==null) {
return success(result);
};
SupplierdeliverRecordDetailExportReqVO reqVO = new SupplierdeliverRecordDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<SupplierdeliverRecordDetailDO> list = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailList(reqVO);
List<SupplierdeliverRecordDetailExcelVO> vos = SupplierdeliverRecordDetailConvert.INSTANCE.convertList02(list);
result.setSubList(vos);
return success(result);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java

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

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java

@ -3,10 +3,15 @@ package com.win.module.wms.controller.supplierdeliverRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@Schema(description = "管理后台 - 供应商发货记录主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class SupplierdeliverRecordMainRespVO extends SupplierdeliverRecordMainBaseVO {
@Schema(description = "供应商发货记录子表record_supplierdeliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java

@ -27,12 +27,6 @@ public class SupplierdeliverRequestDetailBaseVO {
@Schema(description = "id", example = "id")
private Long id;
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次")
private String batch;

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java

@ -26,12 +26,6 @@ import com.win.framework.excel.core.convert.DictConvert;
@Data
public class SupplierdeliverRequestDetailExcelVO {
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("批次")
private String batch;

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java

@ -15,12 +15,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@Data
public class SupplierdeliverRequestDetailExportReqVO {
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次")
private String batch;

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java

@ -17,12 +17,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@ToString(callSuper = true)
public class SupplierdeliverRequestDetailPageReqVO extends PageParam {
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次")
private String batch;

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java

@ -30,20 +30,6 @@ public class SupplierinvoiceRequestDetailBaseVO {
@Schema(description = "货主代码")
private String ownerCode;
@Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "包装号不能为空")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "批次不能为空")
private String batch;
@Schema(description = "替代批次")
private String altBatch;
@Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "订单号不能为空")
private String poNumber;

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java

@ -29,18 +29,6 @@ public class SupplierinvoiceRequestDetailExcelVO {
@ExcelProperty("货主代码")
private String ownerCode;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("批次")
private String batch;
@ExcelProperty("替代批次")
private String altBatch;
@ExcelProperty("订单号")
private String poNumber;

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java

@ -21,18 +21,6 @@ public class SupplierinvoiceRequestDetailExportReqVO {
@Schema(description = "货主代码")
private String ownerCode;
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次")
private String batch;
@Schema(description = "替代批次")
private String altBatch;
@Schema(description = "订单号")
private String poNumber;

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java

@ -23,18 +23,6 @@ public class SupplierinvoiceRequestDetailPageReqVO extends PageParam {
@Schema(description = "货主代码")
private String ownerCode;
@Schema(description = "包装号")
private String packingNumber;
@Schema(description = "器具号")
private String containerNumber;
@Schema(description = "批次")
private String batch;
@Schema(description = "替代批次")
private String altBatch;
@Schema(description = "订单号")
private String poNumber;

43
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java

@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceRespVO;
import com.win.module.wms.controller.supplieritem.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert;
import com.win.module.wms.convert.supplieritem.SupplieritemConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.supplieritem.SupplieritemService;
@ -80,14 +83,6 @@ public class SupplieritemController {
return success(SupplieritemConvert.INSTANCE.convert(supplieritem));
}
@GetMapping("/list")
@Operation(summary = "获得供应商物品列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:supplieritem:query')")
public CommonResult<List<SupplieritemRespVO>> getSupplieritemList(@RequestParam("ids") Collection<Long> ids) {
List<SupplieritemDO> list = supplieritemService.getSupplieritemList(ids);
return success(SupplieritemConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得供应商物品分页")
@ -123,13 +118,21 @@ public class SupplieritemController {
public void exportSupplieritemExcel(@Valid SupplieritemExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<SupplieritemDO> list = supplieritemService.getSupplieritemList(exportReqVO);
// 导出 Excel
List<SupplieritemExcelVO> datas = SupplieritemConvert.INSTANCE.convertList02(list);
for(SupplieritemExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SupplieritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出供应商物品 Excel")
@PreAuthorize("@ss.hasPermission('wms:supplieritem:export')")
@OperateLog(type = EXPORT)
public void exportSupplieritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<SupplieritemDO> list = supplieritemService.getSupplieritemList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SupplieritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown);
}
private List<SupplieritemExcelVO> getExcelVo(List<SupplieritemDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(13, available);
String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
@ -140,9 +143,15 @@ public class SupplieritemController {
mapDropDown.put(7, altPackUnit);
String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE);
mapDropDown.put(12, settlementType);
ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<SupplieritemExcelVO> resultList = SupplieritemConvert.INSTANCE.convertList02(list);
for(SupplieritemExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入供应商物品信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

39
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java

@ -8,11 +8,14 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.process.vo.ProcessRespVO;
import com.win.module.wms.controller.systemcalendar.vo.*;
import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.process.ProcessConvert;
import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.systemcalendar.SystemcalendarService;
@ -79,14 +82,6 @@ public class SystemcalendarController {
return success(SystemcalendarConvert.INSTANCE.convert(systemcalendar));
}
@GetMapping("/list")
@Operation(summary = "获得系统日历列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:systemcalendar:query')")
public CommonResult<List<SystemcalendarRespVO>> getSystemcalendarList(@RequestParam("ids") Collection<Long> ids) {
List<SystemcalendarDO> list = systemcalendarService.getSystemcalendarList(ids);
return success(SystemcalendarConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得系统日历分页")
@ -121,17 +116,33 @@ public class SystemcalendarController {
public void exportSystemcalendarExcel(@Valid SystemcalendarExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<SystemcalendarDO> list = systemcalendarService.getSystemcalendarList(exportReqVO);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SystemcalendarExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出系统日历 Excel")
@PreAuthorize("@ss.hasPermission('wms:systemcalendar:export')")
@OperateLog(type = EXPORT)
public void exportSystemcalendarExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<SystemcalendarDO> list = systemcalendarService.getSystemcalendarList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<SystemcalendarExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "系统日历.xlsx", "数据", SystemcalendarExcelVO.class, resultList, mapDropDown);
}
private List<SystemcalendarExcelVO> getExcelVo(List<SystemcalendarDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(3, available);
// 导出 Excel
List<SystemcalendarExcelVO> datas = SystemcalendarConvert.INSTANCE.convertList02(list);
for(SystemcalendarExcelVO vo : datas) {
List<SystemcalendarExcelVO> resultList = SystemcalendarConvert.INSTANCE.convertList02(list);
for(SystemcalendarExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
} Map<Integer, String[]> mapDropDown = new HashMap<>();
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(3, available);
ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas,mapDropDown);
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入班组信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java

@ -49,7 +49,7 @@ public class TransactionController {
@Operation(summary = "创建库存事务并增加库存转运日志")
@PreAuthorize("@ss.hasPermission('wms:transaction:create')")
public CommonResult<Integer> createTransactionAndTransferLog(@Valid @RequestBody TransactionCreateReqListVO transactionCreateReqListVO) {
return success(transactionService.createTransaction(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList()));
return success(transactionService.createTransactionAndTransferlog(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList()));
}
@PostMapping("/senior")

34
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java

@ -10,12 +10,15 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.customer.vo.CustomerRespVO;
import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo;
import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO;
import com.win.module.wms.controller.warehouse.vo.*;
import com.win.module.wms.convert.customer.CustomerConvert;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.warehouse.WarehouseConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO;
import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper;
import com.win.module.wms.enums.DictTypeConstants;
@ -115,20 +118,35 @@ public class WarehouseController {
public void exportWarehouseExcel(@Valid WarehouseExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<WarehouseDO> list = warehouseService.getWarehouseList(exportReqVO);
// 导出 Excel
List<WarehouseExcelVO> datas = WarehouseConvert.INSTANCE.convertList02(list);
for(WarehouseExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WarehouseExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出仓库 Excel")
@PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
@OperateLog(type = EXPORT)
public void exportWarehouseExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<WarehouseDO> list = warehouseService.getWarehouseList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WarehouseExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown);
}
private List<WarehouseExcelVO> getExcelVo(List<WarehouseDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(4, available);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
mapDropDown.put(3, type);
ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<WarehouseExcelVO> resultList = WarehouseConvert.INSTANCE.convertList02(list);
for(WarehouseExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入仓库信息模板")
public void importTemplate(HttpServletResponse response) throws IOException {

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java

@ -8,12 +8,15 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.location.vo.LocationRespVO;
import com.win.module.wms.controller.workshop.vo.WorkshopRespVO;
import com.win.module.wms.controller.workshop.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.location.LocationConvert;
import com.win.module.wms.convert.workshop.WorkshopConvert;
import com.win.module.wms.convert.workshop.WorkshopConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
import com.win.module.wms.enums.DictTypeConstants;
@ -83,15 +86,6 @@ public class WorkshopController {
return success(WorkshopConvert.INSTANCE.convert(workshop));
}
@GetMapping("/list")
@Operation(summary = "获得车间列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:workshop:query')")
public CommonResult<List<WorkshopRespVO>> getWorkshopList(@RequestParam("ids") Collection<Long> ids) {
List<WorkshopDO> list = workshopService.getWorkshopList(ids);
return success(WorkshopConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得车间分页")
@PreAuthorize("@ss.hasPermission('wms:workshop:query')")
@ -113,19 +107,33 @@ public class WorkshopController {
public void exportWorkshopExcel(@Valid WorkshopExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<WorkshopDO> list = workshopService.getWorkshopList(exportReqVO);
// 导出 Excel
List<WorkshopExcelVO> datas = WorkshopConvert.INSTANCE.convertList02(list);
for(WorkshopExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WorkshopExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出车间 Excel")
@PreAuthorize("@ss.hasPermission('wms:workshop:export')")
@OperateLog(type = EXPORT)
public void exportWorkshopExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<WorkshopDO> list = workshopService.getWorkshopList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WorkshopExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown);
}
private List<WorkshopExcelVO> getExcelVo(List<WorkshopDO> list, Map<Integer, String[]> mapDropDown) {
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(4, available);
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE);
mapDropDown.put(3, type);
ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<WorkshopExcelVO> resultList = WorkshopConvert.INSTANCE.convertList02(list);
for(WorkshopExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@PostMapping("/senior")

41
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java

@ -8,11 +8,14 @@ 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.itembasic.vo.ItembasicExcelVO;
import com.win.module.wms.controller.productionline.vo.ProductionlineRespVO;
import com.win.module.wms.controller.workstation.vo.WorkstationRespVO;
import com.win.module.wms.controller.workstation.vo.*;
import com.win.module.wms.convert.itembasic.ItembasicConvert;
import com.win.module.wms.convert.productionline.ProductionlineConvert;
import com.win.module.wms.convert.workstation.WorkstationConvert;;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.workstation.WorkstationDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.workstation.WorkstationService;
@ -79,14 +82,6 @@ public class WorkstationController {
return success(WorkstationConvert.INSTANCE.convert(workstation));
}
@GetMapping("/list")
@Operation(summary = "获得工位列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:workstation:query')")
public CommonResult<List<WorkstationRespVO>> getWorkstationList(@RequestParam("ids") Collection<Long> ids) {
List<WorkstationDO> list = workstationService.getWorkstationList(ids);
return success(WorkstationConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得工位分页")
@ -123,19 +118,33 @@ public class WorkstationController {
public void exportWorkstationExcel(@Valid WorkstationExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<WorkstationDO> list = workstationService.getWorkstationList(exportReqVO);
// 导出 Excel
List<WorkstationExcelVO> datas = WorkstationConvert.INSTANCE.convertList02(list);
for(WorkstationExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WorkstationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown);
}
@PostMapping("/export-excel-senior")
@Operation(summary = "导出工位 Excel")
@PreAuthorize("@ss.hasPermission('wms:workstation:export')")
@OperateLog(type = EXPORT)
public void exportWorkstationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<WorkstationDO> list = workstationService.getWorkstationList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<WorkstationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown);
}
private List<WorkstationExcelVO> getExcelVo(List<WorkstationDO> list, Map<Integer, String[]> mapDropDown) {
String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE);
mapDropDown.put(3, type);
String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(10, available);
ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas,mapDropDown);
// 导出 Excel
List<WorkstationExcelVO> resultList = WorkstationConvert.INSTANCE.convertList02(list);
for(WorkstationExcelVO vo : resultList) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return resultList;
}
@GetMapping("/get-import-template")

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java

@ -4,6 +4,7 @@ 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;
import lombok.Data;
import java.time.LocalDateTime;
@ -27,7 +28,7 @@ public class WorkstationExcelVO {
private String description;
@ExcelProperty(value = "类型", converter = DictConvert.class)
@DictFormat("work_station_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.WORK_STATION_TYPE)
private String type;
@ExcelProperty("车间代码")
@ -43,8 +44,8 @@ public class WorkstationExcelVO {
private String fgLocationCode;
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private Integer available;
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String available;
@ExcelProperty("生效时间")
@ColumnWidth(value = 16)

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java

@ -1,16 +1,15 @@
package com.win.module.wms.convert.expectin;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
import com.win.module.wms.controller.expectin.vo.ExpectinExcelVO;
import com.win.module.wms.controller.expectin.vo.ExpectinRespVO;
import com.win.module.wms.controller.expectin.vo.ExpectinUpdateReqVO;
import com.win.module.wms.dal.dataobject.expectin.ExpectinDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.expectin.ExpectinDO;
import java.util.List;
/**
* 预计入库存 Convert
@ -34,4 +33,5 @@ public interface ExpectinConvert {
List<ExpectinExcelVO> convertList02(List<ExpectinDO> list);
List<ExpectinDO> convertList03(List<ExpectinCreateReqVO> list);
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java

@ -1,16 +1,15 @@
package com.win.module.wms.convert.expectout;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutExcelVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutRespVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO;
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
import java.util.List;
/**
* 预计出库存 Convert
@ -34,4 +33,5 @@ public interface ExpectoutConvert {
List<ExpectoutExcelVO> convertList02(List<ExpectoutDO> list);
List<ExpectoutDO> convertList03(List<ExpectoutCreateReqVO> list);
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobDetailConvert.java

@ -1,16 +1,16 @@
package com.win.module.wms.convert.inspectJob;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExcelVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import java.util.List;
/**
* 检验任务子 Convert
@ -34,4 +34,6 @@ public interface InspectJobDetailConvert {
List<InspectJobDetailExcelVO> convertList02(List<InspectJobDetailDO> list);
InspectJobDetailDO convert(InspectRequestDetailDO bean);
}

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java

@ -1,16 +1,19 @@
package com.win.module.wms.convert.inspectJob;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExcelVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import java.util.List;
/**
* 检验任务主 Convert
@ -34,4 +37,18 @@ public interface InspectJobMainConvert {
List<InspectJobMainExcelVO> convertList02(List<InspectJobMainDO> list);
InspectJobMainDO convert(InspectRequestMainDO bean);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "detailDO.itemCode", target = "itemCode"),
@Mapping(source = "detailDO.uom", target = "uom"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
InspectJobMainExcelVO convert(InspectJobMainDO mainDO, InspectJobDetailDO detailDO);
}

23
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java

@ -1,16 +1,18 @@
package com.win.module.wms.convert.inspectRecord;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import java.util.List;
/**
* 检验记录主 Convert
@ -34,4 +36,17 @@ public interface InspectRecordMainConvert {
List<InspectRecordMainExcelVO> convertList02(List<InspectRecordMainDO> list);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "detailDO.itemCode", target = "itemCode"),
@Mapping(source = "detailDO.sampleQty", target = "sampleQty"),
@Mapping(source = "detailDO.uom", target = "uom"),
@Mapping(source = "detailDO.code", target = "code"),
@Mapping(source = "detailDO.interfaceType", target = "interfaceType"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
})
InspectRecordMainExcelVO convert(InspectRecordMainDO mainDO, InspectRecordDetailDO detailDO);
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestDetailConvert.java

@ -1,16 +1,15 @@
package com.win.module.wms.convert.inspectRequest;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import java.util.List;
/**
* 检验申请子 Convert
@ -40,6 +39,7 @@ public interface InspectRequestDetailConvert {
List<InspectRequestDetailDO> convertList05(List<InspectRequestDetailUpdateReqVO> subList);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRequest/InspectRequestMainConvert.java

@ -1,13 +1,15 @@
package com.win.module.wms.convert.inspectRequest;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import java.util.List;
/**
* 检验申请主 Convert
@ -32,4 +34,16 @@ public interface InspectRequestMainConvert {
List<InspectRequestMainExcelVO> convertList02(List<InspectRequestMainDO> list);
InspectRequestMainDO convert(InspectRequestMainBaseVO baseVO);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "mainDO.uom", target = "uom"),
@Mapping(source = "detailDO.itemCode", target = "itemCode"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
InspectRequestMainExcelVO convert(InspectRequestMainDO mainDO, InspectRequestDetailDO detailDO);
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java

@ -1,5 +1,6 @@
package com.win.module.wms.dal.dataobject.countRequest;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@ -102,18 +103,9 @@ public class CountRequestDetailDO extends BaseDO {
/**
* 从包装号
*/
private String fromPackingNumber;
/**
* 到包装号
*/
private String toPackingNumber;
private String packingNumber;
/**
* 从器具号
*/
private String fromContainerNumber;
/**
* 到器具号
*/
private String toContainerNumber;
private String containerNumber;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java

@ -1,10 +1,13 @@
package com.win.module.wms.dal.dataobject.expectin;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sun.xml.bind.v2.TODO;
import com.win.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 预计入库存 DO
@ -23,8 +26,8 @@ public class ExpectinDO extends BaseDO {
/**
* id
*/
@TableId(type = IdType.INPUT)
private String id;
@TableId(type = IdType.AUTO)
private Long id;
/**
* 任务号
*/

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java

@ -1,10 +1,13 @@
package com.win.module.wms.dal.dataobject.expectout;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sun.xml.bind.v2.TODO;
import com.win.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/**
* 预计出库存 DO
@ -23,8 +26,8 @@ public class ExpectoutDO extends BaseDO {
/**
* id
*/
@TableId(type = IdType.INPUT)
private String id;
@TableId(type = IdType.AUTO)
private Long id;
/**
* 任务号
*/

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java

@ -26,6 +26,10 @@ public class InspectRequestDetailDO extends BaseDO {
*/
@TableId
private Long id;
/**
* 单据号
*/
private String number;
/**
* 包装号
*/

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java

@ -63,6 +63,10 @@ public class PurchaseDetailDO extends BaseDO {
* 转换率
*/
private BigDecimal convertRate;
/**
* 已计划数量
*/
private BigDecimal plannedQty;
/**
* 已发货数量
*/

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java

@ -86,11 +86,11 @@ public class PurchaseshortageDetailDO extends BaseDO {
/**
* 从库区代码
*/
private String fromAreaCodes;
private String fromAreaCode;
/**
* 到库区代码
*/
private String toAreaCodes;
private String toAreaCode;
/**
* 订单号
*/

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java

@ -1,5 +1,6 @@
package com.win.module.wms.dal.dataobject.supplierdeliverRequest;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@ -33,14 +34,6 @@ public class SupplierdeliverRequestDetailDO extends BaseDO {
*/
@TableId
private Long id;
/**
* 包装号
*/
private String packingNumber;
/**
* 器具号
*/
private String containerNumber;
/**
* 批次
*/

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java

@ -1,5 +1,6 @@
package com.win.module.wms.dal.dataobject.supplierinvoiceRequest;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
@ -38,22 +39,6 @@ public class SupplierinvoiceRequestDetailDO extends BaseDO {
* 货主代码
*/
private String ownerCode;
/**
* 包装号
*/
private String packingNumber;
/**
* 器具号
*/
private String containerNumber;
/**
* 批次
*/
private String batch;
/**
* 替代批次
*/
private String altBatch;
/**
* 订单号
*/

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java

@ -60,5 +60,8 @@ public interface AccountcalendarMapper extends BaseMapperX<AccountcalendarDO> {
.eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator())
.orderByDesc(AccountcalendarDO::getId));
}
default List<AccountcalendarDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java

@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.areabasic.vo.AreabasicExportReqVO;
import com.win.module.wms.controller.areabasic.vo.AreabasicPageReqVO;
import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -58,5 +59,8 @@ public interface AreabasicMapper extends BaseMapperX<AreabasicDO> {
.eqIfPresent(AreabasicDO::getCreator, reqVO.getCreator())
.orderByDesc(AreabasicDO::getId));
}
default List<AreabasicDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java

@ -62,5 +62,7 @@ public interface BomMapper extends BaseMapperX<BomDO> {
.eqIfPresent(BomDO::getCreator, reqVO.getCreator())
.orderByDesc(BomDO::getId));
}
default List<BomDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

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

Loading…
Cancel
Save