Merge remote-tracking branch 'origin/main'

2025-12-08 15:28:32 +08:00
parent 12a3e92039 4b2e90d556
commit 05d2c7bbbc
35 changed files with 1678 additions and 1395 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
@@ -28,6 +28,7 @@ public interface IToErpService {
    String login();

    AjaxResult callErp(ReceiveOutStockConfirm receiveOutStockConfirm);
+
    AjaxResult receiveOutStockList();