From 29237e8dd94c4d3cdfb0eb48bca0de7dc68d768e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 11:27:55 +0800
Subject: [PATCH] feat(mes): 出货检验单客户改为选填，未关联客户的单据不受客户数据权限限制
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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..d4debfe 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,6 +10,8 @@
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.mes.controller.admin.wm.productsales.vo.MesWmProductSalesImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesImportRespVO;
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;
@@ -27,8 +29,10 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.*;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -105,6 +109,36 @@
buildRespVOList(pageResult.getList()));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱閿�鍞嚭搴撳崟瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MesWmProductSalesImportExcelVO> list = Arrays.asList(
+ // 鍚屼竴鍑哄簱鍗曞彿鐨勪袱琛� = 鍚屼竴寮犲嚭搴撳崟鐨勪袱鏉℃槑缁�
+ MesWmProductSalesImportExcelVO.builder()
+ .code("PS202610310001").clientName("绀轰緥瀹㈡埛").name("绀轰緥瀹㈡埛-2026-10-31 鍑哄簱")
+ .salesDate("2026-10-31").salesOrderCode("").contactName("寮犱笁")
+ .contactTelephone("13800138000").contactAddress("绀轰緥鏀惰揣鍦板潃")
+ .itemCode("ITEM001").batchCode("").quantity(new BigDecimal("10"))
+ .oqcCheckFlag("鍚�").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").build(),
+ MesWmProductSalesImportExcelVO.builder()
+ .code("PS202610310001").clientName("绀轰緥瀹㈡埛").name("绀轰緥瀹㈡埛-2026-10-31 鍑哄簱")
+ .salesDate("2026-10-31").salesOrderCode("").contactName("寮犱笁")
+ .contactTelephone("13800138000").contactAddress("绀轰緥鏀惰揣鍦板潃")
+ .itemCode("ITEM002").batchCode("").quantity(new BigDecimal("5"))
+ .oqcCheckFlag("鍚�").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").build());
+ ExcelUtils.write(response, "閿�鍞嚭搴撳崟瀵煎叆妯℃澘.xls", "閿�鍞嚭搴撳崟", MesWmProductSalesImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閿�鍞嚭搴撳崟", description = "瀵煎叆鍚庣敓鎴愯崏绋跨姸鎬佺殑鍑哄簱鍗曪紝涓嶆彁浜ゃ�佷笉鍗犵敤搴撳瓨")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:import')")
+ public CommonResult<MesWmProductSalesImportRespVO> importProductSalesExcel(
+ @RequestParam("file") MultipartFile file) throws Exception {
+ List<MesWmProductSalesImportExcelVO> list = ExcelUtils.read(file, MesWmProductSalesImportExcelVO.class);
+ return success(productSalesService.importProductSalesList(list));
+ }
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦閿�鍞嚭搴撳崟")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3