diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java index 9c579ae..4e01d5d 100644 --- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java +++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java @@ -77,7 +77,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj //检查盘点单 if(adjustDetail.getAdjustCode() != null ){ CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(adjustDetail.getCheckDetailId()); - if(cycleCountDetail == null || cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){ + if(cycleCountDetail == null || !cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){ return AjaxResult.error("盘点单错误,请核对盘点单据!"); } } @@ -91,15 +91,23 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj //检查质检单 if(adjustDetail.getCheckCode() != null){ CheckDetail checkDetail = checkDetailService.getById(adjustDetail.getCheckDetailId()); - if(checkDetail == null || checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){ + if(checkDetail == null || !checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){ return AjaxResult.error("质检单错误,请核对质检单据!"); } } //检查物料 - - - + Material material = materialService.findAllByCode(adjustDetail.getMaterialCode()); + if(material != null){ + if(!adjustDetail.getMaterialName().equals(material.getName()) || + !adjustDetail.getMaterialSpec().equals(material.getSpec()) || + !adjustDetail.getMaterialUnit().equals(material.getUnit()) + ){ + return AjaxResult.error("物料数据有误,请检查物料名称,规格,单位!"); + } + }else{ + return AjaxResult.error("物料编码错误!"); + } adjustDetail.setCreated(new Date()); adjustDetail.setCreatedBy(ShiroUtils.getLoginName()); adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName());