BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f99f8548f8637510198180dae9f1ae5258e9a069

Authored by YunaiV
1 parent 81193982

✨ feat(mes): 重命名产品收货单相关类和接口 

重命名产品收货单及其相关的 VO、DO、Service 和 API 接口，以统一命名为“Receipt”，提升代码可读性和一致性。此变更包括多个文件的重命名和相应的引用更新，确保系统功能不受影响。
Inline Side-by-side
Showing 29 changed files with 410 additions and 410 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptController.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; 4 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
@@ -8,17 +8,17 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -8,17 +8,17 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 8 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
9 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 9 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
10 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 10 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
11 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO;  
12 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptRespVO;  
13 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; 11 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
  12 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptRespVO;
  13 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
14 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 14 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
15 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; 15 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
16 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; 16 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
17 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; 17 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
18 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; 18 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
19 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; 19 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
20 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; 20 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
21 -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptService; 21 +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
22 import io.swagger.v3.oas.annotations.Operation; 22 import io.swagger.v3.oas.annotations.Operation;
23 import io.swagger.v3.oas.annotations.Parameter; 23 import io.swagger.v3.oas.annotations.Parameter;
24 import io.swagger.v3.oas.annotations.tags.Tag; 24 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,12 +40,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -40,12 +40,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
40 40
41 @Tag(name = "管理后台 - MES 产品收货单") 41 @Tag(name = "管理后台 - MES 产品收货单")
42 @RestController 42 @RestController
43 -@RequestMapping("/mes/wm/product-recpt") 43 +@RequestMapping("/mes/wm/product-receipt")
44 @Validated 44 @Validated
45 -public class MesWmProductRecptController { 45 +public class MesWmProductReceiptController {
46 46
47 @Resource 47 @Resource
48 - private MesWmProductRecptService productRecptService; 48 + private MesWmProductReceiptService productReceiptService;
49 49
50 @Resource 50 @Resource
51 private MesProWorkOrderService workOrderService; 51 private MesProWorkOrderService workOrderService;
@@ -58,120 +58,120 @@ public class MesWmProductRecptController { @@ -58,120 +58,120 @@ public class MesWmProductRecptController {
58 58
59 @PostMapping("/create") 59 @PostMapping("/create")
60 @Operation(summary = "创建产品收货单") 60 @Operation(summary = "创建产品收货单")
61 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')")  
62 - public CommonResult<Long> createProductRecpt(@Valid @RequestBody MesWmProductRecptSaveReqVO createReqVO) {  
63 - return success(productRecptService.createProductRecpt(createReqVO)); 61 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')")
  62 + public CommonResult<Long> createProductReceipt(@Valid @RequestBody MesWmProductReceiptSaveReqVO createReqVO) {
  63 + return success(productReceiptService.createProductReceipt(createReqVO));
64 } 64 }
65 65
66 @PutMapping("/update") 66 @PutMapping("/update")
67 @Operation(summary = "修改产品收货单") 67 @Operation(summary = "修改产品收货单")
68 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
69 - public CommonResult<Boolean> updateProductRecpt(@Valid @RequestBody MesWmProductRecptSaveReqVO updateReqVO) {  
70 - productRecptService.updateProductRecpt(updateReqVO); 68 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  69 + public CommonResult<Boolean> updateProductReceipt(@Valid @RequestBody MesWmProductReceiptSaveReqVO updateReqVO) {
  70 + productReceiptService.updateProductReceipt(updateReqVO);
71 return success(true); 71 return success(true);
72 } 72 }
73 73
74 @DeleteMapping("/delete") 74 @DeleteMapping("/delete")
75 @Operation(summary = "删除产品收货单") 75 @Operation(summary = "删除产品收货单")
76 @Parameter(name = "id", description = "编号", required = true) 76 @Parameter(name = "id", description = "编号", required = true)
77 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')")  
78 - public CommonResult<Boolean> deleteProductRecpt(@RequestParam("id") Long id) {  
79 - productRecptService.deleteProductRecpt(id); 77 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')")
  78 + public CommonResult<Boolean> deleteProductReceipt(@RequestParam("id") Long id) {
  79 + productReceiptService.deleteProductReceipt(id);
80 return success(true); 80 return success(true);
81 } 81 }
82 82
83 @GetMapping("/get") 83 @GetMapping("/get")
84 @Operation(summary = "获得产品收货单") 84 @Operation(summary = "获得产品收货单")
85 @Parameter(name = "id", description = "编号", required = true, example = "1024") 85 @Parameter(name = "id", description = "编号", required = true, example = "1024")
86 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
87 - public CommonResult<MesWmProductRecptRespVO> getProductRecpt(@RequestParam("id") Long id) {  
88 - MesWmProductRecptDO recpt = productRecptService.getProductRecpt(id);  
89 - if (recpt == null) { 86 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  87 + public CommonResult<MesWmProductReceiptRespVO> getProductReceipt(@RequestParam("id") Long id) {
  88 + MesWmProductReceiptDO receipt = productReceiptService.getProductReceipt(id);
  89 + if (receipt == null) {
90 return success(null); 90 return success(null);
91 } 91 }
92 - return success(buildRespVOList(Collections.singletonList(recpt)).get(0)); 92 + return success(buildRespVOList(Collections.singletonList(receipt)).get(0));
93 } 93 }
94 94
95 @GetMapping("/page") 95 @GetMapping("/page")
96 @Operation(summary = "获得产品收货单分页") 96 @Operation(summary = "获得产品收货单分页")
97 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
98 - public CommonResult<PageResult<MesWmProductRecptRespVO>> getProductRecptPage(  
99 - @Valid MesWmProductRecptPageReqVO pageReqVO) {  
100 - PageResult<MesWmProductRecptDO> pageResult = productRecptService.getProductRecptPage(pageReqVO); 97 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  98 + public CommonResult<PageResult<MesWmProductReceiptRespVO>> getProductReceiptPage(
  99 + @Valid MesWmProductReceiptPageReqVO pageReqVO) {
  100 + PageResult<MesWmProductReceiptDO> pageResult = productReceiptService.getProductReceiptPage(pageReqVO);
101 return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); 101 return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
102 } 102 }
103 103
104 @GetMapping("/export-excel") 104 @GetMapping("/export-excel")
105 @Operation(summary = "导出产品收货单 Excel") 105 @Operation(summary = "导出产品收货单 Excel")
106 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:export')") 106 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:export')")
107 @ApiAccessLog(operateType = EXPORT) 107 @ApiAccessLog(operateType = EXPORT)
108 - public void exportProductRecptExcel(@Valid MesWmProductRecptPageReqVO pageReqVO, 108 + public void exportProductReceiptExcel(@Valid MesWmProductReceiptPageReqVO pageReqVO,
109 HttpServletResponse response) throws IOException { 109 HttpServletResponse response) throws IOException {
110 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); 110 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
111 - PageResult<MesWmProductRecptDO> pageResult = productRecptService.getProductRecptPage(pageReqVO);  
112 - ExcelUtils.write(response, "产品收货单.xls", "数据", MesWmProductRecptRespVO.class, 111 + PageResult<MesWmProductReceiptDO> pageResult = productReceiptService.getProductReceiptPage(pageReqVO);
  112 + ExcelUtils.write(response, "产品收货单.xls", "数据", MesWmProductReceiptRespVO.class,
113 buildRespVOList(pageResult.getList())); 113 buildRespVOList(pageResult.getList()));
114 } 114 }
115 115
116 @PutMapping("/submit") 116 @PutMapping("/submit")
117 @Operation(summary = "提交产品收货单") 117 @Operation(summary = "提交产品收货单")
118 @Parameter(name = "id", description = "编号", required = true) 118 @Parameter(name = "id", description = "编号", required = true)
119 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
120 - public CommonResult<Boolean> submitProductRecpt(@RequestParam("id") Long id) {  
121 - productRecptService.submitProductRecpt(id); 119 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  120 + public CommonResult<Boolean> submitProductReceipt(@RequestParam("id") Long id) {
  121 + productReceiptService.submitProductReceipt(id);
122 return success(true); 122 return success(true);
123 } 123 }
124 124
125 @PutMapping("/stock") 125 @PutMapping("/stock")
126 @Operation(summary = "执行上架") 126 @Operation(summary = "执行上架")
127 @Parameter(name = "id", description = "编号", required = true) 127 @Parameter(name = "id", description = "编号", required = true)
128 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
129 - public CommonResult<Boolean> stockProductRecpt(@RequestParam("id") Long id) {  
130 - productRecptService.stockProductRecpt(id); 128 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  129 + public CommonResult<Boolean> stockProductReceipt(@RequestParam("id") Long id) {
  130 + productReceiptService.stockProductReceipt(id);
131 return success(true); 131 return success(true);
132 } 132 }
133 133
134 @PutMapping("/execute") 134 @PutMapping("/execute")
135 @Operation(summary = "执行入库") 135 @Operation(summary = "执行入库")
136 @Parameter(name = "id", description = "编号", required = true) 136 @Parameter(name = "id", description = "编号", required = true)
137 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:execute')")  
138 - public CommonResult<Boolean> executeProductRecpt(@RequestParam("id") Long id) {  
139 - productRecptService.executeProductRecpt(id); 137 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:execute')")
  138 + public CommonResult<Boolean> executeProductReceipt(@RequestParam("id") Long id) {
  139 + productReceiptService.executeProductReceipt(id);
140 return success(true); 140 return success(true);
141 } 141 }
142 142
143 @PutMapping("/cancel") 143 @PutMapping("/cancel")
144 @Operation(summary = "取消产品收货单") 144 @Operation(summary = "取消产品收货单")
145 @Parameter(name = "id", description = "编号", required = true) 145 @Parameter(name = "id", description = "编号", required = true)
146 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
147 - public CommonResult<Boolean> cancelProductRecpt(@RequestParam("id") Long id) {  
148 - productRecptService.cancelProductRecpt(id); 146 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  147 + public CommonResult<Boolean> cancelProductReceipt(@RequestParam("id") Long id) {
  148 + productReceiptService.cancelProductReceipt(id);
149 return success(true); 149 return success(true);
150 } 150 }
151 151
152 @GetMapping("/check-quantity") 152 @GetMapping("/check-quantity")
153 @Operation(summary = "校验产品收货单明细数量") 153 @Operation(summary = "校验产品收货单明细数量")
154 @Parameter(name = "id", description = "编号", required = true) 154 @Parameter(name = "id", description = "编号", required = true)
155 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
156 - public CommonResult<Boolean> checkProductRecptQuantity(@RequestParam("id") Long id) {  
157 - return success(productRecptService.checkProductRecptQuantity(id)); 155 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  156 + public CommonResult<Boolean> checkProductReceiptQuantity(@RequestParam("id") Long id) {
  157 + return success(productReceiptService.checkProductReceiptQuantity(id));
158 } 158 }
159 159
160 // ==================== 拼接 VO ==================== 160 // ==================== 拼接 VO ====================
161 161
162 - private List<MesWmProductRecptRespVO> buildRespVOList(List<MesWmProductRecptDO> list) { 162 + private List<MesWmProductReceiptRespVO> buildRespVOList(List<MesWmProductReceiptDO> list) {
163 if (CollUtil.isEmpty(list)) { 163 if (CollUtil.isEmpty(list)) {
164 return Collections.emptyList(); 164 return Collections.emptyList();
165 } 165 }
166 // 1. 获得关联数据 166 // 1. 获得关联数据
167 Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap( 167 Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
168 - convertSet(list, MesWmProductRecptDO::getWorkOrderId)); 168 + convertSet(list, MesWmProductReceiptDO::getWorkOrderId));
169 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap( 169 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
170 - convertSet(list, MesWmProductRecptDO::getItemId)); 170 + convertSet(list, MesWmProductReceiptDO::getItemId));
171 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap( 171 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
172 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); 172 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
173 // 2. 构建结果 173 // 2. 构建结果
174 - return BeanUtils.toBean(list, MesWmProductRecptRespVO.class, vo -> { 174 + return BeanUtils.toBean(list, MesWmProductReceiptRespVO.class, vo -> {
175 MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), 175 MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
176 workOrder -> vo.setWorkOrderCode(workOrder.getCode())); 176 workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
177 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { 177 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptDetailController.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptDetailController.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 5 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailRespVO;  
8 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO; 7 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailRespVO;
  8 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO;
9 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 9 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
10 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; 10 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
11 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; 11 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
12 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; 12 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
13 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; 13 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
14 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; 14 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
15 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; 15 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
16 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; 16 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
17 -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptDetailService; 17 +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptDetailService;
18 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; 18 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
19 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; 19 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
20 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; 20 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
@@ -36,12 +36,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -36,12 +36,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
36 36
37 @Tag(name = "管理后台 - MES 产品收货单明细") 37 @Tag(name = "管理后台 - MES 产品收货单明细")
38 @RestController 38 @RestController
39 -@RequestMapping("/mes/wm/product-recpt-detail") 39 +@RequestMapping("/mes/wm/product-receipt-detail")
40 @Validated 40 @Validated
41 -public class MesWmProductRecptDetailController { 41 +public class MesWmProductReceiptDetailController {
42 42
43 @Resource 43 @Resource
44 - private MesWmProductRecptDetailService productRecptDetailService; 44 + private MesWmProductReceiptDetailService productReceiptDetailService;
45 45
46 @Resource 46 @Resource
47 private MesMdItemService itemService; 47 private MesMdItemService itemService;
@@ -60,34 +60,34 @@ public class MesWmProductRecptDetailController { @@ -60,34 +60,34 @@ public class MesWmProductRecptDetailController {
60 60
61 @PostMapping("/create") 61 @PostMapping("/create")
62 @Operation(summary = "创建产品收货单明细") 62 @Operation(summary = "创建产品收货单明细")
63 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')")  
64 - public CommonResult<Long> createProductRecptDetail(@Valid @RequestBody MesWmProductRecptDetailSaveReqVO createReqVO) {  
65 - return success(productRecptDetailService.createProductRecptDetail(createReqVO)); 63 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')")
  64 + public CommonResult<Long> createProductReceiptDetail(@Valid @RequestBody MesWmProductReceiptDetailSaveReqVO createReqVO) {
  65 + return success(productReceiptDetailService.createProductReceiptDetail(createReqVO));
66 } 66 }
67 67
68 @PutMapping("/update") 68 @PutMapping("/update")
69 @Operation(summary = "修改产品收货单明细") 69 @Operation(summary = "修改产品收货单明细")
70 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
71 - public CommonResult<Boolean> updateProductRecptDetail(@Valid @RequestBody MesWmProductRecptDetailSaveReqVO updateReqVO) {  
72 - productRecptDetailService.updateProductRecptDetail(updateReqVO); 70 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  71 + public CommonResult<Boolean> updateProductReceiptDetail(@Valid @RequestBody MesWmProductReceiptDetailSaveReqVO updateReqVO) {
  72 + productReceiptDetailService.updateProductReceiptDetail(updateReqVO);
73 return success(true); 73 return success(true);
74 } 74 }
75 75
76 @DeleteMapping("/delete") 76 @DeleteMapping("/delete")
77 @Operation(summary = "删除产品收货单明细") 77 @Operation(summary = "删除产品收货单明细")
78 @Parameter(name = "id", description = "编号", required = true) 78 @Parameter(name = "id", description = "编号", required = true)
79 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')")  
80 - public CommonResult<Boolean> deleteProductRecptDetail(@RequestParam("id") Long id) {  
81 - productRecptDetailService.deleteProductRecptDetail(id); 79 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')")
  80 + public CommonResult<Boolean> deleteProductReceiptDetail(@RequestParam("id") Long id) {
  81 + productReceiptDetailService.deleteProductReceiptDetail(id);
82 return success(true); 82 return success(true);
83 } 83 }
84 84
85 @GetMapping("/get") 85 @GetMapping("/get")
86 @Operation(summary = "获得产品收货单明细") 86 @Operation(summary = "获得产品收货单明细")
87 @Parameter(name = "id", description = "编号", required = true, example = "1024") 87 @Parameter(name = "id", description = "编号", required = true, example = "1024")
88 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
89 - public CommonResult<MesWmProductRecptDetailRespVO> getProductRecptDetail(@RequestParam("id") Long id) {  
90 - MesWmProductRecptDetailDO detail = productRecptDetailService.getProductRecptDetail(id); 88 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  89 + public CommonResult<MesWmProductReceiptDetailRespVO> getProductReceiptDetail(@RequestParam("id") Long id) {
  90 + MesWmProductReceiptDetailDO detail = productReceiptDetailService.getProductReceiptDetail(id);
91 if (detail == null) { 91 if (detail == null) {
92 return success(null); 92 return success(null);
93 } 93 }
@@ -97,32 +97,32 @@ public class MesWmProductRecptDetailController { @@ -97,32 +97,32 @@ public class MesWmProductRecptDetailController {
97 @GetMapping("/list-by-line") 97 @GetMapping("/list-by-line")
98 @Operation(summary = "获得产品收货单明细列表（按行编号）") 98 @Operation(summary = "获得产品收货单明细列表（按行编号）")
99 @Parameter(name = "lineId", description = "行编号", required = true, example = "1024") 99 @Parameter(name = "lineId", description = "行编号", required = true, example = "1024")
100 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
101 - public CommonResult<List<MesWmProductRecptDetailRespVO>> getProductRecptDetailListByLineId( 100 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  101 + public CommonResult<List<MesWmProductReceiptDetailRespVO>> getProductReceiptDetailListByLineId(
102 @RequestParam("lineId") Long lineId) { 102 @RequestParam("lineId") Long lineId) {
103 - List<MesWmProductRecptDetailDO> list = productRecptDetailService.getProductRecptDetailListByLineId(lineId); 103 + List<MesWmProductReceiptDetailDO> list = productReceiptDetailService.getProductReceiptDetailListByLineId(lineId);
104 return success(buildRespVOList(list)); 104 return success(buildRespVOList(list));
105 } 105 }
106 106
107 // ==================== 拼接 VO ==================== 107 // ==================== 拼接 VO ====================
108 108
109 - private List<MesWmProductRecptDetailRespVO> buildRespVOList(List<MesWmProductRecptDetailDO> list) { 109 + private List<MesWmProductReceiptDetailRespVO> buildRespVOList(List<MesWmProductReceiptDetailDO> list) {
110 if (CollUtil.isEmpty(list)) { 110 if (CollUtil.isEmpty(list)) {
111 return Collections.emptyList(); 111 return Collections.emptyList();
112 } 112 }
113 // 1. 获得关联数据 113 // 1. 获得关联数据
114 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap( 114 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
115 - convertSet(list, MesWmProductRecptDetailDO::getItemId)); 115 + convertSet(list, MesWmProductReceiptDetailDO::getItemId));
116 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap( 116 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
117 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); 117 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
118 Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap( 118 Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
119 - convertSet(list, MesWmProductRecptDetailDO::getWarehouseId)); 119 + convertSet(list, MesWmProductReceiptDetailDO::getWarehouseId));
120 Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap( 120 Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(
121 - convertSet(list, MesWmProductRecptDetailDO::getLocationId)); 121 + convertSet(list, MesWmProductReceiptDetailDO::getLocationId));
122 Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap( 122 Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
123 - convertSet(list, MesWmProductRecptDetailDO::getAreaId)); 123 + convertSet(list, MesWmProductReceiptDetailDO::getAreaId));
124 // 2. 构建结果 124 // 2. 构建结果
125 - return BeanUtils.toBean(list, MesWmProductRecptDetailRespVO.class, vo -> { 125 + return BeanUtils.toBean(list, MesWmProductReceiptDetailRespVO.class, vo -> {
126 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { 126 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
127 vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); 127 vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
128 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), 128 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptLineController.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptLineController.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
8 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLinePageReqVO;  
9 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineRespVO;  
10 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO; 8 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO;
  9 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineRespVO;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO;
11 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 11 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
12 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; 12 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
13 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; 13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
14 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; 14 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
15 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; 15 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
16 -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptLineService; 16 +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptLineService;
17 import io.swagger.v3.oas.annotations.Operation; 17 import io.swagger.v3.oas.annotations.Operation;
18 import io.swagger.v3.oas.annotations.Parameter; 18 import io.swagger.v3.oas.annotations.Parameter;
19 import io.swagger.v3.oas.annotations.tags.Tag; 19 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,12 +32,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -32,12 +32,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
32 32
33 @Tag(name = "管理后台 - MES 产品收货单行") 33 @Tag(name = "管理后台 - MES 产品收货单行")
34 @RestController 34 @RestController
35 -@RequestMapping("/mes/wm/product-recpt-line") 35 +@RequestMapping("/mes/wm/product-receipt-line")
36 @Validated 36 @Validated
37 -public class MesWmProductRecptLineController { 37 +public class MesWmProductReceiptLineController {
38 38
39 @Resource 39 @Resource
40 - private MesWmProductRecptLineService productRecptLineService; 40 + private MesWmProductReceiptLineService productReceiptLineService;
41 41
42 @Resource 42 @Resource
43 private MesMdItemService itemService; 43 private MesMdItemService itemService;
@@ -47,34 +47,34 @@ public class MesWmProductRecptLineController { @@ -47,34 +47,34 @@ public class MesWmProductRecptLineController {
47 47
48 @PostMapping("/create") 48 @PostMapping("/create")
49 @Operation(summary = "创建产品收货单行") 49 @Operation(summary = "创建产品收货单行")
50 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')")  
51 - public CommonResult<Long> createProductRecptLine(@Valid @RequestBody MesWmProductRecptLineSaveReqVO createReqVO) {  
52 - return success(productRecptLineService.createProductRecptLine(createReqVO)); 50 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')")
  51 + public CommonResult<Long> createProductReceiptLine(@Valid @RequestBody MesWmProductReceiptLineSaveReqVO createReqVO) {
  52 + return success(productReceiptLineService.createProductReceiptLine(createReqVO));
53 } 53 }
54 54
55 @PutMapping("/update") 55 @PutMapping("/update")
56 @Operation(summary = "修改产品收货单行") 56 @Operation(summary = "修改产品收货单行")
57 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')")  
58 - public CommonResult<Boolean> updateProductRecptLine(@Valid @RequestBody MesWmProductRecptLineSaveReqVO updateReqVO) {  
59 - productRecptLineService.updateProductRecptLine(updateReqVO); 57 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')")
  58 + public CommonResult<Boolean> updateProductReceiptLine(@Valid @RequestBody MesWmProductReceiptLineSaveReqVO updateReqVO) {
  59 + productReceiptLineService.updateProductReceiptLine(updateReqVO);
60 return success(true); 60 return success(true);
61 } 61 }
62 62
63 @DeleteMapping("/delete") 63 @DeleteMapping("/delete")
64 @Operation(summary = "删除产品收货单行") 64 @Operation(summary = "删除产品收货单行")
65 @Parameter(name = "id", description = "编号", required = true) 65 @Parameter(name = "id", description = "编号", required = true)
66 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')")  
67 - public CommonResult<Boolean> deleteProductRecptLine(@RequestParam("id") Long id) {  
68 - productRecptLineService.deleteProductRecptLine(id); 66 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')")
  67 + public CommonResult<Boolean> deleteProductReceiptLine(@RequestParam("id") Long id) {
  68 + productReceiptLineService.deleteProductReceiptLine(id);
69 return success(true); 69 return success(true);
70 } 70 }
71 71
72 @GetMapping("/get") 72 @GetMapping("/get")
73 @Operation(summary = "获得产品收货单行") 73 @Operation(summary = "获得产品收货单行")
74 @Parameter(name = "id", description = "编号", required = true, example = "1024") 74 @Parameter(name = "id", description = "编号", required = true, example = "1024")
75 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
76 - public CommonResult<MesWmProductRecptLineRespVO> getProductRecptLine(@RequestParam("id") Long id) {  
77 - MesWmProductRecptLineDO line = productRecptLineService.getProductRecptLine(id); 75 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  76 + public CommonResult<MesWmProductReceiptLineRespVO> getProductReceiptLine(@RequestParam("id") Long id) {
  77 + MesWmProductReceiptLineDO line = productReceiptLineService.getProductReceiptLine(id);
78 if (line == null) { 78 if (line == null) {
79 return success(null); 79 return success(null);
80 } 80 }
@@ -83,26 +83,26 @@ public class MesWmProductRecptLineController { @@ -83,26 +83,26 @@ public class MesWmProductRecptLineController {
83 83
84 @GetMapping("/page") 84 @GetMapping("/page")
85 @Operation(summary = "获得产品收货单行分页") 85 @Operation(summary = "获得产品收货单行分页")
86 - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')")  
87 - public CommonResult<PageResult<MesWmProductRecptLineRespVO>> getProductRecptLinePage(  
88 - @Valid MesWmProductRecptLinePageReqVO pageReqVO) {  
89 - PageResult<MesWmProductRecptLineDO> pageResult = productRecptLineService.getProductRecptLinePage(pageReqVO); 86 + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')")
  87 + public CommonResult<PageResult<MesWmProductReceiptLineRespVO>> getProductReceiptLinePage(
  88 + @Valid MesWmProductReceiptLinePageReqVO pageReqVO) {
  89 + PageResult<MesWmProductReceiptLineDO> pageResult = productReceiptLineService.getProductReceiptLinePage(pageReqVO);
90 return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); 90 return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
91 } 91 }
92 92
93 // ==================== 拼接 VO ==================== 93 // ==================== 拼接 VO ====================
94 94
95 - private List<MesWmProductRecptLineRespVO> buildRespVOList(List<MesWmProductRecptLineDO> list) { 95 + private List<MesWmProductReceiptLineRespVO> buildRespVOList(List<MesWmProductReceiptLineDO> list) {
96 if (CollUtil.isEmpty(list)) { 96 if (CollUtil.isEmpty(list)) {
97 return Collections.emptyList(); 97 return Collections.emptyList();
98 } 98 }
99 // 1. 获得关联数据 99 // 1. 获得关联数据
100 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap( 100 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
101 - convertSet(list, MesWmProductRecptLineDO::getItemId)); 101 + convertSet(list, MesWmProductReceiptLineDO::getItemId));
102 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap( 102 Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
103 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); 103 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
104 // 2. 构建结果 104 // 2. 构建结果
105 - return BeanUtils.toBean(list, MesWmProductRecptLineRespVO.class, vo -> { 105 + return BeanUtils.toBean(list, MesWmProductReceiptLineRespVO.class, vo -> {
106 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { 106 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
107 vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); 107 vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
108 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), 108 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptPageReqVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,7 +10,7 @@ import lombok.ToString; @@ -10,7 +10,7 @@ import lombok.ToString;
10 @Data 10 @Data
11 @EqualsAndHashCode(callSuper = true) 11 @EqualsAndHashCode(callSuper = true)
12 @ToString(callSuper = true) 12 @ToString(callSuper = true)
13 -public class MesWmProductRecptPageReqVO extends PageParam { 13 +public class MesWmProductReceiptPageReqVO extends PageParam {
14 14
15 @Schema(description = "收货单编码", example = "PR202603010001") 15 @Schema(description = "收货单编码", example = "PR202603010001")
16 private String code; 16 private String code;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptRespVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo;
2 2
3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated; 3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
4 import cn.idev.excel.annotation.ExcelProperty; 4 import cn.idev.excel.annotation.ExcelProperty;
@@ -10,7 +10,7 @@ import java.time.LocalDateTime; @@ -10,7 +10,7 @@ import java.time.LocalDateTime;
10 @Schema(description = "管理后台 - MES 产品收货单 Response VO") 10 @Schema(description = "管理后台 - MES 产品收货单 Response VO")
11 @Data 11 @Data
12 @ExcelIgnoreUnannotated 12 @ExcelIgnoreUnannotated
13 -public class MesWmProductRecptRespVO { 13 +public class MesWmProductReceiptRespVO {
14 14
15 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") 15 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16 @ExcelProperty("编号") 16 @ExcelProperty("编号")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptSaveReqVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.NotEmpty; 4 import jakarta.validation.constraints.NotEmpty;
@@ -9,7 +9,7 @@ import java.time.LocalDateTime; @@ -9,7 +9,7 @@ import java.time.LocalDateTime;
9 9
10 @Schema(description = "管理后台 - MES 产品收货单新增/修改 Request VO") 10 @Schema(description = "管理后台 - MES 产品收货单新增/修改 Request VO")
11 @Data 11 @Data
12 -public class MesWmProductRecptSaveReqVO { 12 +public class MesWmProductReceiptSaveReqVO {
13 13
14 @Schema(description = "编号", example = "1024") 14 @Schema(description = "编号", example = "1024")
15 private Long id; 15 private Long id;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailRespVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime; @@ -8,7 +8,7 @@ import java.time.LocalDateTime;
8 8
9 @Schema(description = "管理后台 - MES 产品收货单明细 Response VO") 9 @Schema(description = "管理后台 - MES 产品收货单明细 Response VO")
10 @Data 10 @Data
11 -public class MesWmProductRecptDetailRespVO { 11 +public class MesWmProductReceiptDetailRespVO {
12 12
13 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") 13 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 private Long id; 14 private Long id;
@@ -17,7 +17,7 @@ public class MesWmProductRecptDetailRespVO { @@ -17,7 +17,7 @@ public class MesWmProductRecptDetailRespVO {
17 private Long lineId; 17 private Long lineId;
18 18
19 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 19 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
20 - private Long recptId; 20 + private Long receiptId;
21 21
22 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 22 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
23 private Long itemId; 23 private Long itemId;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailSaveReqVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailSaveReqVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.NotNull; 4 import jakarta.validation.constraints.NotNull;
@@ -8,7 +8,7 @@ import java.math.BigDecimal; @@ -8,7 +8,7 @@ import java.math.BigDecimal;
8 8
9 @Schema(description = "管理后台 - MES 产品收货单明细新增/修改 Request VO") 9 @Schema(description = "管理后台 - MES 产品收货单明细新增/修改 Request VO")
10 @Data 10 @Data
11 -public class MesWmProductRecptDetailSaveReqVO { 11 +public class MesWmProductReceiptDetailSaveReqVO {
12 12
13 @Schema(description = "编号", example = "1024") 13 @Schema(description = "编号", example = "1024")
14 private Long id; 14 private Long id;
@@ -19,7 +19,7 @@ public class MesWmProductRecptDetailSaveReqVO { @@ -19,7 +19,7 @@ public class MesWmProductRecptDetailSaveReqVO {
19 19
20 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 20 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21 @NotNull(message = "收货单编号不能为空") 21 @NotNull(message = "收货单编号不能为空")
22 - private Long recptId; 22 + private Long receiptId;
23 23
24 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 24 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
25 @NotNull(message = "物料编号不能为空") 25 @NotNull(message = "物料编号不能为空")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLinePageReqVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLinePageReqVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,9 +10,9 @@ import lombok.ToString; @@ -10,9 +10,9 @@ import lombok.ToString;
10 @Data 10 @Data
11 @EqualsAndHashCode(callSuper = true) 11 @EqualsAndHashCode(callSuper = true)
12 @ToString(callSuper = true) 12 @ToString(callSuper = true)
13 -public class MesWmProductRecptLinePageReqVO extends PageParam { 13 +public class MesWmProductReceiptLinePageReqVO extends PageParam {
14 14
15 @Schema(description = "收货单编号", example = "1") 15 @Schema(description = "收货单编号", example = "1")
16 - private Long recptId; 16 + private Long receiptId;
17 17
18 } 18 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineRespVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineRespVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
@@ -8,13 +8,13 @@ import java.time.LocalDateTime; @@ -8,13 +8,13 @@ import java.time.LocalDateTime;
8 8
9 @Schema(description = "管理后台 - MES 产品收货单行 Response VO") 9 @Schema(description = "管理后台 - MES 产品收货单行 Response VO")
10 @Data 10 @Data
11 -public class MesWmProductRecptLineRespVO { 11 +public class MesWmProductReceiptLineRespVO {
12 12
13 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") 13 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 private Long id; 14 private Long id;
15 15
16 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 16 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 - private Long recptId; 17 + private Long receiptId;
18 18
19 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 19 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
20 private Long itemId; 20 private Long itemId;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineSaveReqVO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineSaveReqVO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; 1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.NotNull; 4 import jakarta.validation.constraints.NotNull;
@@ -9,14 +9,14 @@ import java.math.BigDecimal; @@ -9,14 +9,14 @@ import java.math.BigDecimal;
9 9
10 @Schema(description = "管理后台 - MES 产品收货单行新增/修改 Request VO") 10 @Schema(description = "管理后台 - MES 产品收货单行新增/修改 Request VO")
11 @Data 11 @Data
12 -public class MesWmProductRecptLineSaveReqVO { 12 +public class MesWmProductReceiptLineSaveReqVO {
13 13
14 @Schema(description = "编号", example = "1024") 14 @Schema(description = "编号", example = "1024")
15 private Long id; 15 private Long id;
16 16
17 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 17 @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 @NotNull(message = "收货单编号不能为空") 18 @NotNull(message = "收货单编号不能为空")
19 - private Long recptId; 19 + private Long receiptId;
20 20
21 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 21 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
22 @NotNull(message = "物料编号不能为空") 22 @NotNull(message = "物料编号不能为空")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
5 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; 5 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
6 -import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductRecptStatusEnum; 6 +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum;
7 import com.baomidou.mybatisplus.annotation.KeySequence; 7 import com.baomidou.mybatisplus.annotation.KeySequence;
8 import com.baomidou.mybatisplus.annotation.TableId; 8 import com.baomidou.mybatisplus.annotation.TableId;
9 import com.baomidou.mybatisplus.annotation.TableName; 9 import com.baomidou.mybatisplus.annotation.TableName;
@@ -14,15 +14,15 @@ import java.time.LocalDateTime; @@ -14,15 +14,15 @@ import java.time.LocalDateTime;
14 /** 14 /**
15 * MES 产品收货（入库）单 DO 15 * MES 产品收货（入库）单 DO
16 */ 16 */
17 -@TableName("mes_wm_product_recpt")  
18 -@KeySequence("mes_wm_product_recpt_seq") 17 +@TableName("mes_wm_product_receipt")
  18 +@KeySequence("mes_wm_product_receipt_seq")
19 @Data 19 @Data
20 @EqualsAndHashCode(callSuper = true) 20 @EqualsAndHashCode(callSuper = true)
21 @ToString(callSuper = true) 21 @ToString(callSuper = true)
22 @Builder 22 @Builder
23 @NoArgsConstructor 23 @NoArgsConstructor
24 @AllArgsConstructor 24 @AllArgsConstructor
25 -public class MesWmProductRecptDO extends BaseDO { 25 +public class MesWmProductReceiptDO extends BaseDO {
26 26
27 /** 27 /**
28 * 编号 28 * 编号
@@ -56,7 +56,7 @@ public class MesWmProductRecptDO extends BaseDO { @@ -56,7 +56,7 @@ public class MesWmProductRecptDO extends BaseDO {
56 /** 56 /**
57 * 状态 57 * 状态
58 * 58 *
59 - * 枚举 {@link MesWmProductRecptStatusEnum} 59 + * 枚举 {@link MesWmProductReceiptStatusEnum}
60 */ 60 */
61 private Integer status; 61 private Integer status;
62 /** 62 /**
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDetailDO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDetailDO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -15,15 +15,15 @@ import java.math.BigDecimal; @@ -15,15 +15,15 @@ import java.math.BigDecimal;
15 /** 15 /**
16 * MES 产品收货（入库）单明细 DO 16 * MES 产品收货（入库）单明细 DO
17 */ 17 */
18 -@TableName("mes_wm_product_recpt_detail")  
19 -@KeySequence("mes_wm_product_recpt_detail_seq") 18 +@TableName("mes_wm_product_receipt_detail")
  19 +@KeySequence("mes_wm_product_receipt_detail_seq")
20 @Data 20 @Data
21 @EqualsAndHashCode(callSuper = true) 21 @EqualsAndHashCode(callSuper = true)
22 @ToString(callSuper = true) 22 @ToString(callSuper = true)
23 @Builder 23 @Builder
24 @NoArgsConstructor 24 @NoArgsConstructor
25 @AllArgsConstructor 25 @AllArgsConstructor
26 -public class MesWmProductRecptDetailDO extends BaseDO { 26 +public class MesWmProductReceiptDetailDO extends BaseDO {
27 27
28 /** 28 /**
29 * 编号 29 * 编号
@@ -33,15 +33,15 @@ public class MesWmProductRecptDetailDO extends BaseDO { @@ -33,15 +33,15 @@ public class MesWmProductRecptDetailDO extends BaseDO {
33 /** 33 /**
34 * 收货单行编号 34 * 收货单行编号
35 * 35 *
36 - * 关联 {@link MesWmProductRecptLineDO#getId()} 36 + * 关联 {@link MesWmProductReceiptLineDO#getId()}
37 */ 37 */
38 private Long lineId; 38 private Long lineId;
39 /** 39 /**
40 * 收货单编号 40 * 收货单编号
41 * 41 *
42 - * 关联 {@link MesWmProductRecptDO#getId()} 42 + * 关联 {@link MesWmProductReceiptDO#getId()}
43 */ 43 */
44 - private Long recptId; 44 + private Long receiptId;
45 /** 45 /**
46 * 物料编号 46 * 物料编号
47 * 47 *
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptLineDO.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptLineDO.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -12,15 +12,15 @@ import java.math.BigDecimal; @@ -12,15 +12,15 @@ import java.math.BigDecimal;
12 /** 12 /**
13 * MES 产品收货（入库）单行 DO 13 * MES 产品收货（入库）单行 DO
14 */ 14 */
15 -@TableName("mes_wm_product_recpt_line")  
16 -@KeySequence("mes_wm_product_recpt_line_seq") 15 +@TableName("mes_wm_product_receipt_line")
  16 +@KeySequence("mes_wm_product_receipt_line_seq")
17 @Data 17 @Data
18 @EqualsAndHashCode(callSuper = true) 18 @EqualsAndHashCode(callSuper = true)
19 @ToString(callSuper = true) 19 @ToString(callSuper = true)
20 @Builder 20 @Builder
21 @NoArgsConstructor 21 @NoArgsConstructor
22 @AllArgsConstructor 22 @AllArgsConstructor
23 -public class MesWmProductRecptLineDO extends BaseDO { 23 +public class MesWmProductReceiptLineDO extends BaseDO {
24 24
25 /** 25 /**
26 * 编号 26 * 编号
@@ -30,9 +30,9 @@ public class MesWmProductRecptLineDO extends BaseDO { @@ -30,9 +30,9 @@ public class MesWmProductRecptLineDO extends BaseDO {
30 /** 30 /**
31 * 收货单编号 31 * 收货单编号
32 * 32 *
33 - * 关联 {@link MesWmProductRecptDO#getId()} 33 + * 关联 {@link MesWmProductReceiptDO#getId()}
34 */ 34 */
35 - private Long recptId; 35 + private Long receiptId;
36 /** 36 /**
37 * 物料编号 37 * 物料编号
38 * 38 *
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptDetailMapper.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptDetailMapper.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; 4 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
5 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
6 6
7 import java.util.List; 7 import java.util.List;
@@ -10,22 +10,22 @@ import java.util.List; @@ -10,22 +10,22 @@ import java.util.List;
10 * MES 产品收货单明细 Mapper 10 * MES 产品收货单明细 Mapper
11 */ 11 */
12 @Mapper 12 @Mapper
13 -public interface MesWmProductRecptDetailMapper extends BaseMapperX<MesWmProductRecptDetailDO> { 13 +public interface MesWmProductReceiptDetailMapper extends BaseMapperX<MesWmProductReceiptDetailDO> {
14 14
15 - default List<MesWmProductRecptDetailDO> selectListByRecptId(Long recptId) {  
16 - return selectList(MesWmProductRecptDetailDO::getRecptId, recptId); 15 + default List<MesWmProductReceiptDetailDO> selectListByRecptId(Long receiptId) {
  16 + return selectList(MesWmProductReceiptDetailDO::getReceiptId, receiptId);
17 } 17 }
18 18
19 - default List<MesWmProductRecptDetailDO> selectListByLineId(Long lineId) {  
20 - return selectList(MesWmProductRecptDetailDO::getLineId, lineId); 19 + default List<MesWmProductReceiptDetailDO> selectListByLineId(Long lineId) {
  20 + return selectList(MesWmProductReceiptDetailDO::getLineId, lineId);
21 } 21 }
22 22
23 - default void deleteByRecptId(Long recptId) {  
24 - delete(MesWmProductRecptDetailDO::getRecptId, recptId); 23 + default void deleteByRecptId(Long receiptId) {
  24 + delete(MesWmProductReceiptDetailDO::getReceiptId, receiptId);
25 } 25 }
26 26
27 default void deleteByLineId(Long lineId) { 27 default void deleteByLineId(Long lineId) {
28 - delete(MesWmProductRecptDetailDO::getLineId, lineId); 28 + delete(MesWmProductReceiptDetailDO::getLineId, lineId);
29 } 29 }
30 30
31 } 31 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptLineMapper.java 0 → 100644
  View file @f99f854
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * MES 产品收货单行 Mapper
  14 + */
  15 +@Mapper
  16 +public interface MesWmProductReceiptLineMapper extends BaseMapperX<MesWmProductReceiptLineDO> {
  17 +
  18 + default PageResult<MesWmProductReceiptLineDO> selectPage(MesWmProductReceiptLinePageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductReceiptLineDO>()
  20 + .eqIfPresent(MesWmProductReceiptLineDO::getReceiptId, reqVO.getReceiptId())
  21 + .orderByDesc(MesWmProductReceiptLineDO::getId));
  22 + }
  23 +
  24 + default List<MesWmProductReceiptLineDO> selectListByRecptId(Long receiptId) {
  25 + return selectList(MesWmProductReceiptLineDO::getReceiptId, receiptId);
  26 + }
  27 +
  28 + default void deleteByRecptId(Long receiptId) {
  29 + delete(MesWmProductReceiptLineDO::getReceiptId, receiptId);
  30 + }
  31 +
  32 +}
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java 0 → 100644
  View file @f99f854
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * MES 产品收货单 Mapper
  12 + */
  13 +@Mapper
  14 +public interface MesWmProductReceiptMapper extends BaseMapperX<MesWmProductReceiptDO> {
  15 +
  16 + default PageResult<MesWmProductReceiptDO> selectPage(MesWmProductReceiptPageReqVO reqVO) {
  17 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductReceiptDO>()
  18 + .likeIfPresent(MesWmProductReceiptDO::getCode, reqVO.getCode())
  19 + .likeIfPresent(MesWmProductReceiptDO::getName, reqVO.getName())
  20 + .eqIfPresent(MesWmProductReceiptDO::getWorkOrderId, reqVO.getWorkOrderId())
  21 + .eqIfPresent(MesWmProductReceiptDO::getItemId, reqVO.getItemId())
  22 + .orderByDesc(MesWmProductReceiptDO::getId));
  23 + }
  24 +
  25 + default MesWmProductReceiptDO selectByCode(String code) {
  26 + return selectOne(MesWmProductReceiptDO::getCode, code);
  27 + }
  28 +
  29 +}
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptLineMapper.java deleted
View file @8119398
1 -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;  
5 -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;  
6 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLinePageReqVO;  
7 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO;  
8 -import org.apache.ibatis.annotations.Mapper;  
9 -  
10 -import java.util.List;  
11 -  
12 -/**  
13 - * MES 产品收货单行 Mapper  
14 - */  
15 -@Mapper  
16 -public interface MesWmProductRecptLineMapper extends BaseMapperX<MesWmProductRecptLineDO> {  
17 -  
18 - default PageResult<MesWmProductRecptLineDO> selectPage(MesWmProductRecptLinePageReqVO reqVO) {  
19 - return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductRecptLineDO>()  
20 - .eqIfPresent(MesWmProductRecptLineDO::getRecptId, reqVO.getRecptId())  
21 - .orderByDesc(MesWmProductRecptLineDO::getId));  
22 - }  
23 -  
24 - default List<MesWmProductRecptLineDO> selectListByRecptId(Long recptId) {  
25 - return selectList(MesWmProductRecptLineDO::getRecptId, recptId);  
26 - }  
27 -  
28 - default void deleteByRecptId(Long recptId) {  
29 - delete(MesWmProductRecptLineDO::getRecptId, recptId);  
30 - }  
31 -  
32 -}  
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptMapper.java deleted
View file @8119398
1 -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;  
5 -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;  
6 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO;  
7 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO;  
8 -import org.apache.ibatis.annotations.Mapper;  
9 -  
10 -/**  
11 - * MES 产品收货单 Mapper  
12 - */  
13 -@Mapper  
14 -public interface MesWmProductRecptMapper extends BaseMapperX<MesWmProductRecptDO> {  
15 -  
16 - default PageResult<MesWmProductRecptDO> selectPage(MesWmProductRecptPageReqVO reqVO) {  
17 - return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductRecptDO>()  
18 - .likeIfPresent(MesWmProductRecptDO::getCode, reqVO.getCode())  
19 - .likeIfPresent(MesWmProductRecptDO::getName, reqVO.getName())  
20 - .eqIfPresent(MesWmProductRecptDO::getWorkOrderId, reqVO.getWorkOrderId())  
21 - .eqIfPresent(MesWmProductRecptDO::getItemId, reqVO.getItemId())  
22 - .orderByDesc(MesWmProductRecptDO::getId));  
23 - }  
24 -  
25 - default MesWmProductRecptDO selectByCode(String code) {  
26 - return selectOne(MesWmProductRecptDO::getCode, code);  
27 - }  
28 -  
29 -}  
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductRecptStatusEnum.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductReceiptStatusEnum.java
  View file @f99f854
1 package cn.iocoder.yudao.module.mes.enums.wm; 1 package cn.iocoder.yudao.module.mes.enums.wm;
2 2
3 import cn.iocoder.yudao.framework.common.core.ArrayValuable; 3 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
4 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; 4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
5 import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; 5 import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
6 -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptService; 6 +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
7 import lombok.AllArgsConstructor; 7 import lombok.AllArgsConstructor;
8 import lombok.Getter; 8 import lombok.Getter;
9 9
@@ -16,40 +16,40 @@ import java.util.Arrays; @@ -16,40 +16,40 @@ import java.util.Arrays;
16 */ 16 */
17 @Getter 17 @Getter
18 @AllArgsConstructor 18 @AllArgsConstructor
19 -public enum MesWmProductRecptStatusEnum implements ArrayValuable<Integer> { 19 +public enum MesWmProductReceiptStatusEnum implements ArrayValuable<Integer> {
20 20
21 /** 21 /**
22 * 草稿 22 * 草稿
23 * 23 *
24 - * 对应方法：{@link MesWmProductRecptService#createProductRecpt(MesWmProductRecptSaveReqVO)} 24 + * 对应方法：{@link MesWmProductReceiptService#createProductReceipt(MesWmProductReceiptSaveReqVO)}
25 */ 25 */
26 PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), 26 PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
27 /** 27 /**
28 * 待上架 28 * 待上架
29 * 29 *
30 - * 对应方法：{@link MesWmProductRecptService#submitProductRecpt(Long)} 30 + * 对应方法：{@link MesWmProductReceiptService#submitProductReceipt(Long)}
31 */ 31 */
32 APPROVING(MesOrderStatusConstants.APPROVING, "待上架"), 32 APPROVING(MesOrderStatusConstants.APPROVING, "待上架"),
33 /** 33 /**
34 * 待执行入库 34 * 待执行入库
35 * 35 *
36 - * 对应方法：{@link MesWmProductRecptService#stockProductRecpt(Long)} 36 + * 对应方法：{@link MesWmProductReceiptService#stockProductReceipt(Long)}
37 */ 37 */
38 APPROVED(MesOrderStatusConstants.APPROVED, "待执行入库"), 38 APPROVED(MesOrderStatusConstants.APPROVED, "待执行入库"),
39 /** 39 /**
40 * 已完成 40 * 已完成
41 * 41 *
42 - * 对应方法：{@link MesWmProductRecptService#executeProductRecpt(Long)} 42 + * 对应方法：{@link MesWmProductReceiptService#executeProductReceipt(Long)}
43 */ 43 */
44 FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), 44 FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
45 /** 45 /**
46 * 已取消 46 * 已取消
47 * 47 *
48 - * 对应方法：{@link MesWmProductRecptService#cancelProductRecpt(Long)} 48 + * 对应方法：{@link MesWmProductReceiptService#cancelProductReceipt(Long)}
49 */ 49 */
50 CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); 50 CANCELED(MesOrderStatusConstants.CANCELLED, "已取消");
51 51
52 - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductRecptStatusEnum::getStatus).toArray(Integer[]::new); 52 + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductReceiptStatusEnum::getStatus).toArray(Integer[]::new);
53 53
54 /** 54 /**
55 * 状态值 55 * 状态值
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailService.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailService.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO;  
4 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; 3 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
5 import jakarta.validation.Valid; 5 import jakarta.validation.Valid;
6 6
7 import java.util.List; 7 import java.util.List;
@@ -9,7 +9,7 @@ import java.util.List; @@ -9,7 +9,7 @@ import java.util.List;
9 /** 9 /**
10 * MES 产品收货单明细 Service 接口 10 * MES 产品收货单明细 Service 接口
11 */ 11 */
12 -public interface MesWmProductRecptDetailService { 12 +public interface MesWmProductReceiptDetailService {
13 13
14 /** 14 /**
15 * 创建产品收货单明细 15 * 创建产品收货单明细
@@ -17,21 +17,21 @@ public interface MesWmProductRecptDetailService { @@ -17,21 +17,21 @@ public interface MesWmProductRecptDetailService {
17 * @param createReqVO 创建信息 17 * @param createReqVO 创建信息
18 * @return 编号 18 * @return 编号
19 */ 19 */
20 - Long createProductRecptDetail(@Valid MesWmProductRecptDetailSaveReqVO createReqVO); 20 + Long createProductReceiptDetail(@Valid MesWmProductReceiptDetailSaveReqVO createReqVO);
21 21
22 /** 22 /**
23 * 修改产品收货单明细 23 * 修改产品收货单明细
24 * 24 *
25 * @param updateReqVO 修改信息 25 * @param updateReqVO 修改信息
26 */ 26 */
27 - void updateProductRecptDetail(@Valid MesWmProductRecptDetailSaveReqVO updateReqVO); 27 + void updateProductReceiptDetail(@Valid MesWmProductReceiptDetailSaveReqVO updateReqVO);
28 28
29 /** 29 /**
30 * 删除产品收货单明细 30 * 删除产品收货单明细
31 * 31 *
32 * @param id 编号 32 * @param id 编号
33 */ 33 */
34 - void deleteProductRecptDetail(Long id); 34 + void deleteProductReceiptDetail(Long id);
35 35
36 /** 36 /**
37 * 获得产品收货单明细 37 * 获得产品收货单明细
@@ -39,15 +39,15 @@ public interface MesWmProductRecptDetailService { @@ -39,15 +39,15 @@ public interface MesWmProductRecptDetailService {
39 * @param id 编号 39 * @param id 编号
40 * @return 产品收货单明细 40 * @return 产品收货单明细
41 */ 41 */
42 - MesWmProductRecptDetailDO getProductRecptDetail(Long id); 42 + MesWmProductReceiptDetailDO getProductReceiptDetail(Long id);
43 43
44 /** 44 /**
45 * 按收货单编号获得明细列表 45 * 按收货单编号获得明细列表
46 * 46 *
47 - * @param recptId 收货单编号 47 + * @param receiptId 收货单编号
48 * @return 明细列表 48 * @return 明细列表
49 */ 49 */
50 - List<MesWmProductRecptDetailDO> getProductRecptDetailListByRecptId(Long recptId); 50 + List<MesWmProductReceiptDetailDO> getProductReceiptDetailListByRecptId(Long receiptId);
51 51
52 /** 52 /**
53 * 按收货单行编号获得明细列表 53 * 按收货单行编号获得明细列表
@@ -55,20 +55,20 @@ public interface MesWmProductRecptDetailService { @@ -55,20 +55,20 @@ public interface MesWmProductRecptDetailService {
55 * @param lineId 行编号 55 * @param lineId 行编号
56 * @return 明细列表 56 * @return 明细列表
57 */ 57 */
58 - List<MesWmProductRecptDetailDO> getProductRecptDetailListByLineId(Long lineId); 58 + List<MesWmProductReceiptDetailDO> getProductReceiptDetailListByLineId(Long lineId);
59 59
60 /** 60 /**
61 * 按收货单行编号批量删除明细 61 * 按收货单行编号批量删除明细
62 * 62 *
63 * @param lineId 行编号 63 * @param lineId 行编号
64 */ 64 */
65 - void deleteProductRecptDetailByLineId(Long lineId); 65 + void deleteProductReceiptDetailByLineId(Long lineId);
66 66
67 /** 67 /**
68 * 按收货单编号批量删除明细 68 * 按收货单编号批量删除明细
69 * 69 *
70 - * @param recptId 收货单编号 70 + * @param receiptId 收货单编号
71 */ 71 */
72 - void deleteProductRecptDetailByRecptId(Long recptId); 72 + void deleteProductReceiptDetailByRecptId(Long receiptId);
73 73
74 } 74 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailServiceImpl.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailServiceImpl.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 3 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
4 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO;  
5 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO;  
6 -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptDetailMapper; 4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
  6 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptDetailMapper;
7 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; 7 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
8 import jakarta.annotation.Resource; 8 import jakarta.annotation.Resource;
9 import org.springframework.context.annotation.Lazy; 9 import org.springframework.context.annotation.Lazy;
@@ -20,81 +20,81 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @@ -20,81 +20,81 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
20 */ 20 */
21 @Service 21 @Service
22 @Validated 22 @Validated
23 -public class MesWmProductRecptDetailServiceImpl implements MesWmProductRecptDetailService { 23 +public class MesWmProductReceiptDetailServiceImpl implements MesWmProductReceiptDetailService {
24 24
25 @Resource 25 @Resource
26 - private MesWmProductRecptDetailMapper productRecptDetailMapper; 26 + private MesWmProductReceiptDetailMapper productReceiptDetailMapper;
27 27
28 @Resource 28 @Resource
29 @Lazy 29 @Lazy
30 - private MesWmProductRecptService productRecptService; 30 + private MesWmProductReceiptService productReceiptService;
31 31
32 @Resource 32 @Resource
33 private MesWmWarehouseAreaService warehouseAreaService; 33 private MesWmWarehouseAreaService warehouseAreaService;
34 34
35 @Override 35 @Override
36 - public Long createProductRecptDetail(MesWmProductRecptDetailSaveReqVO createReqVO) { 36 + public Long createProductReceiptDetail(MesWmProductReceiptDetailSaveReqVO createReqVO) {
37 // 校验父单据存在且为可编辑状态 37 // 校验父单据存在且为可编辑状态
38 - productRecptService.validateProductRecptEditable(createReqVO.getRecptId()); 38 + productReceiptService.validateProductReceiptEditable(createReqVO.getReceiptId());
39 // 校验库区关系 39 // 校验库区关系
40 warehouseAreaService.validateWarehouseAreaExists( 40 warehouseAreaService.validateWarehouseAreaExists(
41 createReqVO.getWarehouseId(), createReqVO.getLocationId(), createReqVO.getAreaId()); 41 createReqVO.getWarehouseId(), createReqVO.getLocationId(), createReqVO.getAreaId());
42 42
43 - MesWmProductRecptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmProductRecptDetailDO.class);  
44 - productRecptDetailMapper.insert(detail); 43 + MesWmProductReceiptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmProductReceiptDetailDO.class);
  44 + productReceiptDetailMapper.insert(detail);
45 return detail.getId(); 45 return detail.getId();
46 } 46 }
47 47
48 @Override 48 @Override
49 - public void updateProductRecptDetail(MesWmProductRecptDetailSaveReqVO updateReqVO) { 49 + public void updateProductReceiptDetail(MesWmProductReceiptDetailSaveReqVO updateReqVO) {
50 // 校验存在 50 // 校验存在
51 - MesWmProductRecptDetailDO detail = validateProductRecptDetailExists(updateReqVO.getId()); 51 + MesWmProductReceiptDetailDO detail = validateProductReceiptDetailExists(updateReqVO.getId());
52 // 校验父单据存在且为可编辑状态 52 // 校验父单据存在且为可编辑状态
53 - productRecptService.validateProductRecptEditable(detail.getRecptId()); 53 + productReceiptService.validateProductReceiptEditable(detail.getReceiptId());
54 // 校验库区关系 54 // 校验库区关系
55 warehouseAreaService.validateWarehouseAreaExists( 55 warehouseAreaService.validateWarehouseAreaExists(
56 updateReqVO.getWarehouseId(), updateReqVO.getLocationId(), updateReqVO.getAreaId()); 56 updateReqVO.getWarehouseId(), updateReqVO.getLocationId(), updateReqVO.getAreaId());
57 57
58 // 更新 58 // 更新
59 - MesWmProductRecptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptDetailDO.class);  
60 - productRecptDetailMapper.updateById(updateObj); 59 + MesWmProductReceiptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptDetailDO.class);
  60 + productReceiptDetailMapper.updateById(updateObj);
61 } 61 }
62 62
63 @Override 63 @Override
64 - public void deleteProductRecptDetail(Long id) { 64 + public void deleteProductReceiptDetail(Long id) {
65 // 校验存在 65 // 校验存在
66 - validateProductRecptDetailExists(id); 66 + validateProductReceiptDetailExists(id);
67 // 删除 67 // 删除
68 - productRecptDetailMapper.deleteById(id); 68 + productReceiptDetailMapper.deleteById(id);
69 } 69 }
70 70
71 @Override 71 @Override
72 - public MesWmProductRecptDetailDO getProductRecptDetail(Long id) {  
73 - return productRecptDetailMapper.selectById(id); 72 + public MesWmProductReceiptDetailDO getProductReceiptDetail(Long id) {
  73 + return productReceiptDetailMapper.selectById(id);
74 } 74 }
75 75
76 @Override 76 @Override
77 - public List<MesWmProductRecptDetailDO> getProductRecptDetailListByRecptId(Long recptId) {  
78 - return productRecptDetailMapper.selectListByRecptId(recptId); 77 + public List<MesWmProductReceiptDetailDO> getProductReceiptDetailListByRecptId(Long receiptId) {
  78 + return productReceiptDetailMapper.selectListByRecptId(receiptId);
79 } 79 }
80 80
81 @Override 81 @Override
82 - public List<MesWmProductRecptDetailDO> getProductRecptDetailListByLineId(Long lineId) {  
83 - return productRecptDetailMapper.selectListByLineId(lineId); 82 + public List<MesWmProductReceiptDetailDO> getProductReceiptDetailListByLineId(Long lineId) {
  83 + return productReceiptDetailMapper.selectListByLineId(lineId);
84 } 84 }
85 85
86 @Override 86 @Override
87 - public void deleteProductRecptDetailByLineId(Long lineId) {  
88 - productRecptDetailMapper.deleteByLineId(lineId); 87 + public void deleteProductReceiptDetailByLineId(Long lineId) {
  88 + productReceiptDetailMapper.deleteByLineId(lineId);
89 } 89 }
90 90
91 @Override 91 @Override
92 - public void deleteProductRecptDetailByRecptId(Long recptId) {  
93 - productRecptDetailMapper.deleteByRecptId(recptId); 92 + public void deleteProductReceiptDetailByRecptId(Long receiptId) {
  93 + productReceiptDetailMapper.deleteByRecptId(receiptId);
94 } 94 }
95 95
96 - private MesWmProductRecptDetailDO validateProductRecptDetailExists(Long id) {  
97 - MesWmProductRecptDetailDO detail = productRecptDetailMapper.selectById(id); 96 + private MesWmProductReceiptDetailDO validateProductReceiptDetailExists(Long id) {
  97 + MesWmProductReceiptDetailDO detail = productReceiptDetailMapper.selectById(id);
98 if (detail == null) { 98 if (detail == null) {
99 throw exception(WM_PRODUCT_RECPT_DETAIL_NOT_EXISTS); 99 throw exception(WM_PRODUCT_RECPT_DETAIL_NOT_EXISTS);
100 } 100 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineService.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineService.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLinePageReqVO;  
5 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO;  
6 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; 4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
7 import jakarta.validation.Valid; 7 import jakarta.validation.Valid;
8 8
9 import java.util.List; 9 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List; @@ -11,7 +11,7 @@ import java.util.List;
11 /** 11 /**
12 * MES 产品收货单行 Service 接口 12 * MES 产品收货单行 Service 接口
13 */ 13 */
14 -public interface MesWmProductRecptLineService { 14 +public interface MesWmProductReceiptLineService {
15 15
16 /** 16 /**
17 * 创建产品收货单行 17 * 创建产品收货单行
@@ -19,21 +19,21 @@ public interface MesWmProductRecptLineService { @@ -19,21 +19,21 @@ public interface MesWmProductRecptLineService {
19 * @param createReqVO 创建信息 19 * @param createReqVO 创建信息
20 * @return 编号 20 * @return 编号
21 */ 21 */
22 - Long createProductRecptLine(@Valid MesWmProductRecptLineSaveReqVO createReqVO); 22 + Long createProductReceiptLine(@Valid MesWmProductReceiptLineSaveReqVO createReqVO);
23 23
24 /** 24 /**
25 * 修改产品收货单行 25 * 修改产品收货单行
26 * 26 *
27 * @param updateReqVO 修改信息 27 * @param updateReqVO 修改信息
28 */ 28 */
29 - void updateProductRecptLine(@Valid MesWmProductRecptLineSaveReqVO updateReqVO); 29 + void updateProductReceiptLine(@Valid MesWmProductReceiptLineSaveReqVO updateReqVO);
30 30
31 /** 31 /**
32 * 删除产品收货单行（级联删除明细） 32 * 删除产品收货单行（级联删除明细）
33 * 33 *
34 * @param id 编号 34 * @param id 编号
35 */ 35 */
36 - void deleteProductRecptLine(Long id); 36 + void deleteProductReceiptLine(Long id);
37 37
38 /** 38 /**
39 * 获得产品收货单行 39 * 获得产品收货单行
@@ -41,7 +41,7 @@ public interface MesWmProductRecptLineService { @@ -41,7 +41,7 @@ public interface MesWmProductRecptLineService {
41 * @param id 编号 41 * @param id 编号
42 * @return 产品收货单行 42 * @return 产品收货单行
43 */ 43 */
44 - MesWmProductRecptLineDO getProductRecptLine(Long id); 44 + MesWmProductReceiptLineDO getProductReceiptLine(Long id);
45 45
46 /** 46 /**
47 * 获得产品收货单行分页 47 * 获得产品收货单行分页
@@ -49,21 +49,21 @@ public interface MesWmProductRecptLineService { @@ -49,21 +49,21 @@ public interface MesWmProductRecptLineService {
49 * @param pageReqVO 分页参数 49 * @param pageReqVO 分页参数
50 * @return 产品收货单行分页 50 * @return 产品收货单行分页
51 */ 51 */
52 - PageResult<MesWmProductRecptLineDO> getProductRecptLinePage(MesWmProductRecptLinePageReqVO pageReqVO); 52 + PageResult<MesWmProductReceiptLineDO> getProductReceiptLinePage(MesWmProductReceiptLinePageReqVO pageReqVO);
53 53
54 /** 54 /**
55 * 按收货单编号获得行列表 55 * 按收货单编号获得行列表
56 * 56 *
57 - * @param recptId 收货单编号 57 + * @param receiptId 收货单编号
58 * @return 行列表 58 * @return 行列表
59 */ 59 */
60 - List<MesWmProductRecptLineDO> getProductRecptLineListByRecptId(Long recptId); 60 + List<MesWmProductReceiptLineDO> getProductReceiptLineListByRecptId(Long receiptId);
61 61
62 /** 62 /**
63 * 按收货单编号批量删除行 63 * 按收货单编号批量删除行
64 * 64 *
65 - * @param recptId 收货单编号 65 + * @param receiptId 收货单编号
66 */ 66 */
67 - void deleteProductRecptLineByRecptId(Long recptId); 67 + void deleteProductReceiptLineByRecptId(Long receiptId);
68 68
69 } 69 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineServiceImpl.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineServiceImpl.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 4 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
5 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLinePageReqVO;  
6 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO;  
7 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO;  
8 -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptLineMapper; 5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
  8 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptLineMapper;
9 import jakarta.annotation.Resource; 9 import jakarta.annotation.Resource;
10 import org.springframework.context.annotation.Lazy; 10 import org.springframework.context.annotation.Lazy;
11 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
@@ -22,75 +22,75 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_RE @@ -22,75 +22,75 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_RE
22 */ 22 */
23 @Service 23 @Service
24 @Validated 24 @Validated
25 -public class MesWmProductRecptLineServiceImpl implements MesWmProductRecptLineService { 25 +public class MesWmProductReceiptLineServiceImpl implements MesWmProductReceiptLineService {
26 26
27 @Resource 27 @Resource
28 - private MesWmProductRecptLineMapper productRecptLineMapper; 28 + private MesWmProductReceiptLineMapper productReceiptLineMapper;
29 29
30 @Resource 30 @Resource
31 @Lazy 31 @Lazy
32 - private MesWmProductRecptService productRecptService; 32 + private MesWmProductReceiptService productReceiptService;
33 33
34 @Resource 34 @Resource
35 - private MesWmProductRecptDetailService productRecptDetailService; 35 + private MesWmProductReceiptDetailService productReceiptDetailService;
36 36
37 @Override 37 @Override
38 - public Long createProductRecptLine(MesWmProductRecptLineSaveReqVO createReqVO) { 38 + public Long createProductReceiptLine(MesWmProductReceiptLineSaveReqVO createReqVO) {
39 // 校验父单据存在且为可编辑状态 39 // 校验父单据存在且为可编辑状态
40 - productRecptService.validateProductRecptEditable(createReqVO.getRecptId()); 40 + productReceiptService.validateProductReceiptEditable(createReqVO.getReceiptId());
41 41
42 // 新增 42 // 新增
43 - MesWmProductRecptLineDO line = BeanUtils.toBean(createReqVO, MesWmProductRecptLineDO.class);  
44 - productRecptLineMapper.insert(line); 43 + MesWmProductReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmProductReceiptLineDO.class);
  44 + productReceiptLineMapper.insert(line);
45 return line.getId(); 45 return line.getId();
46 } 46 }
47 47
48 @Override 48 @Override
49 - public void updateProductRecptLine(MesWmProductRecptLineSaveReqVO updateReqVO) { 49 + public void updateProductReceiptLine(MesWmProductReceiptLineSaveReqVO updateReqVO) {
50 // 校验存在 50 // 校验存在
51 - MesWmProductRecptLineDO line = validateProductRecptLineExists(updateReqVO.getId()); 51 + MesWmProductReceiptLineDO line = validateProductReceiptLineExists(updateReqVO.getId());
52 // 校验父单据存在且为可编辑状态 52 // 校验父单据存在且为可编辑状态
53 - productRecptService.validateProductRecptEditable(line.getRecptId()); 53 + productReceiptService.validateProductReceiptEditable(line.getReceiptId());
54 54
55 // 更新 55 // 更新
56 - MesWmProductRecptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptLineDO.class);  
57 - productRecptLineMapper.updateById(updateObj); 56 + MesWmProductReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptLineDO.class);
  57 + productReceiptLineMapper.updateById(updateObj);
58 } 58 }
59 59
60 @Override 60 @Override
61 @Transactional(rollbackFor = Exception.class) 61 @Transactional(rollbackFor = Exception.class)
62 - public void deleteProductRecptLine(Long id) { 62 + public void deleteProductReceiptLine(Long id) {
63 // 校验存在 63 // 校验存在
64 - validateProductRecptLineExists(id); 64 + validateProductReceiptLineExists(id);
65 65
66 // 级联删除明细 66 // 级联删除明细
67 - productRecptDetailService.deleteProductRecptDetailByLineId(id); 67 + productReceiptDetailService.deleteProductReceiptDetailByLineId(id);
68 // 删除 68 // 删除
69 - productRecptLineMapper.deleteById(id); 69 + productReceiptLineMapper.deleteById(id);
70 } 70 }
71 71
72 @Override 72 @Override
73 - public MesWmProductRecptLineDO getProductRecptLine(Long id) {  
74 - return productRecptLineMapper.selectById(id); 73 + public MesWmProductReceiptLineDO getProductReceiptLine(Long id) {
  74 + return productReceiptLineMapper.selectById(id);
75 } 75 }
76 76
77 @Override 77 @Override
78 - public PageResult<MesWmProductRecptLineDO> getProductRecptLinePage(MesWmProductRecptLinePageReqVO pageReqVO) {  
79 - return productRecptLineMapper.selectPage(pageReqVO); 78 + public PageResult<MesWmProductReceiptLineDO> getProductReceiptLinePage(MesWmProductReceiptLinePageReqVO pageReqVO) {
  79 + return productReceiptLineMapper.selectPage(pageReqVO);
80 } 80 }
81 81
82 @Override 82 @Override
83 - public List<MesWmProductRecptLineDO> getProductRecptLineListByRecptId(Long recptId) {  
84 - return productRecptLineMapper.selectListByRecptId(recptId); 83 + public List<MesWmProductReceiptLineDO> getProductReceiptLineListByRecptId(Long receiptId) {
  84 + return productReceiptLineMapper.selectListByRecptId(receiptId);
85 } 85 }
86 86
87 @Override 87 @Override
88 - public void deleteProductRecptLineByRecptId(Long recptId) {  
89 - productRecptLineMapper.deleteByRecptId(recptId); 88 + public void deleteProductReceiptLineByRecptId(Long receiptId) {
  89 + productReceiptLineMapper.deleteByRecptId(receiptId);
90 } 90 }
91 91
92 - private MesWmProductRecptLineDO validateProductRecptLineExists(Long id) {  
93 - MesWmProductRecptLineDO line = productRecptLineMapper.selectById(id); 92 + private MesWmProductReceiptLineDO validateProductReceiptLineExists(Long id) {
  93 + MesWmProductReceiptLineDO line = productReceiptLineMapper.selectById(id);
94 if (line == null) { 94 if (line == null) {
95 throw exception(WM_PRODUCT_RECPT_LINE_NOT_EXISTS); 95 throw exception(WM_PRODUCT_RECPT_LINE_NOT_EXISTS);
96 } 96 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptService.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO;  
5 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO;  
6 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; 4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
7 import jakarta.validation.Valid; 7 import jakarta.validation.Valid;
8 8
9 /** 9 /**
10 * MES 产品收货单 Service 接口 10 * MES 产品收货单 Service 接口
11 */ 11 */
12 -public interface MesWmProductRecptService { 12 +public interface MesWmProductReceiptService {
13 13
14 /** 14 /**
15 * 创建产品收货单 15 * 创建产品收货单
@@ -17,21 +17,21 @@ public interface MesWmProductRecptService { @@ -17,21 +17,21 @@ public interface MesWmProductRecptService {
17 * @param createReqVO 创建信息 17 * @param createReqVO 创建信息
18 * @return 编号 18 * @return 编号
19 */ 19 */
20 - Long createProductRecpt(@Valid MesWmProductRecptSaveReqVO createReqVO); 20 + Long createProductReceipt(@Valid MesWmProductReceiptSaveReqVO createReqVO);
21 21
22 /** 22 /**
23 * 修改产品收货单 23 * 修改产品收货单
24 * 24 *
25 * @param updateReqVO 修改信息 25 * @param updateReqVO 修改信息
26 */ 26 */
27 - void updateProductRecpt(@Valid MesWmProductRecptSaveReqVO updateReqVO); 27 + void updateProductReceipt(@Valid MesWmProductReceiptSaveReqVO updateReqVO);
28 28
29 /** 29 /**
30 * 删除产品收货单（级联删除行+明细） 30 * 删除产品收货单（级联删除行+明细）
31 * 31 *
32 * @param id 编号 32 * @param id 编号
33 */ 33 */
34 - void deleteProductRecpt(Long id); 34 + void deleteProductReceipt(Long id);
35 35
36 /** 36 /**
37 * 获得产品收货单 37 * 获得产品收货单
@@ -39,7 +39,7 @@ public interface MesWmProductRecptService { @@ -39,7 +39,7 @@ public interface MesWmProductRecptService {
39 * @param id 编号 39 * @param id 编号
40 * @return 产品收货单 40 * @return 产品收货单
41 */ 41 */
42 - MesWmProductRecptDO getProductRecpt(Long id); 42 + MesWmProductReceiptDO getProductReceipt(Long id);
43 43
44 /** 44 /**
45 * 获得产品收货单分页 45 * 获得产品收货单分页
@@ -47,35 +47,35 @@ public interface MesWmProductRecptService { @@ -47,35 +47,35 @@ public interface MesWmProductRecptService {
47 * @param pageReqVO 分页参数 47 * @param pageReqVO 分页参数
48 * @return 产品收货单分页 48 * @return 产品收货单分页
49 */ 49 */
50 - PageResult<MesWmProductRecptDO> getProductRecptPage(MesWmProductRecptPageReqVO pageReqVO); 50 + PageResult<MesWmProductReceiptDO> getProductReceiptPage(MesWmProductReceiptPageReqVO pageReqVO);
51 51
52 /** 52 /**
53 * 提交产品收货单（草稿 → 待上架） 53 * 提交产品收货单（草稿 → 待上架）
54 * 54 *
55 * @param id 编号 55 * @param id 编号
56 */ 56 */
57 - void submitProductRecpt(Long id); 57 + void submitProductReceipt(Long id);
58 58
59 /** 59 /**
60 * 执行上架（待上架 → 待入库） 60 * 执行上架（待上架 → 待入库）
61 * 61 *
62 * @param id 编号 62 * @param id 编号
63 */ 63 */
64 - void stockProductRecpt(Long id); 64 + void stockProductReceipt(Long id);
65 65
66 /** 66 /**
67 * 执行入库（待入库 → 已完成），更新库存台账 67 * 执行入库（待入库 → 已完成），更新库存台账
68 * 68 *
69 * @param id 编号 69 * @param id 编号
70 */ 70 */
71 - void executeProductRecpt(Long id); 71 + void executeProductReceipt(Long id);
72 72
73 /** 73 /**
74 * 取消产品收货单（任意非已完成/已取消状态 → 已取消） 74 * 取消产品收货单（任意非已完成/已取消状态 → 已取消）
75 * 75 *
76 * @param id 编号 76 * @param id 编号
77 */ 77 */
78 - void cancelProductRecpt(Long id); 78 + void cancelProductReceipt(Long id);
79 79
80 /** 80 /**
81 * 校验产品收货单存在且处于可编辑状态（草稿或待上架） 81 * 校验产品收货单存在且处于可编辑状态（草稿或待上架）
@@ -83,7 +83,7 @@ public interface MesWmProductRecptService { @@ -83,7 +83,7 @@ public interface MesWmProductRecptService {
83 * @param id 编号 83 * @param id 编号
84 * @return 产品收货单 84 * @return 产品收货单
85 */ 85 */
86 - MesWmProductRecptDO validateProductRecptEditable(Long id); 86 + MesWmProductReceiptDO validateProductReceiptEditable(Long id);
87 87
88 /** 88 /**
89 * 校验产品收货单明细数量（每行明细数量之和是否等于行收货数量） 89 * 校验产品收货单明细数量（每行明细数量之和是否等于行收货数量）
@@ -91,6 +91,6 @@ public interface MesWmProductRecptService { @@ -91,6 +91,6 @@ public interface MesWmProductRecptService {
91 * @param id 编号 91 * @param id 编号
92 * @return 是否匹配 92 * @return 是否匹配
93 */ 93 */
94 - Boolean checkProductRecptQuantity(Long id); 94 + Boolean checkProductReceiptQuantity(Long id);
95 95
96 } 96 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptServiceImpl.java renamed to yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
  View file @f99f854
1 -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; 1 +package cn.iocoder.yudao.module.mes.service.wm.productreceipt;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.ObjUtil; 4 import cn.hutool.core.util.ObjUtil;
@@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
8 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 8 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
9 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO;  
10 -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; 9 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
11 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; 11 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
12 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO;  
13 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO;  
14 -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO;  
15 -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptMapper;  
16 -import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductRecptStatusEnum; 12 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
  14 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
  15 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptMapper;
  16 +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum;
17 import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; 17 import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
18 import jakarta.annotation.Resource; 18 import jakarta.annotation.Resource;
19 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
@@ -31,16 +31,16 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @@ -31,16 +31,16 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
31 */ 31 */
32 @Service 32 @Service
33 @Validated 33 @Validated
34 -public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { 34 +public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptService {
35 35
36 @Resource 36 @Resource
37 - private MesWmProductRecptMapper productRecptMapper; 37 + private MesWmProductReceiptMapper productReceiptMapper;
38 38
39 @Resource 39 @Resource
40 - private MesWmProductRecptLineService productRecptLineService; 40 + private MesWmProductReceiptLineService productReceiptLineService;
41 41
42 @Resource 42 @Resource
43 - private MesWmProductRecptDetailService productRecptDetailService; 43 + private MesWmProductReceiptDetailService productReceiptDetailService;
44 44
45 @Resource 45 @Resource
46 private MesWmMaterialStockService materialStockService; 46 private MesWmMaterialStockService materialStockService;
@@ -49,7 +49,7 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { @@ -49,7 +49,7 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService {
49 private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService workOrderService; 49 private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService workOrderService;
50 50
51 @Override 51 @Override
52 - public Long createProductRecpt(MesWmProductRecptSaveReqVO createReqVO) { 52 + public Long createProductReceipt(MesWmProductReceiptSaveReqVO createReqVO) {
53 // 校验编码唯一 53 // 校验编码唯一
54 validateCodeUnique(null, createReqVO.getCode()); 54 validateCodeUnique(null, createReqVO.getCode());
55 // 校验工单存在并设置 itemId 55 // 校验工单存在并设置 itemId
@@ -57,19 +57,19 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { @@ -57,19 +57,19 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService {
57 workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()) : null; 57 workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()) : null;
58 58
59 // 插入 59 // 插入
60 - MesWmProductRecptDO recpt = BeanUtils.toBean(createReqVO, MesWmProductRecptDO.class); 60 + MesWmProductReceiptDO receipt = BeanUtils.toBean(createReqVO, MesWmProductReceiptDO.class);
61 if (workOrder != null) { 61 if (workOrder != null) {
62 - recpt.setItemId(workOrder.getProductId()); 62 + receipt.setItemId(workOrder.getProductId());
63 } 63 }
64 - recpt.setStatus(MesWmProductRecptStatusEnum.PREPARE.getStatus());  
65 - productRecptMapper.insert(recpt);  
66 - return recpt.getId(); 64 + receipt.setStatus(MesWmProductReceiptStatusEnum.PREPARE.getStatus());
  65 + productReceiptMapper.insert(receipt);
  66 + return receipt.getId();
67 } 67 }
68 68
69 @Override 69 @Override
70 - public void updateProductRecpt(MesWmProductRecptSaveReqVO updateReqVO) { 70 + public void updateProductReceipt(MesWmProductReceiptSaveReqVO updateReqVO) {
71 // 校验存在 + 草稿状态 71 // 校验存在 + 草稿状态
72 - validateProductRecptExistsAndDraft(updateReqVO.getId()); 72 + validateProductReceiptExistsAndDraft(updateReqVO.getId());
73 // 校验编码唯一 73 // 校验编码唯一
74 validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); 74 validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
75 // 校验工单存在 75 // 校验工单存在
@@ -77,73 +77,73 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { @@ -77,73 +77,73 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService {
77 workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId()) : null; 77 workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId()) : null;
78 78
79 // 更新 79 // 更新
80 - MesWmProductRecptDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptDO.class); 80 + MesWmProductReceiptDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptDO.class);
81 if (workOrder != null) { 81 if (workOrder != null) {
82 updateObj.setItemId(workOrder.getProductId()); 82 updateObj.setItemId(workOrder.getProductId());
83 } 83 }
84 - productRecptMapper.updateById(updateObj); 84 + productReceiptMapper.updateById(updateObj);
85 } 85 }
86 86
87 @Override 87 @Override
88 @Transactional(rollbackFor = Exception.class) 88 @Transactional(rollbackFor = Exception.class)
89 - public void deleteProductRecpt(Long id) { 89 + public void deleteProductReceipt(Long id) {
90 // 校验存在 + 草稿状态 90 // 校验存在 + 草稿状态
91 - validateProductRecptExistsAndDraft(id); 91 + validateProductReceiptExistsAndDraft(id);
92 92
93 // 级联删除明细和行 93 // 级联删除明细和行
94 - productRecptDetailService.deleteProductRecptDetailByRecptId(id);  
95 - productRecptLineService.deleteProductRecptLineByRecptId(id); 94 + productReceiptDetailService.deleteProductReceiptDetailByRecptId(id);
  95 + productReceiptLineService.deleteProductReceiptLineByRecptId(id);
96 // 删除 96 // 删除
97 - productRecptMapper.deleteById(id); 97 + productReceiptMapper.deleteById(id);
98 } 98 }
99 99
100 @Override 100 @Override
101 - public MesWmProductRecptDO getProductRecpt(Long id) {  
102 - return productRecptMapper.selectById(id); 101 + public MesWmProductReceiptDO getProductReceipt(Long id) {
  102 + return productReceiptMapper.selectById(id);
103 } 103 }
104 104
105 @Override 105 @Override
106 - public PageResult<MesWmProductRecptDO> getProductRecptPage(MesWmProductRecptPageReqVO pageReqVO) {  
107 - return productRecptMapper.selectPage(pageReqVO); 106 + public PageResult<MesWmProductReceiptDO> getProductReceiptPage(MesWmProductReceiptPageReqVO pageReqVO) {
  107 + return productReceiptMapper.selectPage(pageReqVO);
108 } 108 }
109 109
110 @Override 110 @Override
111 @Transactional(rollbackFor = Exception.class) 111 @Transactional(rollbackFor = Exception.class)
112 - public void submitProductRecpt(Long id) { 112 + public void submitProductReceipt(Long id) {
113 // 校验存在 + 草稿状态 113 // 校验存在 + 草稿状态
114 - validateProductRecptExistsAndDraft(id); 114 + validateProductReceiptExistsAndDraft(id);
115 // 校验至少有一条行 115 // 校验至少有一条行
116 - List<MesWmProductRecptLineDO> lines = productRecptLineService.getProductRecptLineListByRecptId(id); 116 + List<MesWmProductReceiptLineDO> lines = productReceiptLineService.getProductReceiptLineListByRecptId(id);
117 if (CollUtil.isEmpty(lines)) { 117 if (CollUtil.isEmpty(lines)) {
118 throw exception(WM_PRODUCT_RECPT_NO_LINE); 118 throw exception(WM_PRODUCT_RECPT_NO_LINE);
119 } 119 }
120 120
121 // 提交（草稿 → 待上架） 121 // 提交（草稿 → 待上架）
122 - productRecptMapper.updateById(new MesWmProductRecptDO()  
123 - .setId(id).setStatus(MesWmProductRecptStatusEnum.APPROVING.getStatus())); 122 + productReceiptMapper.updateById(new MesWmProductReceiptDO()
  123 + .setId(id).setStatus(MesWmProductReceiptStatusEnum.APPROVING.getStatus()));
124 } 124 }
125 125
126 @Override 126 @Override
127 @Transactional(rollbackFor = Exception.class) 127 @Transactional(rollbackFor = Exception.class)
128 - public void stockProductRecpt(Long id) { 128 + public void stockProductReceipt(Long id) {
129 // 校验存在 129 // 校验存在
130 - MesWmProductRecptDO recpt = validateProductRecptExists(id);  
131 - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.APPROVING.getStatus(), recpt.getStatus())) { 130 + MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
  131 + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
132 throw exception(WM_PRODUCT_RECPT_STATUS_ERROR); 132 throw exception(WM_PRODUCT_RECPT_STATUS_ERROR);
133 } 133 }
134 134
135 // 执行上架（待上架 → 待入库） 135 // 执行上架（待上架 → 待入库）
136 - productRecptMapper.updateById(new MesWmProductRecptDO()  
137 - .setId(id).setStatus(MesWmProductRecptStatusEnum.APPROVED.getStatus())); 136 + productReceiptMapper.updateById(new MesWmProductReceiptDO()
  137 + .setId(id).setStatus(MesWmProductReceiptStatusEnum.APPROVED.getStatus()));
138 } 138 }
139 139
140 @Override 140 @Override
141 - public Boolean checkProductRecptQuantity(Long id) {  
142 - List<MesWmProductRecptLineDO> lines = productRecptLineService.getProductRecptLineListByRecptId(id);  
143 - for (MesWmProductRecptLineDO line : lines) {  
144 - List<MesWmProductRecptDetailDO> details = productRecptDetailService.getProductRecptDetailListByLineId(line.getId()); 141 + public Boolean checkProductReceiptQuantity(Long id) {
  142 + List<MesWmProductReceiptLineDO> lines = productReceiptLineService.getProductReceiptLineListByRecptId(id);
  143 + for (MesWmProductReceiptLineDO line : lines) {
  144 + List<MesWmProductReceiptDetailDO> details = productReceiptDetailService.getProductReceiptDetailListByLineId(line.getId());
145 BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, 145 BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
146 - MesWmProductRecptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); 146 + MesWmProductReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
147 if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) { 147 if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) {
148 return false; 148 return false;
149 } 149 }
@@ -153,79 +153,79 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { @@ -153,79 +153,79 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService {
153 153
154 @Override 154 @Override
155 @Transactional(rollbackFor = Exception.class) 155 @Transactional(rollbackFor = Exception.class)
156 - public void executeProductRecpt(Long id) { 156 + public void executeProductReceipt(Long id) {
157 // 校验存在 157 // 校验存在
158 - MesWmProductRecptDO recpt = validateProductRecptExists(id);  
159 - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.APPROVED.getStatus(), recpt.getStatus())) { 158 + MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
  159 + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
160 throw exception(WM_PRODUCT_RECPT_STATUS_ERROR); 160 throw exception(WM_PRODUCT_RECPT_STATUS_ERROR);
161 } 161 }
162 162
163 // 遍历所有明细，更新库存台账 163 // 遍历所有明细，更新库存台账
164 // TODO @芋艿：【后面优化】 164 // TODO @芋艿：【后面优化】
165 - List<MesWmProductRecptDetailDO> details = productRecptDetailService.getProductRecptDetailListByRecptId(id);  
166 - for (MesWmProductRecptDetailDO detail : details) { 165 + List<MesWmProductReceiptDetailDO> details = productReceiptDetailService.getProductReceiptDetailListByRecptId(id);
  166 + for (MesWmProductReceiptDetailDO detail : details) {
167 materialStockService.increaseStock( 167 materialStockService.increaseStock(
168 detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), 168 detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(),
169 detail.getBatchId(), detail.getQuantity(), null, null, null); 169 detail.getBatchId(), detail.getQuantity(), null, null, null);
170 } 170 }
171 171
172 // 更新收货单状态 172 // 更新收货单状态
173 - productRecptMapper.updateById(new MesWmProductRecptDO()  
174 - .setId(id).setStatus(MesWmProductRecptStatusEnum.FINISHED.getStatus())); 173 + productReceiptMapper.updateById(new MesWmProductReceiptDO()
  174 + .setId(id).setStatus(MesWmProductReceiptStatusEnum.FINISHED.getStatus()));
175 } 175 }
176 176
177 @Override 177 @Override
178 @Transactional(rollbackFor = Exception.class) 178 @Transactional(rollbackFor = Exception.class)
179 - public void cancelProductRecpt(Long id) { 179 + public void cancelProductReceipt(Long id) {
180 // 校验存在 180 // 校验存在
181 - MesWmProductRecptDO recpt = validateProductRecptExists(id); 181 + MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
182 // 已完成和已取消不允许取消 182 // 已完成和已取消不允许取消
183 - if (ObjectUtils.equalsAny(recpt.getStatus(),  
184 - MesWmProductRecptStatusEnum.FINISHED.getStatus(),  
185 - MesWmProductRecptStatusEnum.CANCELED.getStatus())) { 183 + if (ObjectUtils.equalsAny(receipt.getStatus(),
  184 + MesWmProductReceiptStatusEnum.FINISHED.getStatus(),
  185 + MesWmProductReceiptStatusEnum.CANCELED.getStatus())) {
186 throw exception(WM_PRODUCT_RECPT_CANCEL_NOT_ALLOWED); 186 throw exception(WM_PRODUCT_RECPT_CANCEL_NOT_ALLOWED);
187 } 187 }
188 188
189 // 取消 189 // 取消
190 - productRecptMapper.updateById(new MesWmProductRecptDO()  
191 - .setId(id).setStatus(MesWmProductRecptStatusEnum.CANCELED.getStatus())); 190 + productReceiptMapper.updateById(new MesWmProductReceiptDO()
  191 + .setId(id).setStatus(MesWmProductReceiptStatusEnum.CANCELED.getStatus()));
192 } 192 }
193 193
194 @Override 194 @Override
195 - public MesWmProductRecptDO validateProductRecptEditable(Long id) {  
196 - MesWmProductRecptDO recpt = validateProductRecptExists(id);  
197 - if (ObjUtil.notEqual(recpt.getStatus(), MesWmProductRecptStatusEnum.PREPARE.getStatus())  
198 - && ObjUtil.notEqual(recpt.getStatus(), MesWmProductRecptStatusEnum.APPROVING.getStatus())) { 195 + public MesWmProductReceiptDO validateProductReceiptEditable(Long id) {
  196 + MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
  197 + if (ObjUtil.notEqual(receipt.getStatus(), MesWmProductReceiptStatusEnum.PREPARE.getStatus())
  198 + && ObjUtil.notEqual(receipt.getStatus(), MesWmProductReceiptStatusEnum.APPROVING.getStatus())) {
199 throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE); 199 throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE);
200 } 200 }
201 - return recpt; 201 + return receipt;
202 } 202 }
203 203
204 - private MesWmProductRecptDO validateProductRecptExists(Long id) {  
205 - MesWmProductRecptDO recpt = productRecptMapper.selectById(id);  
206 - if (recpt == null) { 204 + private MesWmProductReceiptDO validateProductReceiptExists(Long id) {
  205 + MesWmProductReceiptDO receipt = productReceiptMapper.selectById(id);
  206 + if (receipt == null) {
207 throw exception(WM_PRODUCT_RECPT_NOT_EXISTS); 207 throw exception(WM_PRODUCT_RECPT_NOT_EXISTS);
208 } 208 }
209 - return recpt; 209 + return receipt;
210 } 210 }
211 211
212 /** 212 /**
213 * 校验产品收货单存在且为草稿状态 213 * 校验产品收货单存在且为草稿状态
214 */ 214 */
215 - private MesWmProductRecptDO validateProductRecptExistsAndDraft(Long id) {  
216 - MesWmProductRecptDO recpt = validateProductRecptExists(id);  
217 - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.PREPARE.getStatus(), recpt.getStatus())) { 215 + private MesWmProductReceiptDO validateProductReceiptExistsAndDraft(Long id) {
  216 + MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
  217 + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.PREPARE.getStatus(), receipt.getStatus())) {
218 throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE); 218 throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE);
219 } 219 }
220 - return recpt; 220 + return receipt;
221 } 221 }
222 222
223 private void validateCodeUnique(Long id, String code) { 223 private void validateCodeUnique(Long id, String code) {
224 - MesWmProductRecptDO recpt = productRecptMapper.selectByCode(code);  
225 - if (recpt == null) { 224 + MesWmProductReceiptDO receipt = productReceiptMapper.selectByCode(code);
  225 + if (receipt == null) {
226 return; 226 return;
227 } 227 }
228 - if (ObjUtil.notEqual(id, recpt.getId())) { 228 + if (ObjUtil.notEqual(id, receipt.getId())) {
229 throw exception(WM_PRODUCT_RECPT_CODE_DUPLICATE); 229 throw exception(WM_PRODUCT_RECPT_CODE_DUPLICATE);
230 } 230 }
231 } 231 }
yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/detail/index.ts renamed to yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/detail/index.ts
  View file @f99f854
yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/index.ts renamed to yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/index.ts
  View file @f99f854
yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/line/index.ts renamed to yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/line/index.ts
  View file @f99f854