From ac225bd66eb7c21b5af1d8533dc59376ea53da6c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:42 +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/ReplenishService.java | 127 +++++++++++++++++++++++++++++++++++++----
1 files changed, 113 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index f850874..602db86 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -4,8 +4,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.erp.common.AsyncQueryExecutor;
import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
+import com.example.erp.dto.pp.exportReplenishDTO;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
@@ -20,9 +23,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
@Service
@@ -43,6 +49,10 @@
final LogService logService;
+ //澶氱嚎绋嬫睜
+ @Resource
+ private AsyncQueryExecutor asyncExecutor;
+
public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper,FlowCardMapper flowCardMapper,LogService logService) {
this.patchMapper = patchMapper;
this.sysErrorService = sysErrorService;
@@ -58,28 +68,83 @@
}
- public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
- Integer offset = (pageNum-1)*pageSize;
+// public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
+// Integer offset = (pageNum-1)*pageSize;
+// String endDate = LocalDate.now().toString();
+// String startDate = LocalDate.now().minusDays(15).toString();
+// if(selectDate !=null && selectDate.size()==2){
+// if(!selectDate.get(0).isEmpty()){
+// startDate = selectDate.get(0);
+// }
+// if(!selectDate.get(1).isEmpty()){
+// endDate = selectDate.get(1);
+// }
+// }
+// Map<String,Object> map = new HashMap<>();
+// map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
+// map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));
+//
+// List<String> list = new ArrayList<>();
+// list.add(startDate);
+// list.add(endDate);
+// map.put("selectDate",list);
+// return map;
+// }
+
+ public Map<String, Object> SelectReplenish(
+ Integer pageNum, Integer pageSize,
+ List<String> selectDate, PatchLogDTO patchLogDTO) {
+
+ Integer offset = (pageNum - 1) * pageSize;
+
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘�15澶�
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
- if(selectDate !=null && selectDate.size()==2){
- if(!selectDate.get(0).isEmpty()){
+
+ // 鐢ㄦ埛鑷畾涔夋椂闂存
+ if (selectDate != null && selectDate.size() == 2) {
+ if (!selectDate.get(0).isEmpty()) {
startDate = selectDate.get(0);
}
- if(!selectDate.get(1).isEmpty()){
+ if (!selectDate.get(1).isEmpty()) {
endDate = selectDate.get(1);
}
}
- Map<String,Object> map = new HashMap<>();
- map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
- map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));
- List<String> list = new ArrayList<>();
- list.add(startDate);
- list.add(endDate);
- map.put("selectDate",list);
- return map;
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ // 浣跨敤绾跨▼姹犲苟琛屾墽琛屼袱涓猄QL
+ String finalStartDate = startDate;
+ String finalEndDate = endDate;
+ CompletableFuture<List<PatchLogDTO>> dataFuture =
+ asyncExecutor.runAsync(() ->
+ patchMapper.SelectReplenish(offset, pageSize, finalStartDate, finalEndDate, patchLogDTO));
+
+ CompletableFuture<Map<String, Integer>> totalFuture =
+ asyncExecutor.runAsync(() ->
+ patchMapper.SelectReplenishPageTotal(offset, pageSize, finalStartDate, finalEndDate, patchLogDTO));
+
+ // 绛夊緟涓や釜浠诲姟閮藉畬鎴�
+ CompletableFuture.allOf(dataFuture, totalFuture).join();
+
+ result.put("data", dataFuture.get());
+ result.put("total", totalFuture.get());
+
+ // 杩斿洖鏃堕棿娈�
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ result.put("selectDate", list);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("骞惰鏌ヨ琛ョ墖璁板綍寮傚父锛�" + e.getMessage(), e);
+ }
+
+ return result;
}
+
public Boolean saveReplenish(Map<String,Object> object) {
boolean saveState = true;
@@ -225,7 +290,15 @@
}
else{//灏忕墖鏍囩
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+ List<Map<String,Object>> customDataSemi =flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber());
+ for (Map<String, Object> dataMap : customDataSemi) {
+ dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
+ flowCard.getProcessId(),
+ dataMap.get("technologyNumber").toString(),
+ flowCard.getOrderNumber()
+ ));
+ }
+ itemmap.put("data", customDataSemi);
list.add(itemmap);
}
@@ -269,6 +342,13 @@
reportingWorkMapper.updateRWDPatchNum(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum());
//鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
reportingWorkMapper.updateReplenishWorkProcess(patchLog1.getProcessId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchProcesses());
+
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteReplenishSv琛ョ墖鍒犻櫎");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
}
else{
saveState = false;
@@ -346,5 +426,24 @@
return saveState;
}
+
+// public List exportReplenishSv(Map<String, Object> dates) {
+// }
+ public List<exportReplenishDTO> exportReplenishSv(List<LocalDate> dates) {
+ return patchMapper.exportReplenishMp(dates);
+ }
+
+ public Boolean updatePrintNumSv(List<Map<String, Object>> list) {
+ if (!list.isEmpty()){
+ for (Map<String, Object> item : list) {
+ Integer id = (Integer) item.get("id");
+ patchMapper.updatePrintNumMp(id);
+ }
+ return true;
+ }else {
+ return false;
+ }
+
+ }
}
--
Gitblit v1.8.0