From c1fc00d00df3fc637cb38da33ad1ca3f233b6aee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 14:46:18 +0800
Subject: [PATCH] 次破报表求和查询添加审核状态条件
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 8ee9cbd..0384f8b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -113,8 +113,8 @@
if (!flowCardlist.isEmpty()){
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍏ュ簱");
- for (FlowCard flowCard : flowCardlist) {
-
+ for (FlowCard flowCards : flowCardlist) {
+ FlowCard flowCard = finishedGoodsInventoryMapper.getSelectWarehousingByProcessId(flowCards.getOrder().getOrderId(),flowCards.getOrderNumber(),flowCards.getProcessId());
Integer calculateType=flowCard.getOrder().getCalculateType();
double deliveryDetailMoney = 0.0;
double deliveryDetailArea = 0.0;
@@ -863,7 +863,18 @@
for(Map<String, Object> details:detailList){
Map<String, Object> detailsmap = new HashMap<>();
detailsmap.put("product_name",details.get("product_name").toString());
- detailsmap.put("detailList",finishedOperateLogMapper.getDetailLists(finishedOperateLog.getOrderId(),finishedOperateLog.getRemarks(), Integer.valueOf(details.get("product_id").toString())));
+ List<Map<String, Object>> orderDetailList = finishedOperateLogMapper
+ .getDetailLists(
+ finishedOperateLog.getOrderId(),
+ finishedOperateLog.getRemarks(),
+ Integer.valueOf(details.get("product_id").toString()),
+ details.get("thickness").toString()
+ );
+ /*for (Map<String, Object>orderDetail:orderDetailList){
+
+ }*/
+
+ detailsmap.put("detailList",orderDetailList);
detailsmaplist.add(detailsmap);
}
--
Gitblit v1.8.0