Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

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

@@ -23,7 +23,7 @@
 * @author 江苏鵷雏网络科技有限公司
 * @since 2023-08-01
 */
@Api(tags = "QMS管理-->成品检验")
@Api(tags = "QMS管理-->成品过程检验项目")
@RestController
@RequestMapping("/inspection-item")
public class InspectionItemController {
@@ -31,20 +31,33 @@
    @Autowired
    private InspectionItemService inspectionItemService;


    @Autowired
    private Jwt jwt;

    @ApiOperation(value = "新增按钮-->2、查询所有检验项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "finishInspectId",value = "成品检验单Id",dataTypeClass  = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "检验单Id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/list_user")
    public Result<?> selectInspectionItem(Integer finishInspectId){
        List<InspectionItemDto> inspectionItemDto = inspectionItemService.selectInspectionItem(finishInspectId);
    public Result<?> selectInspectionItem(Integer id, Integer type) {
        List<InspectionItemDto> inspectionItemDto = inspectionItemService.selectInspectionItem(id,type);
        return Result.success(inspectionItemDto);
    }

    @ApiOperation(value = "新增按钮-->2、检验项目-->失去焦点发起该请求")
    @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)
    })
    @GetMapping("/chooseDev")
    public Result<?> chooseDev(Integer technologyId, String father, String name) {
        return Result.success(inspectionItemService.chooseDev(technologyId,father,name));
    }

    @ApiOperation(value = "新增按钮-->2、检验项目的检验值-->失去焦点发起该请求")
    @PostMapping("/lose_focus_update")
    public Result<?> addInspectionItem(@RequestHeader("token")String token, @RequestBody UpdateInspectionItemDto updateInspectionItemDto) throws Exception {
        Map<String, String> usernameMessage = jwt.readJWT(token);
@@ -57,10 +70,4 @@
        return Result.success(map);
    }

    @ApiOperation(value = "新增按钮-->2、检验项目-->试验设备下拉框")
    @GetMapping("/list_device")
    public Result<?> selectDeviceIdAndName(){
        List<Map<String, Object>> maps = inspectionItemService.selectDeviceIdAndName();
        return Result.success(maps);
    }
}