diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java index 43a348cc..fd7f88c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java @@ -88,11 +88,6 @@ public interface IWarehouseStorageOrderService int updateStorageMake(WarehouseStorageOrder warehouseStorageOrder); - /** - * 修改保存暂收-采购单(采购入库) - */ - int temporaryPurchaseWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder); - int updateWarehouseStorageOrderByQualityOrder(QualityOrder qualityOrder, List qualityOrderDetailList); int updateWarehouseStorageOrderByOutQualityOrder(QualityOrder qualityOrder, List qualityOrderDetailList); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index bbac7e17..746727cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -205,41 +205,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS return warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); } - /** - * 修改保存暂收-采购单(采购入库) - * - * @param warehouseStorageOrder 仓库入库单 - * @return 结果 - */ - @Transactional - @Override - public int temporaryPurchaseWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder) { - String loginName = ShiroUtils.getLoginName(); - warehouseStorageOrder.setUpdateBy(loginName); - warehouseStorageOrder.setUpdateTime(DateUtils.getNowDate()); - warehouseStorageOrder.setWarehouseStorageStatus("1"); - warehouseStorageOrder.setWarehouseEmployee(loginName); - //设置暂存时间 - warehouseStorageOrder.setTemporaryTime(DateUtils.getNowDate()); - updateWarehouseStorageOrderDetails(warehouseStorageOrder); - - int updateResult = warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); - if (updateResult <= 0) { - throw new BusinessException("更新入库单主记录失败"); - } - - try { - qualityOrderService.insertQualityOrderByWarehouseStorageOrder(warehouseStorageOrder, warehouseStorageOrder.getWarehouseStorageOrderDetailList()); - } catch (Exception e) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - log.error("生成品质单时发生错误", e); - throw new BusinessException("生成品质单时发生错误"); - } - - return updateResult; - } - - /** * 采购订单,采购入库单品质完成后,数据生成到入库单中,后续进行入库操作