diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index ca6a0807..80a75fd7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -764,31 +764,52 @@ public class ErpMaterialServiceImpl implements IErpMaterialService * 审核通过添加物料库存查询记录 * */ @Override - @Transactional(rollbackFor = Exception.class) public void addInventoryInquiry(ErpMaterialVo erpMaterialVo) { String materialNo = erpMaterialVo.getMaterialNo(); ErpMaterialVo oldErpMaterialVo = erpMaterialMapper.selectErpMaterialByMaterialNo(materialNo); - - WarehouseInventoryInquiry warehouseInventoryInquiry = new WarehouseInventoryInquiry(); - warehouseInventoryInquiry.setMaterialNo(oldErpMaterialVo.getMaterialNo()); - warehouseInventoryInquiry.setMaterialName(oldErpMaterialVo.getMaterialName()); - warehouseInventoryInquiry.setMaterialDescribe(oldErpMaterialVo.getDescribe()); - warehouseInventoryInquiry.setMaterialBrand(oldErpMaterialVo.getBrand()); - warehouseInventoryInquiry.setMaterialProcessMethod(oldErpMaterialVo.getProcessMethod()); - warehouseInventoryInquiry.setMaterialModel(oldErpMaterialVo.getMaterialModel()); - warehouseInventoryInquiry.setMaterialUnit(oldErpMaterialVo.getUnit()); - warehouseInventoryInquiry.setMaterialPhotourl(oldErpMaterialVo.getPhotoUrl()); - warehouseInventoryInquiry.setMaterialType(oldErpMaterialVo.getMaterialType()); - warehouseInventoryInquiry.setMaterialUseStatus(erpMaterialVo.getUseStatus()); - warehouseInventoryInquiry.setWarehouseDept(oldErpMaterialVo.getWarehouseDept()); String loginName = ShiroUtils.getLoginName(); - warehouseInventoryInquiry.setCreateBy(loginName); - warehouseInventoryInquiry.setCreateTime(DateUtils.getNowDate()); - int insertResult = inventoryInquiryMapper.insertWarehouseInventoryInquiry(warehouseInventoryInquiry); - if (insertResult <= 0){ - throw new BusinessException("添加物料库存查询记录失败"); + + WarehouseInventoryInquiry tempWarehouseInventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + if (tempWarehouseInventoryInquiry == null){ + WarehouseInventoryInquiry warehouseInventoryInquiry = new WarehouseInventoryInquiry(); + warehouseInventoryInquiry.setMaterialNo(oldErpMaterialVo.getMaterialNo()); + warehouseInventoryInquiry.setMaterialName(oldErpMaterialVo.getMaterialName()); + warehouseInventoryInquiry.setMaterialDescribe(oldErpMaterialVo.getDescribe()); + warehouseInventoryInquiry.setMaterialBrand(oldErpMaterialVo.getBrand()); + warehouseInventoryInquiry.setMaterialProcessMethod(oldErpMaterialVo.getProcessMethod()); + warehouseInventoryInquiry.setMaterialModel(oldErpMaterialVo.getMaterialModel()); + warehouseInventoryInquiry.setMaterialUnit(oldErpMaterialVo.getUnit()); + warehouseInventoryInquiry.setMaterialPhotourl(oldErpMaterialVo.getPhotoUrl()); + warehouseInventoryInquiry.setMaterialType(oldErpMaterialVo.getMaterialType()); + warehouseInventoryInquiry.setMaterialUseStatus(erpMaterialVo.getUseStatus()); + warehouseInventoryInquiry.setWarehouseDept(oldErpMaterialVo.getWarehouseDept()); + + warehouseInventoryInquiry.setCreateBy(loginName); + warehouseInventoryInquiry.setCreateTime(DateUtils.getNowDate()); + int insertResult = inventoryInquiryMapper.insertWarehouseInventoryInquiry(warehouseInventoryInquiry); + if (insertResult <= 0){ + throw new BusinessException("添加物料库存查询记录失败"); + } + }else { + tempWarehouseInventoryInquiry.setMaterialName(oldErpMaterialVo.getMaterialName()); + tempWarehouseInventoryInquiry.setMaterialDescribe(oldErpMaterialVo.getDescribe()); + tempWarehouseInventoryInquiry.setMaterialBrand(oldErpMaterialVo.getBrand()); + tempWarehouseInventoryInquiry.setMaterialProcessMethod(oldErpMaterialVo.getProcessMethod()); + tempWarehouseInventoryInquiry.setMaterialModel(oldErpMaterialVo.getMaterialModel()); + tempWarehouseInventoryInquiry.setMaterialUnit(oldErpMaterialVo.getUnit()); + tempWarehouseInventoryInquiry.setMaterialPhotourl(oldErpMaterialVo.getPhotoUrl()); + tempWarehouseInventoryInquiry.setMaterialType(oldErpMaterialVo.getMaterialType()); + tempWarehouseInventoryInquiry.setWarehouseDept(oldErpMaterialVo.getWarehouseDept()); + tempWarehouseInventoryInquiry.setUpdateBy(loginName); + tempWarehouseInventoryInquiry.setUpdateTime(DateUtils.getNowDate()); + int updateResult = inventoryInquiryMapper.updateWarehouseInventoryInquiry(tempWarehouseInventoryInquiry); + if (updateResult <= 0){ + throw new BusinessException("更新物料库存查询记录失败"); + } } + + }