wms / wms_wuhangelinmei · Commits

Commit a5949362444b5816433a10368ad013dcb3613023

Authored by xqs
1 parent 17a8597c
develop ... future/yangjie moreWarehouse

调整新增明细逻辑

Inline Side-by-side
Showing 2 changed files with 44 additions and 2 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
  View file @a594936
... ... @@ -127,7 +127,10 @@ public class adjustDetailController extends BaseController {
127 127 @ResponseBody
128 128 public AjaxResult addSave(AdjustDetail adjustDetail)
129 129 {
130   - //查询货主
  130 + if(adjustDetail.getAdjustCode() == null){
  131 + throw new SecurityException("调整主单编码不能为空，请先选中主单再新增明细！");
  132 + }
  133 + //查询主单及加入仓库和货主
131 134 AdjustHeader adjustHeader = new AdjustHeader();
132 135 adjustHeader.setCode(adjustDetail.getAdjustCode());
133 136 LambdaQueryWrapper<AdjustHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(adjustHeader);
... ...
src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
  View file @a594936
... ... @@ -5,11 +5,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.huaheng.common.utils.StringUtils;
6 6 import com.huaheng.common.utils.security.ShiroUtils;
7 7 import com.huaheng.framework.web.domain.AjaxResult;
  8 +import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
  9 +import com.huaheng.pc.check.checkDetail.service.CheckDetailService;
8 10 import com.huaheng.pc.config.container.service.ContainerService;
9 11 import com.huaheng.pc.config.location.domain.Location;
10 12 import com.huaheng.pc.config.location.service.LocationService;
  13 +import com.huaheng.pc.config.material.domain.Material;
  14 +import com.huaheng.pc.config.material.service.MaterialService;
11 15 import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
12 16 import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
  17 +import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
13 18 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
14 19 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
15 20 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
... ... @@ -36,8 +41,13 @@ import java.util.WeakHashMap;
36 41 public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, AdjustDetail> implements AdjustDetailService {
37 42  
38 43  
  44 +
  45 + @Resource
  46 + private CycleCountDetailService cycleCountDetailService;
  47 + @Resource
  48 + private MaterialService materialService;
39 49 @Resource
40   - private AdjustHeaderService adjustHeaderService;
  50 + private CheckDetailService checkDetailService;
41 51 @Resource
42 52 private InventoryHeaderService inventoryHeaderService;
43 53 @Resource
... ... @@ -62,11 +72,40 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
62 72 @Transactional
63 73 @Override
64 74 public AjaxResult addDetails(AdjustDetail adjustDetail) {
  75 + //数据直接插入表里
  76 +
  77 + //检查盘点单
  78 + if(adjustDetail.getAdjustCode() != null ){
  79 + CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(adjustDetail.getCheckDetailId());
  80 + if(cycleCountDetail == null || cycleCountDetail.getCycleCountHeadCode().equals(adjustDetail.getCycleCountCode())){
  81 + return AjaxResult.error("盘点单错误，请核对盘点单据！");
  82 + }
  83 + }
  84 + //检查库存
  85 + if(adjustDetail.getInventoryDetailId() != null){
  86 + InventoryDetail inventoryDetail = inventoryDetailService.getById(adjustDetail.getInventoryDetailId());
  87 + if(inventoryDetail == null){
  88 + return AjaxResult.error("没有该条库存明细");
  89 + }
  90 + }
  91 + //检查质检单
  92 + if(adjustDetail.getCheckCode() != null){
  93 + CheckDetail checkDetail = checkDetailService.getById(adjustDetail.getCheckDetailId());
  94 + if(checkDetail == null || checkDetail.getCheckCode().equals(adjustDetail.getCheckCode())){
  95 + return AjaxResult.error("质检单错误，请核对质检单据！");
65 96  
  97 + }
  98 + }
  99 + //检查物料
66 100  
67 101  
68 102  
  103 + adjustDetail.setCreated(new Date());
  104 + adjustDetail.setCreatedBy(ShiroUtils.getLoginName());
  105 + adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  106 + adjustDetail.setLastUpdated(new Date());
69 107  
  108 + this.saveOrUpdate(adjustDetail);
70 109  
71 110 return AjaxResult.success("新增调整明细成功！");
72 111 }
... ...