From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 85b6577..1e89857 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -106,10 +106,11 @@
public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
List<Long> ids = (List<Long>) param.get("ids");
String orderType = Objects.nonNull(param.get("orderType"))?param.get("orderType").toString():"";
+ String materialProp = Objects.nonNull(param.get("materialProp"))?param.get("materialProp").toString():"";
if(!OrderType.validateValue(orderType)){
throw new ErrorException("鎵归噺鎶ユ澶辫触,闈炴硶鐨勯攢鍞鍗曞垎绫绘灇涓�");
}
- return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType));
+ return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType,materialProp));
}
/**
--
Gitblit v1.9.3