过程检数据查询+原有生产订单表增加产品规格id

zss

7 小时以前 deff787716b00b4f491de429ba092915d7fa1a9e

 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java

@@ -2,15 +2,22 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.ProcessPageDto;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -22,6 +29,7 @@
 * 原材料检验/过程检验/出厂检验
 */
@RestController
@Api(tags = "质量管理")
@RequestMapping("/quality/qualityInspect")
public class QualityInspectController {

@@ -33,16 +41,20 @@

    @Resource
    private IQualityInspectFileService qualityInspectFileService;
    @Autowired
    private ProcurementRecordService procurementRecordService;
    @Autowired
    private StockUtils stockUtils;


    /**
     * 新增
     * @param qualityInspect
     * @param qualityInspectDto
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.add(qualityInspect));
    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
    }

    /**
@@ -54,6 +66,13 @@
    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //如果已经提交就不允许删除
        List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
        for (QualityInspect qualityInspect : qualityInspects) {
            if(qualityInspect.getInspectState()==1){
               throw new RuntimeException("已提交的数据不允许删除");
            }
        }
        //删除检验参数
        qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
@@ -72,17 +91,17 @@
     */
    @GetMapping("/{id}")
    public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityInspectService.getById(id));
        return AjaxResult.success(qualityInspectService.getDetailById(id));
    }

    /**
     * 修改
     * @param qualityInspect
     * @param qualityInspectDto
     * @return
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspect));
    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
    }

    /**
@@ -106,5 +125,48 @@
        qualityInspectService.qualityInspectExport(response, qualityInspect);
    }

    /**
     * 提交
     * @param qualityInspect
     * @return
     */
    @PostMapping("/submit")
    public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.submit(qualityInspect));
    }

    /**
     * 下载
     * @param response
     * @param qualityInspect
     */
    @PostMapping("/down")
    public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
        qualityInspectService.down(response, qualityInspect);
    }

    /************************************************宁夏中盛建材的过程检和成品检*********************************************************************************/

    /**
     * 过程检分页查询
     * @param page
     * @param processPageDto
     * @return
     */
    @GetMapping("/processPage")
    @ApiOperation("过程检分页查询")
    public AjaxResult processPage(Page page, ProcessPageDto processPageDto) {
        return AjaxResult.success(qualityInspectService.processPage(page, processPageDto));
    }

    /**
     * 过程检详情
     * @param processPageDto
     * @return
     */
    @GetMapping("/processDetails")
    @ApiOperation("过程检详情")
    public AjaxResult processDetails(ProcessPageDto processPageDto) {
        return AjaxResult.success(qualityInspectService.processDetails(processPageDto));
    }
}