From 6c92891658eab65ceff775536c0aea33f1b4003f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 十二月 2025 09:22:02 +0800
Subject: [PATCH] 解决物料修改单片面积不对

---
 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 4877ddd..701a4e0 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
@@ -65,7 +65,7 @@
             log.setContent(object.toString());
 
             DecimalFormat decimalFormat = new DecimalFormat("#0.00");
-            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
+            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 1000000));
             Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
             if(jsonCount==0){
                 if(Long.parseLong(id)>0){
@@ -106,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";
         //璁剧疆鍥炴粴鐐�

--
Gitblit v1.8.0