From 0857cf1830039d60ce73005f386f284cf575e511 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 14:00:19 +0800
Subject: [PATCH] feat(mes): 新增ERP销售订单生产状态枚举及MES工艺路线优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
index b6233cd..f1fa44d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -29,6 +29,7 @@
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
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;
@@ -36,6 +37,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.math.BigDecimal;
@@ -133,6 +135,36 @@
ExcelUtils.write(response, "鐢熶骇宸ュ崟.xls", "鏁版嵁", MesProWorkOrderRespVO.class, voList);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐢熶骇宸ュ崟瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesProWorkOrderImportExcelVO> list = Collections.singletonList(
+ MesProWorkOrderImportExcelVO.builder()
+ .code("WO-001").name("绀轰緥鐢熶骇宸ュ崟").type(1).orderSourceType(1)
+ .orderSourceCode("").productCode("").quantity(new BigDecimal("100"))
+ .clientName("").saleOrderNo("").batchCode("")
+ .requestDate(java.time.LocalDateTime.of(2026, 10, 16, 9, 0, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鐢熶骇宸ュ崟瀵煎叆妯℃澘.xls", "鐢熶骇宸ュ崟鍒楄〃", MesProWorkOrderImportExcelVO.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:pro-work-order:import')")
+ public CommonResult<MesProWorkOrderImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesProWorkOrderImportExcelVO> list = ExcelUtils.read(file, MesProWorkOrderImportExcelVO.class);
+ return success(workOrderService.importWorkOrderList(list, updateSupport));
+ }
+
@PutMapping("/confirm")
@Operation(summary = "纭宸ュ崟")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3