From 4c5312200f56a73204f65899bf42812575648ba1 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 29 十月 2025 16:47:37 +0800
Subject: [PATCH] 提交 app接口
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 5 ++++-
north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java | 3 +++
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 6 +++++-
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 5 ++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
index dd4f7ac..f23e5b7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -38,9 +38,8 @@
}
@ApiOperation("鍘熺墖搴撳瓨鎶ヨ〃")
- @PostMapping("/getStockList")
- public Result getStockList() {
-
+ @PostMapping("/getOriginalGlassList")
+ public Result getOriginalGlassList() {
return Result.success(materialInventoryService.appGetStockList());
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java
index 9da6dba..0b93fde 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java
@@ -1,6 +1,7 @@
package com.example.erp.entity.mm;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
@@ -32,6 +33,8 @@
private Integer deadStock;
private String remarks;
private LocalDate createTime;
+ @TableField(select = false,exist = false)
+ private String json;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 7e57242..e266082 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -29,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -1326,13 +1327,15 @@
availableQuantity += materialInventory.getAvailableQuantity();
totalArea += materialInventory.getTotalArea();
}
+ DecimalFormat df = new DecimalFormat("#.00");
totalSum.put("inventoryQuantity",inventoryQuantity);
totalSum.put("availableQuantity",availableQuantity);
- totalSum.put("totalArea",totalArea);
+ totalSum.put("totalArea", df.format(totalArea));
Map<String, Object> map = new HashMap<>();
map.put("glassStock", materialInventoryList);
+ map.put("totalSum", totalSum);
return map;
}
}
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index a02f149..8fff2e2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1388,8 +1388,12 @@
</update>
<select id="selectGetStockList">
- select * from mm.material_inventory
+ select mi.*, ms.json
+ from mm.material_inventory mi
+ left join mm.material_store ms
+ on mi.material_code=ms.id
where inventory_quantity>0
+ order by mi.id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0