修改4.0 9.25

zss

2023-09-25 44a9b4729e058e75dfba2892803038ee91963d77

 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java

@@ -2,6 +2,7 @@

import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.dto.UpdateInspectionItemDto;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.InspectionItemService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
@@ -11,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,6 +33,9 @@
    @Autowired
    private InspectionItemService inspectionItemService;

    @Resource
    DeviceService deviceService;


    @Autowired
    private Jwt jwt;
@@ -46,15 +51,10 @@
        return Result.success(inspectionItemDto);
    }

    @ApiOperation(value = "新增检验单-->选择设备")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "technologyId", value = "关联的工艺路线id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "father", value = "项目父名称", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "name", value = "项目名称", dataTypeClass = String.class, required = true)
    })
    @ApiOperation(value = "新增检验单-->选择检验设备")
    @GetMapping("/chooseDev")
    public Result<?> chooseDev(Integer technologyId, String father, String name) {
        return Result.success(inspectionItemService.chooseDev(technologyId, father, name));
    public Result<?> chooseDev() {
        return Result.success(deviceService.chooseDevice());
    }

    @ApiOperation(value = "检验项目的检验值-->失去焦点发起该请求")