From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 3a9b0c4..5ae8080 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -11,12 +11,12 @@
import com.example.erp.entity.userInfo.Log;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.FlowCardMapper;
+import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.LogService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
-import java.awt.*;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -48,8 +48,12 @@
private final OrderDetailMapper orderDetailMapper;
private final OrderMapper orderMapper;
+ private final ReportingWorkMapper reportingWorkMapper;
- public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper, OrderMapper orderMapper) {
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper,
+ OrderProcessDetailMapper orderProcessDetailMapper, LogService logService,
+ ProductMapper productMapper, ProductDetailMapper productDetailMapper,
+ OrderDetailMapper orderDetailMapper, OrderMapper orderMapper,ReportingWorkMapper reportingWorkMapper) {
this.flowCardMapper = flowCardMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
@@ -58,6 +62,7 @@
this.productDetailMapper = productDetailMapper;
this.orderDetailMapper = orderDetailMapper;
this.orderMapper = orderMapper;
+ this.reportingWorkMapper = reportingWorkMapper;
}
//娴佺▼鍗＄鐞嗘煡璇�
@@ -325,6 +330,7 @@
String processSub = flowCard.getProcess().split("->")[0];
//鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
String processName = flowCardMapper.getProcessName(processSub);
+ //processName.equals("stepC") || processName.equals("stepD")
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
String.valueOf("null".equals(compound)
@@ -684,14 +690,14 @@
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
flowCard.getProcess(),
- flowCard.getOrderNumber()
+ flowCard.getOrderNumber(), flowCard.getPrintQuantity()
));
} else {
-
+ //鐢ㄤ簬澶╂触鐜板満娴佺▼鍗℃墦鍗扮晫闈㈢殑灏忕墖鏍囩鎵撳嵃
itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
- flowCard.getProcess()
+ flowCard.getProcess(), flowCard.getPrintQuantity()
));
}
list.add(itemmap);
@@ -729,7 +735,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
@@ -946,7 +952,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
@@ -1207,11 +1213,33 @@
return map;
}
- public Boolean updateProcessSv(String processId, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
+ public Boolean updateProcessSv(String processId,String orderNumber, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
+ List<OrderProcessDetail> resultList = new ArrayList<>();
+ //鑾峰彇宸叉姤宸ュ伐鑹烘祦绋�
+ String processOk = flowCardMapper.getProcessOk(processId,orderNumber,technologyNumber);
+ if (processOk != null && !processOk.isEmpty()){
+ List<String> okList = Arrays.asList(processOk.split("->"));
+ List<String> orderList = Arrays.asList(Orderprocess.split("->"));
- //鍒ゆ柇璇ユ祦绋嬪崱鏄惁鎶ュ伐
- Integer count = flowCardMapper.reportingWorkCount(processId);
- if (count == 0) {
+ // 鍒ゆ柇 processOk 鐨勬瘡涓伐搴忔槸鍚﹂兘鍖呭惈鍦� orderProcess 涓�
+ for (String p : okList) {
+ if (!orderList.contains(p)) {
+ return false;
+ }
+ }
+
+
+
+ for (String process : okList) {
+ List<OrderProcessDetail> details =
+ flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);
+
+ if (details != null && !details.isEmpty()) {
+ resultList.addAll(details);
+ }
+ }
+ }
+
//鍒犻櫎灏忕墖宸ヨ壓琛ㄥ搴旂殑鏁版嵁
flowCardMapper.deleteProcessMp(processId, technologyNumber);
//閲嶆柊鎻掑叆淇敼濂藉伐鑹烘祦绋嬪崱鐨勬暟鎹�
@@ -1227,12 +1255,15 @@
}
}
}
+ //灏嗗師鏉ュ凡鎶ュ伐鐨勬暟鎹洿鏂�
+ if (resultList != null && !resultList.isEmpty()) {
+ for (OrderProcessDetail d : resultList) {
+ flowCardMapper.updateOrderProcessDetail(d.getProcessId(),d.getOrderNumber(),d.getTechnologyNumber(),
+ d.getReportingWorkNumCount(),d.getReportingWorkNum(),d.getBrokenNum(),d.getProcess());
+ }
+ }
return true;
- } else {
- return false;
- }
-
}
@@ -1449,6 +1480,16 @@
}
}
+
+ public Map<String, Object> selectCompletedSv(String processId, Integer orderNumber, String process) {
+ Map<String, Object> map = new HashMap<>();
+ String[] processList = process.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ map.put("data", flowCardMapper.selectCompletedMp(processId, orderNumber,interceptProcess));
+
+ return map;
+ }
}
--
Gitblit v1.8.0