wms / wms_shanghaijiaoda · Commits

Commit 7cb14935dd23d28bb11f3a846003a9422414f95c

Authored by xqs
1 parent 621d4a0f

新增调整明细物料校验

Inline Side-by-side
Showing 1 changed file with 13 additions and 5 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
  View file @7cb1493
@@ -77,7 +77,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj @@ -77,7 +77,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
77 //检查盘点单 77 //检查盘点单
78 if(adjustDetail.getAdjustCode() != null ){ 78 if(adjustDetail.getAdjustCode() != null ){
79 CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(adjustDetail.getCheckDetailId()); 79 CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(adjustDetail.getCheckDetailId());
80 - if(cycleCountDetail == null || cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){ 80 + if(cycleCountDetail == null || !cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){
81 return AjaxResult.error("盘点单错误，请核对盘点单据！"); 81 return AjaxResult.error("盘点单错误，请核对盘点单据！");
82 } 82 }
83 } 83 }
@@ -91,15 +91,23 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj @@ -91,15 +91,23 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
91 //检查质检单 91 //检查质检单
92 if(adjustDetail.getCheckCode() != null){ 92 if(adjustDetail.getCheckCode() != null){
93 CheckDetail checkDetail = checkDetailService.getById(adjustDetail.getCheckDetailId()); 93 CheckDetail checkDetail = checkDetailService.getById(adjustDetail.getCheckDetailId());
94 - if(checkDetail == null || checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){ 94 + if(checkDetail == null || !checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){
95 return AjaxResult.error("质检单错误，请核对质检单据！"); 95 return AjaxResult.error("质检单错误，请核对质检单据！");
96 96
97 } 97 }
98 } 98 }
99 //检查物料 99 //检查物料
100 -  
101 -  
102 - 100 + Material material = materialService.findAllByCode(adjustDetail.getMaterialCode());
  101 + if(material != null){
  102 + if(!adjustDetail.getMaterialName().equals(material.getName()) ||
  103 + !adjustDetail.getMaterialSpec().equals(material.getSpec()) ||
  104 + !adjustDetail.getMaterialUnit().equals(material.getUnit())
  105 + ){
  106 + return AjaxResult.error("物料数据有误，请检查物料名称，规格，单位！");
  107 + }
  108 + }else{
  109 + return AjaxResult.error("物料编码错误！");
  110 + }
103 adjustDetail.setCreated(new Date()); 111 adjustDetail.setCreated(new Date());
104 adjustDetail.setCreatedBy(ShiroUtils.getLoginName()); 112 adjustDetail.setCreatedBy(ShiroUtils.getLoginName());
105 adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName()); 113 adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName());