111

k94314517

2023-08-18 82c525da4e13329733ecbd9bca30124f0eb91081

111

 server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java

@@ -92,9 +92,9 @@
    }

    @ApiOperation("列表查询")
    @PostMapping("/querytList")
    @PostMapping("/queryList")
    @RequiresPermissions("business:salaryparam:query")
    public ApiResponse<List<SalaryParam>> querytList(@RequestBody SalaryParam salaryParam) {
    public ApiResponse<List<SalaryParam>> queryList(@RequestBody SalaryParam salaryParam) {
        List<SalaryParam> data = salaryParamService.findList(salaryParam);
        return ApiResponse.success(data);
    }

 server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java

@@ -407,8 +407,8 @@
                    tModle.setUrgent(w.getUrgent());
                    tModle.setUpdateTime(w.getUpdateTime());
                    tModle.setRemark(w.getRemark());
                    tModle.setQualifiedNum(0);
                    tModle.setUnqualifiedNum(0);
                    tModle.setQualifiedNum(w.getQualifiedNum());
                    tModle.setUnqualifiedNum(w.getUnqualifiedNum());
                    tModle.setProUserId(w.getProUserId());
                    tModle.setProUserName(w.getProUserName());
                    tModle.setProUserName(w.getProUserName());
@@ -450,13 +450,17 @@
                                    //产出日期
                                    tModle.setProduceDate(r.getCreateTime());
                                }
                                if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
//                                if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
                                    //如果是合格产出
                                    tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
                                }else{
//                                    tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
//                                }else{
                                    //如果是不良品
                                    tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
                                }
//                                    tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
//                                }
                                //如果是合格产出
                                tModle.setQualifiedNum(tModle.getQualifiedNum());
                                //如果是不良品
                                tModle.setUnqualifiedNum(tModle.getUnqualifiedNum());
                            }
                        }
                    }