From b99b4b3d1c3ce067175e088b682be740f5b4b6ed Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 18 八月 2025 11:19:04 +0800
Subject: [PATCH] 入库提示语言修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 143 insertions(+), 16 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 53f6dca..7e304ce 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,18 +5,18 @@
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.pp.ReportingWorkMapper;
+import com.example.erp.mapper.pp.*;
import com.example.erp.mapper.sd.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -42,6 +42,7 @@
private final BasicDataMapper basicDataMapper;
private final ProductDetailMapper productDetailMapper;
private final OrderDetailMapper orderDetailMapper;
+ private final DamageDetailsMapper damageDetailsMapper;
FlowCardMapper flowCardMapper;
private ReportingWorkMapper reportingWorkMapper;
@@ -72,7 +73,7 @@
.eq("glass_sort",dto1.getTechnologyNumber())
);
dto1.setGlassName(productDetail.getDetail());
-
+ //basicData.getNickname().equals("stepC")
}else if(basicData.getNickname().equals("stepC")){
OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
.selectOne(new QueryWrapper<OrderGlassDetail>()
@@ -122,7 +123,7 @@
ProductionSchedulingMapper productionSchedulingMapper, FlowCardMapper flowCardMapper,
OrderGlassDetailMapper orderGlassDetailMapper, BasicDataMapper basicDataMapper,
ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper,
- ReportingWorkMapper reportingWorkMapper) {
+ ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
@@ -132,6 +133,7 @@
this.productDetailMapper = productDetailMapper;
this.orderDetailMapper = orderDetailMapper;
this.reportingWorkMapper = reportingWorkMapper;
+ this.damageDetailsMapper = damageDetailsMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -154,13 +156,15 @@
.eq("basic_name",uniqueList.get(i).get("process"))
.last("limit 1")
);
- //鍒ゆ柇纾ㄨ竟鍜岀（杈瑰悗宸ュ簭
+ //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
- clos.put(uniqueList.get(i).get("process"), 15+i);
+ clos.put(uniqueList.get(i).get("process"), 16+i);
}
//鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add(15+i);
+ columns.add(16+i);
}
}
@@ -178,12 +182,54 @@
rowCount.add(getRow);
});
});
- if(!clos.isEmpty()){
+
//寰幆缁撴灉
- for (int i=0;i<dataList.size();i++ ) {
- Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
- new TypeReference<Map<String, String>>() {
- });
+ for (int i=0;i<dataList.size();i++ ) {
+ Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
+ new TypeReference<Map<String, String>>() {
+ });
+ Map<String, String> dataShow = JSON.parseObject(dataList.get(i).get("reportWorkQuantityShow"),
+ new TypeReference<Map<String, String>>() {
+ });
+ //鍒ゆ柇鍚庡伐搴忔娴佺▼鍗″彿鏄惁鏈夋鐮�
+ List<DamageDetails> hasBreak = damageDetailsMapper
+ .selectList(new LambdaQueryWrapper<DamageDetails>()
+ .eq(DamageDetails::getProcessId, dataList.get(i).get("processId"))
+ .eq(DamageDetails::getOrderNumber, dataList.get(i).get("order_number"))
+ .eq(DamageDetails::getTechnologyNumber, dataList.get(i).get("technology_number"))
+ .eq(DamageDetails::getPatchStatus, 0)
+ .gt(DamageDetails::getBreakageQuantity,0)
+
+ );
+ if(!hasBreak.isEmpty()){
+ int finalI = i;
+ data.forEach((thisProcess, index)->{
+ String behindProcess = orderProcessDetailMapper.getBehindProcess(
+ dataList.get(finalI).get("processId"),
+ String.valueOf(dataList.get(finalI).get("order_number")),
+ String.valueOf(dataList.get(finalI).get("technology_number")),
+ thisProcess,
+ orderId
+ );
+ if(behindProcess!=null &&!behindProcess.isEmpty()){
+ Integer behindDamageSum = damageDetailsMapper.getBehindDamageSum(
+ dataList.get(finalI).get("processId"),
+ String.valueOf(dataList.get(finalI).get("order_number")),
+ String.valueOf(dataList.get(finalI).get("technology_number")),
+ behindProcess
+ );
+ if(behindDamageSum>0){
+ data.put(thisProcess, String.valueOf(Integer.parseInt(data.get(thisProcess) )- behindDamageSum));
+ dataShow.put(thisProcess, String.valueOf(Integer.parseInt(dataShow.get(thisProcess) )- behindDamageSum));
+ }
+
+ }
+ });
+
+ }
+
+ if(!clos.isEmpty()){
+
Integer max = orderGlassDetailMapper
.getMaxTechnologyNumberByGroup(dataList.get(i).get("order_id"),
String.valueOf(dataList.get(i).get("order_number")),
@@ -194,6 +240,7 @@
String.valueOf(dataList.get(i).get("order_number")),
String.valueOf(dataList.get(i).get("group"))
);
+
for (String key : clos.keySet()) {
if(data.get(key) != null){
@@ -211,10 +258,12 @@
}
}
- dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));
-
}
+ dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));
+ dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
+
}
+
@@ -775,6 +824,84 @@
Map<String, Object> map = new HashMap<>();
//鑾峰彇琛ㄦ牸鍐呭鏁版嵁
List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);
+
+ map.put("title", uniqueList);
return null;
}
+
+ public Map<String, Object> processCardProgressReportSv(String orderId, List<Integer> columns) {
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ map.put("data", reportMapper.processCardProgressReportMp(orderId));
+
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String, String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
+ List<Map<String, String>> processList = processFilterList;
+
+ List<String> filterList = new ArrayList<>();
+ //寰幆閬嶅巻鏁扮粍锛屽垽鏂搴忓彿褰撳墠鐨勫伐搴�
+ for (int i = 1; i < processFilterList.size(); i++) {
+ filterList.add(processFilterList.get(i).get("process"));
+ List<Map<String, String>> lastProcessList =
+ orderProcessDetailMapper.filterLastProcess(
+ orderId,
+ String.valueOf(processFilterList.get(i).get("order_number")),
+ String.valueOf(processFilterList.get(i).get("technology_number")),
+ String.valueOf(processFilterList.get(i).get("id"))
+ );
+ if (!lastProcessList.isEmpty()) {
+ int finalI = i;
+ lastProcessList.forEach(lastProcess -> {
+ if (filterList.contains(lastProcess.get("process"))) {
+ processList.add(lastProcess);
+ }
+ });
+ }
+
+ }
+ // 浣跨敤HashSet鏉ヨ褰曞凡缁忛亣鍒扮殑value鍊�
+ Set<String> seenValues = new HashSet<>();
+ // 鍒涘缓涓�涓柊鐨凩ist鏉ュ瓨鍌ㄧ粨鏋�
+ List<Map<String, String>> uniqueList = new ArrayList<>();
+
+ // 鍙嶅悜閬嶅巻鍘熷List
+ for (int i = processList.size() - 1; i >= 0; i--) {
+ Map<String, String> maps = processList.get(i);
+ String value = maps.values().iterator().next(); // 鍋囪姣忎釜Map鍙湁涓�涓獀alue
+
+ // 濡傛灉value杩樻病鏈夎鐪嬪埌杩囷紝灏辨坊鍔犲埌缁撴灉List鍜孒ashSet涓�
+ if (!seenValues.contains(value)) {
+ uniqueList.add(0, maps); // 娣诲姞鍒扮粨鏋淟ist鐨勫紑澶达紝浠ヤ繚鎸佸師椤哄簭
+ seenValues.add(value);
+ }
+ }
+ map.put("title", uniqueList);
+
+
+ List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ List<Map<String, Integer>> rowCount = new ArrayList<>();
+ columns.forEach(col -> {
+ getRowCount.forEach(row -> {
+ Map<String, Integer> getRow = new HashMap<>();
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ 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", (Integer) row.get("rowCount"));
+ getRow.put("colspan", 0);
+ rowCount.add(getRow);
+ });
+ });
+
+
+ map.put("mergeCells", rowCount);
+
+ return map;
+ }
}
--
Gitblit v1.8.0