From b1b5cf4b00ddc12f624f299174a6366d2cdb2617 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:20:31 +0800
Subject: [PATCH] 提交相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 11 ++++++++++-
1 files changed, 10 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 9b10bb7..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,15 @@
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) {
--
Gitblit v1.8.0