From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
index 04e4ba3..01dfdb4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
@@ -8,21 +8,25 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+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.dal.dataobject.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -30,6 +34,7 @@
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.util.Collections;
@@ -55,7 +60,7 @@
@Resource
private MesProTaskService taskService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰嗘枡鍑哄簱鍗�")
@@ -84,7 +89,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<MesWmProductIssueRespVO> getProductIssue(@RequestParam("id") Long id) {
MesWmProductIssueDO issue = issueService.getProductIssue(id);
if (issue == null) {
@@ -95,7 +99,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<PageResult<MesWmProductIssueRespVO>> getProductIssuePage(
@Valid MesWmProductIssuePageReqVO pageReqVO) {
PageResult<MesWmProductIssueDO> pageResult = issueService.getProductIssuePage(pageReqVO);
@@ -153,9 +156,37 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙棰嗘枡鍑哄簱鍗曟暟閲�", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄鏂欐暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<Boolean> checkProductIssueQuantity(@RequestParam("id") Long id) {
return success(issueService.checkProductIssueQuantity(id));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐢熶骇棰嗘枡鍑哄簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmProductIssueImportExcelVO> list = Collections.singletonList(
+ MesWmProductIssueImportExcelVO.builder()
+ .code("LL001").name("绀轰緥鐢熶骇棰嗘枡鍑哄簱鍗�")
+ .issueType(1).issueDate(java.time.LocalDateTime.now())
+ .requiredTime(java.time.LocalDateTime.now().plusHours(2))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "鐢熶骇棰嗘枡鍑哄簱鍗曞鍏ユā鏉�.xls", "鐢熶骇棰嗘枡鍑哄簱鍗曞垪琛�", MesWmProductIssueImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆棰嗘枡鍑哄簱鍗�")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:import')")
+ public CommonResult<MesWmProductIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmProductIssueImportExcelVO> list = ExcelUtils.read(file, MesWmProductIssueImportExcelVO.class);
+ return success(issueService.importProductIssueList(list, updateSupport));
}
// ==================== 鎷兼帴 VO ====================
@@ -171,7 +202,7 @@
convertSet(list, MesWmProductIssueDO::getWorkOrderId));
Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
convertSet(list, MesWmProductIssueDO::getTaskId));
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(workOrderMap.values(), MesProWorkOrderDO::getClientId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductIssueRespVO.class, vo -> {
@@ -182,7 +213,7 @@
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> {
vo.setWorkOrderCode(workOrder.getCode());
MapUtils.findAndThen(clientMap, workOrder.getClientId(), client ->
- vo.setClientCode(client.getCode()).setClientName(client.getName()));
+ vo.setClientName(client.getName()));
});
});
}
--
Gitblit v1.9.3