From e12ea6624be62fd27216f8173c214e9c7d8898aa Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sun, 22 Dec 2024 14:18:27 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=80=9A=E7=94=A8=E6=8F=90=E9=86=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=E9=83=BD=E5=8A=A0=E4=B8=8A=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E6=8F=90=E9=86=92=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=94=A8=E6=9D=A5=E7=9B=91=E6=8E=A7=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E5=BA=93=E5=AD=98=E6=98=AF=E5=90=A6=E4=BD=8E=E4=BA=8E?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PurchaseOrderServiceImpl.java | 10 ++++++---- .../service/impl/SysMakeorderPickServiceImpl.java | 7 +++++++ .../impl/SysSalesShippingInformServiceImpl.java | 6 ++++++ .../service/impl/WarehouseOutOrderServiceImpl.java | 4 ++++ .../service/impl/WarehouseStorageOrderServiceImpl.java | 10 ++++++++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index 6a2164af..df8b9041 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -40,10 +40,7 @@ import com.ruoyi.system.domain.SysSalesOrderChild; import com.ruoyi.system.domain.SysSupplier; import com.ruoyi.system.mapper.SysCompanyInformationMapper; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.service.ISysAttachFileService; -import com.ruoyi.system.service.ISysAttachService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysSupplierService; +import com.ruoyi.system.service.*; import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry; import com.ruoyi.warehouse.domain.WarehouseStorageOrder; import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail; @@ -164,6 +161,9 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService @Autowired private IFinancialAccountsPayableService payableService; + @Autowired + private ISysRemindService remindService; + /** * 查询采购订单 @@ -486,6 +486,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService if (updateInventoryInquiry <= 0){ throw new BusinessException("更新库存查询记录失败"); } + remindService.warehouseSafetyStockRemind(warehouseInventoryInquiry); } @@ -778,6 +779,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService if (result <= 0){ throw new BusinessException("更新库存查询记录失败"); } + remindService.warehouseSafetyStockRemind(warehouseInventoryInquiry); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java index 7213447b..da30edff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java @@ -20,6 +20,7 @@ import com.ruoyi.system.mapper.SysMakeorderPickMapper; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysMakeorderPickDetailService; import com.ruoyi.system.service.ISysMakeorderPickService; +import com.ruoyi.system.service.ISysRemindService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry; import com.ruoyi.warehouse.service.IWarehouseInventoryInquiryService; @@ -74,6 +75,9 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService @Autowired private IWarehouseInventoryInquiryService inventoryInquiryService; + @Autowired + private ISysRemindService remindService; + /** * 查询生产领料单 * @@ -281,6 +285,8 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService throw new BusinessException("更新库存信息失败"); } + remindService.warehouseSafetyStockRemind(inventoryInquiry); + int insertMakeorderPickDetailResult = makeorderPickDetailService.insertSysMakeorderPickDetail(pickDetail); if (insertMakeorderPickDetailResult <= 0){ throw new BusinessException("新增生产领料单详情失败"); @@ -501,6 +507,7 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService throw new BusinessException("更新库存信息失败"); } + remindService.warehouseSafetyStockRemind(inventoryInquiry); int updateMakeorderPickDetailResult = makeorderPickDetailService.updateSysMakeorderPickDetail(pickDetail); if (updateMakeorderPickDetailResult <= 0){ throw new BusinessException("更新生产领料单详情失败"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index 90c58b86..acba8d31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -34,6 +34,7 @@ import com.ruoyi.system.dto.ExportShippingInvoiceDto; import com.ruoyi.system.dto.ExportShippingOrderDto; import com.ruoyi.system.dto.ExportShippingPackingDto; import com.ruoyi.system.mapper.*; +import com.ruoyi.system.service.ISysRemindService; import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry; import com.ruoyi.warehouse.domain.WarehouseOutOrder; import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper; @@ -90,6 +91,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor @Autowired private WarehouseInventoryInquiryMapper inventoryInquiryMapper; + @Autowired + private ISysRemindService remindService; + /** * 查询销售出货通知 * @@ -320,6 +324,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor throw new BusinessException("更新库存查询记录失败"); } + remindService.warehouseSafetyStockRemind(inventoryInquiry); sysSalesShippingInformDetail.setOutOrderCode(outOrderCode); sysSalesShippingInformDetail.setMaterialNo(sysSalesOrderChild.getMaterialCode()); sysSalesShippingInformDetail.setMaterialName(sysSalesOrderChild.getMaterialName()); @@ -466,6 +471,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor if (inventoryUpdateResult<=0){ throw new BusinessException("更新库存查询记录失败"); } + remindService.warehouseSafetyStockRemind(inventoryInquiry); AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice(); afterSalesShippingDevice.setMaterialNo(materialNo); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index 4699d450..5d2f890c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -27,6 +27,7 @@ import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.Vo.BaseEmpRequisiteOrderVO; import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO; import com.ruoyi.system.mapper.*; +import com.ruoyi.system.service.ISysRemindService; import com.ruoyi.warehouse.domain.*; import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryDetailMapper; import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper; @@ -112,6 +113,8 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService @Autowired private AfterSalesShippingDeviceMapper shippingDeviceMapper; + @Autowired + private ISysRemindService sysRemindService; /** * 查询仓库出库单 @@ -584,6 +587,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); int inquiryUpdateResult = inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); + sysRemindService.warehouseSafetyStockRemind(inventoryInquiry); return inquiryUpdateResult; } 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 651f386f..a386c2b5 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 @@ -29,6 +29,7 @@ import com.ruoyi.quality.service.IQualityOrderService; import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysMakeOrderService; +import com.ruoyi.system.service.ISysRemindService; import com.ruoyi.system.service.ISysSalesOrderService; import com.ruoyi.warehouse.domain.*; import com.ruoyi.warehouse.mapper.*; @@ -131,6 +132,9 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS @Autowired private SysMakeorderPickMapper makeorderPickMapper; + @Autowired + private ISysRemindService remindService; + /** * 查询仓库入库单 * @@ -773,6 +777,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS throw new BusinessException("更新库存查询记录失败！"); } + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); inquiryDetail.setMaterialNo(materialNo); inquiryDetail.setInquiryWarehouseType("0");//采购入库 @@ -821,6 +827,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS throw new BusinessException("更新库存查询记录失败！"); } + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); inquiryDetail.setMaterialNo(materialNo); inquiryDetail.setInquiryWarehouseType("0");//采购入库 @@ -1861,6 +1869,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS inquiry.setUpdateBy(ShiroUtils.getLoginName()); inquiry.setUpdateTime(DateUtils.getNowDate()); + remindService.warehouseSafetyStockRemind(inquiry); + return warehouseInventoryInquiryMapper.updateWarehouseInventoryInquiry(inquiry); } }