From 69e1073d459f31033d141ab3433d4fbf7b4a9106 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:39 +0800
Subject: [PATCH] 入库报表添加时间查询

---
 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
index 31d79e7..4c6cde1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
@@ -60,6 +60,8 @@
             }
 
             Log log = new Log();
+            log.setOperatorId(object.get("userId").toString());
+            log.setOperator(object.get("userName").toString());
             log.setContent(object.toString());
 
             DecimalFormat decimalFormat = new DecimalFormat("#0.00");
@@ -104,6 +106,23 @@
         return map;
     }
 
+    public Map<String, Object> getSelectProductBOM(Integer pageNum, Integer pageSize, MaterialStore materialStore) {
+        Integer offset = (pageNum - 1) * pageSize;
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", materialStoreMapper.getSelectProductBOM(offset, pageSize, materialStore));
+        map.put("total", materialStoreMapper.getSelectMaterialStorePageTotal(offset, pageSize, materialStore));
+        return map;
+    }
+
+    public Map<String, Object> getSelectMaterialStores(MaterialStore materialStore) {
+
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", materialStoreMapper.getSelectMaterialStores(materialStore));
+        return map;
+    }
+
     public String deleteMaterialStore(Map<String,Object> object) {
         String saveState = "true";
         //璁剧疆鍥炴粴鐐�
@@ -123,6 +142,8 @@
 
             }
             Log log = new Log();
+            log.setOperatorId(object.get("userId").toString());
+            log.setOperator(object.get("userName").toString());
             log.setContent(object.toString());
             log.setFunction("deleteMaterialStore鍒犻櫎锛�"+id);
             logService.saveLog(log);

--
Gitblit v1.8.0