Merge remote-tracking branch 'origin/master'

zss

2023-09-11 9a16d4675b22d0845158d0f07424f4bda2e39475

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java

@@ -93,7 +93,7 @@
        }).collect(Collectors.toList());
        //检验项目批量添加
        rawInsProductService.saveBatch(rawInsProductList);
        return "新增检验单成功!";
        return rawInspect.getId().toString();
    }


@@ -105,7 +105,7 @@

    //根据检验单id查询原材料检验单详情
    @Override
    public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
    public Map<String, Object> selectRawInspectsListById(Integer id) {
        return rawInspectMapper.selectRawInspectsListById(id);
    }

@@ -145,34 +145,6 @@
            inspectUnacceptedMapper.insert(rawUnaccepted);
        }
        return "上报成功!";
    }

    //根据原材料检验单id删除
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delRawInsById(Integer id) {
        /*删除原材料检验单*/
        RawInspect rawInspect = new RawInspect();
        rawInspect.setId(id);
        rawInspect.setState(0);
        rawInspectMapper.updateById(rawInspect);
        /*删除原材料检验项目表*/
        rawInsProductMapper.updaRawInsById(id);
        /*删除原材料不合格单*/
        inspectUnacceptedMapper.updaRawIns(id);
    }

    //批量删除
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delAllRawIns(String ids) {
        /*批量删除原材料检验单*/
        rawInspectMapper.delAllRawIns(ids);
        /*批量删除原材料检验项目表*/
        rawInsProductMapper.delAllRawIns(ids);
        /*批量删除原材料不合格单*/
        inspectUnacceptedMapper.delAllRawIns(ids);

    }