From 71f90ed3a2eeea97b20cd095cc34a1f64dac5c81 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 十一月 2025 11:21:39 +0800
Subject: [PATCH] 提交 计算方式进度
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index d1ea006..481379d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.common.AsyncQueryExecutor;
+import com.example.erp.entity.sd.*;
import com.example.erp.tools.AreaComputed.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +13,6 @@
import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
-import com.example.erp.entity.sd.BasicData;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
-import com.example.erp.entity.sd.ProductDetail;
import com.example.erp.mapper.pp.*;
import com.example.erp.mapper.sd.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +50,7 @@
FlowCardMapper flowCardMapper;
private ReportingWorkMapper reportingWorkMapper;
+ private final OrderMapper orderMapper;
@Resource
private AsyncQueryExecutor asyncExecutor;
@@ -82,7 +80,10 @@
.eq("prod_id", orderDetail.getProductId())
.eq("glass_sort",dto1.getTechnologyNumber())
);
- dto1.setGlassName(productDetail.getDetail());
+ if(productDetail!=null){
+ dto1.setGlassName(productDetail.getDetail());
+ }
+
//basicData.getNickname().equals("stepC")
}else if(basicData.getNickname().equals("stepC")){
OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
@@ -133,7 +134,7 @@
ProductionSchedulingMapper productionSchedulingMapper, FlowCardMapper flowCardMapper,
OrderGlassDetailMapper orderGlassDetailMapper, BasicDataMapper basicDataMapper,
ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper,
- ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper) {
+ ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper, OrderMapper orderMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
@@ -144,6 +145,7 @@
this.orderDetailMapper = orderDetailMapper;
this.reportingWorkMapper = reportingWorkMapper;
this.damageDetailsMapper = damageDetailsMapper;
+ this.orderMapper = orderMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -300,8 +302,6 @@
dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
}
-
-
map.put("data",dataList );
@@ -972,14 +972,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
@@ -1243,14 +1243,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
@@ -1442,11 +1442,10 @@
dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
}
-
+ Order order = orderMapper.selectOrderId(orderId);
map.put("mergeCells", rowCount);
-
map.put("data",dataList);
-
+ map.put("order",order);
return map;
}
--
Gitblit v1.8.0