From 704265308b1227dbada5a36b2027b588c062ded2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 09:14:37 +0800
Subject: [PATCH] feat(mes): 新增业务码支持并优化追溯查询功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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..016e3c3 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;
@@ -45,6 +49,8 @@
private MesWmProductSalesService productSalesService;
@Resource
private CrmCustomerApi crmCustomerApi;
+ @Resource
+ private AdminUserApi adminUserApi;
@Resource
private MesWmSalesNoticeService salesNoticeService;
@@ -122,6 +128,22 @@
return success(productSalesService.checkProductSalesQuantity(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)
@@ -168,13 +190,20 @@
convertSet(list, MesWmProductSalesDO::getClientId));
Map<Long, MesWmSalesNoticeDO> noticeMap = salesNoticeService.getSalesNoticeMap(
convertSet(list, MesWmProductSalesDO::getNoticeId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(list, MesWmProductSalesDO::getOutboundUserId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductSalesRespVO.class, vo -> {
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