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/InsOrderPlanController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 48acce4..8cbb1d9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -106,16 +106,15 @@
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode,Boolean registerInsResults) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,registerInsResults);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
- Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
- insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
+ insOrderPlanService.saveInsContext(saveInsContextDto);
return Result.success();
}
@@ -244,7 +243,8 @@
@GetMapping("/getBindingProductByProductId")
public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getBindingProductId, productId)));
+ .eq(InsProduct::getBindingProductId, productId)
+ .orderByAsc(InsProduct::getSort)));
}
--
Gitblit v1.9.3