修改2.0 9.24

zss

2023-09-24 68f6642d4d1fff10c6bd898d69dd7bff27adbc16

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

@@ -43,14 +43,15 @@

    @ApiOperation(value = "不合格品管理列表", tags = "QMS管理-->不合格品管理")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "formTime",value = "来料日期",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "dealState",value = "处理状态(为空=全部)",dataTypeClass  = Integer.class)
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "formTime", value = "来料日期", dataTypeClass = String.class),
            @ApiImplicitParam(name = "dealState", value = "处理状态(为空=全部)", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "productCategories", value = "产品大类", dataTypeClass = Integer.class),
    })
    @GetMapping("/selectUnRawInspectsList")
    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories) {
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime, dealState, productCategories);
        Map<String, Object> map = new HashMap<>();
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
@@ -59,20 +60,20 @@

    @ApiOperation(value = "查询原材料不合格品检验单列表", tags = "QMS管理-->原材料不合格品")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "formTime",value = "来料日期",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productName",value = "产品名称",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "supplier",value = "供应商",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "processingStatus",value = "处理状态",dataTypeClass  = Integer.class)
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "formTime", value = "来料日期", dataTypeClass = String.class),
            @ApiImplicitParam(name = "productName", value = "产品名称", dataTypeClass = String.class),
            @ApiImplicitParam(name = "supplier", value = "供应商", dataTypeClass = String.class),
            @ApiImplicitParam(name = "processingStatus", value = "处理状态", dataTypeClass = Integer.class)
    })
    @GetMapping("/selectURawMaterials")
    public Result<?> selectUnqualifiedRawMaterials(int pageSize,
                                             int countSize,
                                             String formTime,
                                             String productName,
                                             String supplier,
                                             Integer processingStatus){
                                                   int countSize,
                                                   String formTime,
                                                   String productName,
                                                   String supplier,
                                                   Integer processingStatus) {
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
                new Page<Object>(pageSize, countSize),
                formTime,
@@ -87,11 +88,14 @@

    @ApiOperation(value = "评审", tags = "QMS管理-->原材料不合格品")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawId",value = "原材料Id",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "passOrNo",value = "是否通过：0：不通过；1：通过",dataTypeClass  = Integer.class,required = true)
            @ApiImplicitParam(name = "rawId", value = "原材料Id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "passOrNo", value = "是否通过：0：不通过；1：通过", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/evaluatePassOrNo")
    public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){
    public Result<?> rawEvaluate(Integer rawId, Integer passOrNo) {
        if (inspectUnacceptedService.getById(rawId).getDealState() == 1) {
            return Result.fail("已经评审过了不能再次评审!");
        }
        Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
        if (integer >= 1) {
            return Result.success("评审成功！");
@@ -101,12 +105,12 @@

    @ApiOperation(value = "不合格品分页列表", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "specificationModel",value = "规格型号",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productName",value = "产品名称",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productCategories",value = "产品大类",dataTypeClass  = Integer.class),
            @ApiImplicitParam(name = "state",value = "状态",dataTypeClass  = Integer.class)
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "specificationModel", value = "规格型号", dataTypeClass = String.class),
            @ApiImplicitParam(name = "productName", value = "产品名称", dataTypeClass = String.class),
            @ApiImplicitParam(name = "productCategories", value = "产品大类", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "state", value = "状态", dataTypeClass = Integer.class)
    })
    @GetMapping("/selectDisposal")
    public Result<?> selectDisposal(int pageSize,
@@ -114,7 +118,7 @@
                                    String specificationModel,
                                    String productName,
                                    Integer productCategories,
                                    Integer state){
                                    Integer state) {
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
                new Page<Object>(pageSize, countSize),
                specificationModel,
@@ -139,7 +143,7 @@

    @ApiOperation(value = "查看编辑意见", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId",value = "不合格品处置Id",dataTypeClass  = Integer.class,required = true)
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/viewEditorial")
    public Result<?> viewEditorialComments(Integer rawUnacceptedId) {
@@ -148,8 +152,8 @@

    @ApiOperation(value = "失焦更新现像描述", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId",value = "不合格品处置Id",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "tell",value = "现象描述",dataTypeClass  = Integer.class,required = true)
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "tell", value = "现象描述", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/descriptionUpdate")
    public Result<?> descriptionUpdate(Integer rawUnacceptedId, String tell) {
@@ -162,7 +166,7 @@

    @ApiOperation(value = "点击编辑意见触发查询", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId",value = "不合格品处置Id",dataTypeClass  = Integer.class,required = true)
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/clickEditing")
    public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {