From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
index 21ed7b7..0ef05e3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
@@ -10,10 +10,14 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesScanReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesScanRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
@@ -40,11 +44,14 @@
@RequestMapping("/mes/wm/product-sales")
@Validated
public class MesWmProductSalesController {
+ @Resource private cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesShipmentMapper shipmentMapper;
@Resource
private MesWmProductSalesService productSalesService;
@Resource
private CrmCustomerApi crmCustomerApi;
+ @Resource
+ private AdminUserApi adminUserApi;
@Resource
private MesWmSalesNoticeService salesNoticeService;
@@ -122,6 +129,29 @@
return success(productSalesService.checkProductSalesQuantity(id));
}
+ @GetMapping("/shipments")
+ @Operation(summary = "鏌ヨ鍑哄簱鍗曞彂璐ц褰�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:query')")
+ public CommonResult<List<cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO>> getShipments(@RequestParam("id") Long id) {
+ return success(productSalesService.getShipments(id));
+ }
+
+ @PostMapping("/scan")
+ @Operation(summary = "鎵爜鎷ｈ揣")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock')")
+ public CommonResult<MesWmProductSalesScanRespVO> scanProductSales(
+ @Valid @RequestBody MesWmProductSalesScanReqVO reqVO) {
+ return success(productSalesService.scanProductSales(reqVO));
+ }
+
+ @GetMapping("/scan-preview")
+ @Operation(summary = "鏍稿鎵爜鎷ｈ揣瀵硅薄锛堜笉鍐欏叆鏄庣粏锛�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:stock')")
+ public CommonResult<MesWmProductSalesScanRespVO> previewScan(@RequestParam String code,
+ @RequestParam(required = false) String scanType, @RequestParam(required = false) Long salesId) {
+ return success(productSalesService.previewScan(code, scanType, salesId));
+ }
+
@PutMapping("/stock")
@Operation(summary = "鎵ц鎷ｈ揣")
@Parameter(name = "id", description = "缂栧彿", required = true)
@@ -157,6 +187,22 @@
return success(true);
}
+ @PutMapping("/close-remaining")
+ @Operation(summary = "鍏抽棴閮ㄥ垎鍙戣揣鍗曠殑鍓╀綑鏁伴噺")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:cancel')")
+ public CommonResult<Boolean> closeRemaining(@RequestParam("id") Long id, @RequestParam("reason") String reason) {
+ productSalesService.closeRemaining(id, reason);
+ return success(true);
+ }
+
+ @PutMapping("/cancel-shipment")
+ @Operation(summary = "鍙栨秷鏈鏈嚭搴撳彂璐у苟閲婃斁鍗犵敤")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:cancel')")
+ public CommonResult<Boolean> cancelShipment(@RequestParam("id") Long id) {
+ productSalesService.cancelShipment(id);
+ return success(true);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmProductSalesRespVO> buildRespVOList(List<MesWmProductSalesDO> list) {
@@ -168,13 +214,24 @@
convertSet(list, MesWmProductSalesDO::getClientId));
Map<Long, MesWmSalesNoticeDO> noticeMap = salesNoticeService.getSalesNoticeMap(
convertSet(list, MesWmProductSalesDO::getNoticeId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(list, MesWmProductSalesDO::getOutboundUserId));
+ var partiallyShippedIds = convertSet(shipmentMapper.selectCompletedBySalesIds(convertSet(list, MesWmProductSalesDO::getId)),
+ cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesShipmentDO::getSalesId);
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesRespVO.class, vo -> {
+ vo.setPartiallyShipped(partiallyShippedIds.contains(vo.getId()) && (Integer.valueOf(2).equals(vo.getStatus())
+ || Integer.valueOf(10).equals(vo.getStatus()) || Integer.valueOf(3).equals(vo.getStatus())));
MapUtils.findAndThen(customerMap, vo.getClientId(), customer ->
vo.setClientName(customer.getName()));
+ if (vo.getClientName() == null) {
+ MapUtils.findAndThen(customerMap, vo.getClientId(), customer -> vo.setClientName(customer.getName()));
+ }
MapUtils.findAndThen(noticeMap, vo.getNoticeId(),
notice -> vo.setNoticeCode(notice.getCode()));
+ MapUtils.findAndThen(userMap, vo.getOutboundUserId(),
+ user -> vo.setOutboundUserName(user.getNickname()));
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3