diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java index 86c7cf7..b5d0ee2 100644 --- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java +++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java @@ -127,7 +127,10 @@ public class adjustDetailController extends BaseController { @ResponseBody public AjaxResult addSave(AdjustDetail adjustDetail) { - //查询货主 + if(adjustDetail.getAdjustCode() == null){ + throw new SecurityException("调整主单编码不能为空,请先选中主单再新增明细!"); + } + //查询主单及加入仓库和货主 AdjustHeader adjustHeader = new AdjustHeader(); adjustHeader.setCode(adjustDetail.getAdjustCode()); LambdaQueryWrapper<AdjustHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(adjustHeader); 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 7a1e006..9c579ae 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 @@ -5,11 +5,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.huaheng.common.utils.StringUtils; import com.huaheng.common.utils.security.ShiroUtils; import com.huaheng.framework.web.domain.AjaxResult; +import com.huaheng.pc.check.checkDetail.domain.CheckDetail; +import com.huaheng.pc.check.checkDetail.service.CheckDetailService; import com.huaheng.pc.config.container.service.ContainerService; import com.huaheng.pc.config.location.domain.Location; import com.huaheng.pc.config.location.service.LocationService; +import com.huaheng.pc.config.material.domain.Material; +import com.huaheng.pc.config.material.service.MaterialService; import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader; import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService; +import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService; import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService; import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; @@ -36,8 +41,13 @@ import java.util.WeakHashMap; public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, AdjustDetail> implements AdjustDetailService { + + @Resource + private CycleCountDetailService cycleCountDetailService; + @Resource + private MaterialService materialService; @Resource - private AdjustHeaderService adjustHeaderService; + private CheckDetailService checkDetailService; @Resource private InventoryHeaderService inventoryHeaderService; @Resource @@ -62,11 +72,40 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj @Transactional @Override public AjaxResult addDetails(AdjustDetail adjustDetail) { + //数据直接插入表里 + + //检查盘点单 + if(adjustDetail.getAdjustCode() != null ){ + CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(adjustDetail.getCheckDetailId()); + if(cycleCountDetail == null || cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){ + return AjaxResult.error("盘点单错误,请核对盘点单据!"); + } + } + //检查库存 + if(adjustDetail.getInventoryDetailId() != null){ + InventoryDetail inventoryDetail = inventoryDetailService.getById(adjustDetail.getInventoryDetailId()); + if(inventoryDetail == null){ + return AjaxResult.error("没有该条库存明细"); + } + } + //检查质检单 + if(adjustDetail.getCheckCode() != null){ + CheckDetail checkDetail = checkDetailService.getById(adjustDetail.getCheckDetailId()); + if(checkDetail == null || checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){ + return AjaxResult.error("质检单错误,请核对质检单据!"); + } + } + //检查物料 + adjustDetail.setCreated(new Date()); + adjustDetail.setCreatedBy(ShiroUtils.getLoginName()); + adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName()); + adjustDetail.setLastUpdated(new Date()); + this.saveOrUpdate(adjustDetail); return AjaxResult.success("新增调整明细成功!"); }