From 9643cb9adeb6193be30dd64184c214f7e44b9a78 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Dec 2024 15:23:52 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E4=B8=AD=E6=9F=A5=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E8=AF=A5=E7=89=A9=E6=96=99=E5=8F=B7=E5=88=99=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9F=A5=E6=89=BE=E5=88=B0=E5=88=99?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ErpMaterialServiceImpl.java | 59 +++++++++++++------ 1 file changed, 40 insertions(+), 19 deletions(-) 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("更新物料库存查询记录失败"); + } } + + }