From 47e20d0de95d0831d665ce6abef6f6911e894558 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 09:15:36 +0800
Subject: [PATCH] 原材料修改
---
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index 14212a6..a3dea74 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -130,5 +130,18 @@
}
+ @ApiOperation(value = "鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "mcode", value = "浜у搧缂栧彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂扮増鏈�)", dataTypeClass = Integer.class,required = true ),
+ })
+ @GetMapping("/lookProByVer")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result lookProByVer(String name, String mcode, String specifications,Integer version) {
+ return Result.success(inspectionService.lookProByVer(name, mcode, specifications,version,null));
+ }
+
}
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 88e512e..7ca8063 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -11,7 +11,7 @@
<if test="materialName != null and materialName != ''">
AND r.`material_name` LIKE CONCAT('%',#{materialName},'%')
</if>
- <if test="type != null and type != ''">
+ <if test="type != null">
AND r.`type` = #{type}
</if>
<if test="createTime != null and createTime != ''">
--
Gitblit v1.9.3