| | |
|---|
| | | //上报(更新检验状态) |
|---|
| | | @Override |
|---|
| | | @Transactional(rollbackFor = Exception.class) |
|---|
| | | public String updateFinishInspectsById(String username, Integer id) { |
|---|
| | | public String updateFinishInspectsById(String username, Integer id,Integer number) { |
|---|
| | | /*更新检验单里面的检验结论*/ |
|---|
| | | //先判断检验结果 |
|---|
| | | List<Integer> results = inspectionItemMapper.getResult(id, 2); |
|---|
| | |
|---|
| | | } else return "项目未检验完!"; |
|---|
| | | /*如果检验结论为不合格,则需要新增不合格检验单*/ |
|---|
| | | if (finishedInspect.getResult() == 0) { |
|---|
| | | //查询该检验单哪些检验项目不合格 |
|---|
| | | List<InspectionItem> inspectionItemList = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query() |
|---|
| | | .eq("inspect_id", id) |
|---|
| | | .eq("result", 0) |
|---|
| | | .eq("type", 2)); |
|---|
| | | String msg = ""; |
|---|
| | | for (InspectionItem inspectionItem : inspectionItemList) { |
|---|
| | | msg =msg+ inspectionItem.getName()+"-"; |
|---|
| | | } |
|---|
| | | InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder() |
|---|
| | | .reason(finishedInspect.getMaterial() + "不合格") //暂且定义为产品名称不合格 |
|---|
| | | .reason(msg + "不合格") //暂且定义为项目+不合格 |
|---|
| | | .number(number) |
|---|
| | | .rawInspectId(id) |
|---|
| | | .type(1) //类型为成品检验 |
|---|
| | | .build(); |
|---|
