From 152cd504b3c6dff0cf6f98ea2111c455264d92de Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 19 十月 2026 13:10:34 +0800
Subject: [PATCH] fix(mes): 补充工序流转编码规则，修复生成编码报规则不存在
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
index 973218b..715afe0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
@@ -40,6 +40,10 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 鍑鸿揣妫�楠屽崟锛圤QC锛�")
@RestController
@@ -153,4 +157,39 @@
});
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesQcOqcImportExcelVO> list = Collections.singletonList(
+ MesQcOqcImportExcelVO.builder()
+ .clientName("绀轰緥瀹㈡埛").itemCode("M-001").name("鍑鸿揣妫�楠屽崟")
+ .outQuantity(new java.math.BigDecimal("100"))
+ .checkQuantity(new java.math.BigDecimal("100"))
+ .qualifiedQuantity(new java.math.BigDecimal("98"))
+ .unqualifiedQuantity(new java.math.BigDecimal("2"))
+ .checkResult(1).outDate(java.time.LocalDateTime.of(2026, 12, 31, 8, 0))
+ .inspectDate(java.time.LocalDateTime.of(2026, 12, 31, 9, 0))
+ .inspectorUserId(1L).remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠屽崟鍒楄〃", MesQcOqcImportExcelVO.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:qc-oqc:import')")
+ public CommonResult<MesQcOqcImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesQcOqcImportExcelVO> list = ExcelUtils.read(file, MesQcOqcImportExcelVO.class);
+ return success(oqcService.importOqcList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3