From d60b23554cb6f60c53df25d98cec4596421a59ab Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 18:02:02 +0800
Subject: [PATCH] 检验修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 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 aa08081..14212a6 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
@@ -1,13 +1,19 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
+import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
-import com.yuanchu.limslaboratory.service.RawMaterialService;
+import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,7 +23,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -36,6 +44,18 @@
@Autowired
private RawMaterialService rawMaterialService;
+
+ @Autowired
+ private StandardService standardService;
+
+ @Autowired
+ private MaterialService materialService;
+
+ @Resource
+ private ProductMapper productMapper;
+
+ @Resource
+ private InspectionService inspectionService;
@ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@@ -77,4 +97,38 @@
}
return Result.fail("鍒犻櫎澶辫触");
}
+
+
+ @ApiOperation("鑾峰彇鐗╂枡鍚嶇О")
+ @GetMapping("/getMaterielName")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> getMaterielName(){
+ LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Material::getId, Material::getName, Material::getCode);
+ List<Map<String, Object>> maps = materialService.listMaps(wrapper);
+ return Result.success(maps);
+ }
+
+ @ApiOperation("鑾峰彇瑙勬牸鍨嬪彿")
+ @GetMapping("/specification")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> getSpecificationIdAndName(String materialId) {
+ List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
+ return Result.success(specificationIdAndName);
+ }
+
+ @ApiOperation("閫夋嫨鐗堟湰")
+ @GetMapping("/chooseVer")
+ @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)
+ })
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> chooseVer(String name, String mcode, String specifications) {
+ return Result.success(inspectionService.chooseVer(name, mcode, specifications));
+ }
+
+
+
}
--
Gitblit v1.9.3