From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 205 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 acb75f4..4f9901c 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
@@ -3,17 +3,26 @@
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.FlowCardMapper;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
import com.example.erp.mapper.pp.ReportMapper;
-import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.mapper.pp.ReportingWorkMapper;
+import com.example.erp.mapper.sd.*;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.sql.Date;
import java.time.LocalDate;
import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
@Service
@DS("pp")
@@ -23,11 +32,101 @@
private final OrderProcessDetailMapper orderProcessDetailMapper;
private final ProductionSchedulingMapper productionSchedulingMapper;
+ private final OrderGlassDetailMapper orderGlassDetailMapper;
+ private final BasicDataMapper basicDataMapper;
+ private final ProductDetailMapper productDetailMapper;
+ private final OrderDetailMapper orderDetailMapper;
- public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper, ProductionSchedulingMapper productionSchedulingMapper) {
+ FlowCardMapper flowCardMapper;
+ private ReportingWorkMapper reportingWorkMapper;
+
+
+ //涓婂伐搴忔姤宸ョ彮缁�
+ private void mergeTeamsGroupsName( List<WorkInProgressDTO> dataList1,List<WorkInProgressDTO> dataList2) {
+
+ for (WorkInProgressDTO dto1 : dataList1) {
+ //鏍规嵁褰撳墠宸ュ簭鑾峰彇 鏄惁涓哄崟鐗囥�佸す鑳躲�佹垨鑰呭叏閮�
+ BasicData basicData = basicDataMapper.
+ selectOne(new QueryWrapper<BasicData>()
+ .eq("basic_name", dto1.getThisProcess())
+ .last("limit 1")
+ );
+
+ OrderDetail orderDetail = orderDetailMapper
+ .selectOne(
+ new QueryWrapper<OrderDetail>()
+ .eq("order_id", dto1.getOrderId())
+ .eq("order_number", dto1.getOrderNumber())
+ );
+
+ //濡傛灉涓哄崟鐗囷紝鍒欐牴鎹骇鍝佸悕绉板拰宸ヨ壓缂栧彿鑾峰彇鐜荤拑鍚嶇О
+ if(basicData.getNickname()==null || basicData.getNickname().isEmpty()){
+ ProductDetail productDetail = productDetailMapper.
+ selectOne(new QueryWrapper<ProductDetail>()
+ .eq("prod_id", orderDetail.getProductId())
+ .eq("glass_sort",dto1.getTechnologyNumber())
+ );
+ dto1.setGlassName(productDetail.getDetail());
+
+ }else if(basicData.getNickname().equals("stepC")){
+ OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
+ .selectOne(new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", dto1.getOrderId())
+ .eq("order_number", dto1.getOrderNumber())
+ .eq("technology_number",dto1.getTechnologyNumber())
+ );
+
+ String glassName = productDetailMapper.getGlassNameByGroup(
+ orderDetail.getProductId(),
+ orderGlassDetailMapper.getMinTechnologyNumberByGroup(dto1.getOrderId(),dto1.getOrderNumber(), String.valueOf(orderGlassDetailGroup.getGroup())),
+ orderGlassDetailMapper.getMaxTechnologyNumberByGroup(dto1.getOrderId(),dto1.getOrderNumber(), String.valueOf(orderGlassDetailGroup.getGroup()))
+ );
+ dto1.setGlassName(glassName);
+
+ }else{
+ dto1.setGlassName(dto1.getProductName());
+ }
+
+ }
+
+ Function<WorkInProgressDTO, String> keyFn = dto ->
+ dto.getProcessId() + "|" +
+ dto.getOrderNumber() + "|" +
+ dto.getTechnologyNumber();
+
+ Map<String, WorkInProgressDTO> map2 = dataList2.stream()
+ .collect(Collectors.toMap(
+ keyFn,
+ Function.identity(),
+ (existing, replacement) -> existing
+ ));
+
+ for (WorkInProgressDTO dto1 : dataList1) {
+ WorkInProgressDTO dto2 = map2.get(keyFn.apply(dto1));
+ if (dto2 != null) {
+ String tgn = dto2.getTeamsGroupsName();
+ if (StringUtils.hasText(tgn)) {
+ dto1.setTeamsGroupsName(tgn);
+ }
+ }
+ }
+ }
+
+
+ public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper,
+ ProductionSchedulingMapper productionSchedulingMapper, FlowCardMapper flowCardMapper,
+ OrderGlassDetailMapper orderGlassDetailMapper, BasicDataMapper basicDataMapper,
+ ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper,
+ ReportingWorkMapper reportingWorkMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
+ this.flowCardMapper = flowCardMapper;
+ this.orderGlassDetailMapper = orderGlassDetailMapper;
+ this.basicDataMapper = basicDataMapper;
+ this.productDetailMapper = productDetailMapper;
+ this.orderDetailMapper = orderDetailMapper;
+ this.reportingWorkMapper = reportingWorkMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -86,7 +185,12 @@
getRowCount.forEach(row -> {
Map<String, Integer> getRow = new HashMap<>();
// { row: 0, col: 1, rowspan: 3, colspan: 0},
- getRow.put("row", row.get("RowNum"));
+ Object rowNumObj = row.get("RowNum");
+ if (rowNumObj instanceof Double) {
+ getRow.put("row", ((Double) rowNumObj).intValue());
+ } else if (rowNumObj instanceof Integer) {
+ getRow.put("row", (Integer) rowNumObj);
+ }
getRow.put("col", col);
getRow.put("rowspan", row.get("rowCount"));
getRow.put("colspan", 0);
@@ -133,23 +237,40 @@
if ("null".equals(optionVal)) {
optionVal = ("");
}
-
+ if (selectProcesses.equals("鍏ㄩ儴")){
+ selectProcesses="";
+ }
Map<String, Object> map = new HashMap<>();
+ List<WorkInProgressDTO> dataList2 =reportMapper.workInProgressMpdataList2(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
if (optionVal.equals("1")){
+ System.out.println(1);
/* 鏍规嵁閿�鍞崟鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressOrderMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
- map.put("total", reportMapper.workInProgressOrderTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
-
+ //map.put("data", reportMapper.workInProgressOrderMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressOrderMpList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
+ mergeTeamsGroupsName(dataList1, dataList2);
+ map.put("data",dataList1);
+ // map.put("total", reportMapper.workInProgressOrderTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ map.put("total" ,reportMapper.workInProgressOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));
}else if(optionVal.equals("2")){
- /* 鏍规祦绋嬪崱鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressProcessMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
- map.put("total", reportMapper.workInProgressProcessTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ System.out.println(2);
+ /* 鏍规嵁娴佺▼鍗″彿姹囨��*/
+ //map.put("data", reportMapper.workInProgressProcessMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressProcessMpList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
+ mergeTeamsGroupsName(dataList1, dataList2);
+ map.put("data",dataList1);
+ // map.put("total", reportMapper.workInProgressProcessTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ map.put("total" ,reportMapper.workInProgressOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));
+
} else if (optionVal.equals("3")) {
} else {
//娌℃湁閫夋嫨鍒嗙粍
- map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
- map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ //map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
+ mergeTeamsGroupsName(dataList1, dataList2);
+ map.put("data",dataList1);
+ //map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
+ map.put("total" ,reportMapper.workInProgressOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));
}
map.put("process", productionSchedulingMapper.selectProcess());
@@ -166,20 +287,24 @@
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.processToBeCompletedMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
map.put("process", productionSchedulingMapper.selectProcess());
+ map.put("footSum" ,reportMapper.processToBeCompletedFootSum(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+
return map;
}
- public Map<String, Object> selectDamageReportSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO) {
+ public Map<String, Object> selectDamageReportSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO) {
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.selectDamageReportMp(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
map.put("total", reportMapper.getDamageReportPageTotal(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
+ map.put("footSum" ,reportMapper.damageReportFootSum(selectTime1, selectTime2, damageReportDTO));
return map;
}
public Map<String, Object> splittingDetailsOutsideSv(String orderId, Report report) {
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.splittingDetailsOutsideMp(orderId, report));
+ map.put("orderOtherMoney", flowCardMapper.selectorderOtherMoney());
return map;
}
@@ -340,6 +465,12 @@
return map;
}
+ public Map<String, Object> orderReportingWorks(Date selectTime1, Date selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.orderReportingWorks(selectTime1, selectTime2, report));
+ return map;
+ }
+
public Map<String, Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.rawMaterialRequisitionMp(selectTime1, selectTime2, report));
@@ -351,6 +482,9 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
+ if (dates != null && dates.size() > 1) {
+ dates.set(1, dates.get(1).plusDays(1)); // 灏嗙浜屼釜鏃ユ湡鍔犱竴澶�
+ }
return reportMapper.exportDamageReportMp(dates);
}
@@ -374,6 +508,9 @@
public List exportWorkInProgressSv(Map<String, Object> dates) {
String process= (String) dates.get("processes");
+ if (process.equals("鍏ㄩ儴")){
+ process="";
+ }
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
if ("null".equals(inputVal)) {
@@ -382,7 +519,11 @@
if ("null".equals(project)) {
project = "";
}
- return reportMapper.exportWorkInProgressMp(process,inputVal,project);
+ List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project);
+ List<WorkInProgressDTO> dataList2 =reportMapper.exportWorkInProgressMpdataList2(process);
+
+ mergeTeamsGroupsName(dataList1, dataList2);
+ return dataList1;
}
public List exportTaskCompletionStatusSv(Map<String, Object> dates) {
@@ -403,15 +544,17 @@
return reportMapper.exportYieldMp(date,process);
}
- public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
+ public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
if (selectProcesses.equals("鍏ㄩ儴")){
selectProcesses="";
}
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ String laminating = reportMapper.getLaminating(selectProcesses);
+ map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
map.put("process", productionSchedulingMapper.selectProcess());
- map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
+ map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
return map;
}
@@ -436,6 +579,49 @@
if (process.equals("鍏ㄩ儴")){
process="";
}
- return reportMapper.exportTeamOutputMp(date,process);
+ String laminating = reportMapper.getLaminating(process);
+ return reportMapper.exportTeamOutputMp(date,process,laminating);
+ }
+
+ public Map<String, Object> workInProgressCombinationSv(Integer pageNum, Integer pageSize,String orderId, String inputProject, String selectProcesses, String optionVal, WorkInProgressDTO workInProgressDTO) {
+ Integer offset = (pageNum - 1) * pageSize;
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(inputProject)) {
+ inputProject = "";
+ }
+ if ("null".equals(optionVal)) {
+ optionVal = ("");
+ }
+ if (selectProcesses.equals("鍏ㄩ儴")){
+ selectProcesses="";
+ }
+ String laminating = "";
+ Map<String, Object> map = new HashMap<>();
+ // 鑾峰彇鎵�鏈夊伐搴�
+ List<String> processList = reportMapper.selectProcess();
+ // 閬嶅巻姣忎釜宸ュ簭骞惰皟鐢ㄦ柊鏂规硶
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ if (selectProcesses!=""){
+ laminating = reportingWorkMapper.getProcessLaminating(selectProcesses);
+ List<Map<String, Object>> singleResult = reportMapper.getWorkInProgressCombination(selectProcesses,laminating,optionVal);
+
+ resultList.addAll(singleResult);
+ }else {
+ for (String process : processList) {
+ //鑾峰彇鎶ュ伐宸ュ簭鏄惁涓哄鍚堝伐绋�
+ laminating = reportingWorkMapper.getProcessLaminating(process);
+ List<Map<String, Object>> singleResult = reportMapper.getWorkInProgressCombination(process,laminating,optionVal);
+
+ if (singleResult != null && !singleResult.isEmpty()) {
+ resultList.addAll(singleResult);
+ }
+ }
+ }
+
+ map.put("data",resultList);
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
}
}
--
Gitblit v1.8.0