Commit 9f49bb2a70dff800e72cc4554b7baf28e1f48bfb

Authored by wangqian
1 parent 55bbc352

库存修改

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java
... ... @@ -101,6 +101,8 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic
101 101 inventory.setTypeDetailId(material.getTypeDetailId());
102 102 inventory.setTypeDetailName(material.getTypeDetailName());
103 103 inventory.setSpecifications(in.getSpecifications());
  104 + inventory.setBelongCompanyId(deptRespDTO.getId());
  105 + inventory.setBelongCompanyName(deptRespDTO.getName());
104 106 inventory.setUnitId(in.getUnitId());
105 107 inventory.setUnitName(in.getUnitName());
106 108 inventory.setCurrentNum(in.getInInventoryNum());
... ... @@ -129,8 +131,6 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic
129 131 updateObj.setMaterialTypeId(material.getMaterialTypeId());
130 132 updateObj.setMaterialTypeName(material.getMaterialTypeName());
131 133 updateObj.setSpecifications(material.getSpecifications());
132   - //updateObj.setBelongCompanyId(material.getBelongCompanyId());
133   - //updateObj.setBelongCompanyName(material.getBelongCompanyName());
134 134 updateObj.setUnitId(material.getUnitId());
135 135 updateObj.setUnitName(material.getUnitName());
136 136 materialInventoryInMapper.updateById(updateObj);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java
... ... @@ -53,7 +53,7 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ
53 53 if(null == material){
54 54 throw exception0(BAD_REQUEST.getCode(), "无效参数-materialId");
55 55 }
56   - MaterialInventoryDO materialInventory = materialInventoryService.selectMaterialInventoryByMaterialId(out.getTypeDetailId(),getCompanyId());
  56 + MaterialInventoryDO materialInventory = materialInventoryService.selectMaterialInventoryByMaterialId(material.getTypeDetailId(),getCompanyId());
57 57 if(null == materialInventory){
58 58 throw exception0(BAD_REQUEST.getCode(),createReqVO.getMaterialName()+"没有库存");
59 59 }
... ...