From c27bbcc497711df8b13d096f4917b5a8f16508c9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 10:28:59 +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/FlowCardService.java | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 301 insertions(+), 28 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 d5a02cb..a42e2fa 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,8 +62,28 @@
this.productDetailMapper = productDetailMapper;
this.orderDetailMapper = orderDetailMapper;
this.orderMapper = orderMapper;
+ this.reportingWorkMapper = reportingWorkMapper;
}
+ //灏嗗眰鏁板瓧绗︿覆鐢ㄩ�楀彿闅斿紑
+ public static String splitTechNumbers(String input) {
+ if (input == null || input.isEmpty()) {
+ return "";
+ }
+
+ List<String> result = new ArrayList<>();
+ for (int i = 0; i < input.length(); i++) {
+ // 鐗规畩澶勭悊 "10"
+ if (input.charAt(i) == '1' && i + 1 < input.length() && input.charAt(i + 1) == '0') {
+ result.add("10");
+ i++; // 璺宠繃涓嬩竴涓瓧绗�
+ } else {
+ result.add(String.valueOf(input.charAt(i)));
+ }
+ }
+
+ return String.join(",", result);
+ }
//娴佺▼鍗＄鐞嗘煡璇�
public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize,List<String> selectDate, FlowCard flowCard) {
Integer offset = (pageNum - 1) * pageSize;
@@ -84,9 +108,23 @@
}
//鍒嗘灦鏌ヨ
- public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, FlowCard flowCard) {
+ public Map<String, Object> selectAddProcess(List<String> selectDate, FlowCard flowCard) {
+ 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", flowCardMapper.selectFlowCardMp(selectTime1, selectTime2, flowCard));
+ map.put("data", flowCardMapper.selectFlowCardMp( startDate, endDate, flowCard));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -243,23 +281,51 @@
return map;
}
- public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, String userId, Integer state, FlowCard flowCard) {
+ public Object selectPrintFlowCardSv(List<String> selectDate, String orderId, String project, String userId, Integer state, FlowCard flowCard) {
if ("null".equals(orderId)) {
orderId = "";
}
if ("null".equals(project)) {
project = "";
}
+ 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", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project,state, flowCard));
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(startDate, endDate, orderId, project,state, flowCard));
String roleId = flowCardMapper.selectUserMp(userId);
map.put("user", roleId);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
- public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
+ public Object selectPrintFlowCard(List<String> selectDate) {
+ 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", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
+ map.put("data", flowCardMapper.selectPrintFlowCard(startDate, endDate));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -325,6 +391,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)
@@ -335,10 +402,10 @@
if (compound == null
|| "null".equals(compound)
|| compound.trim().isEmpty()){
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,landingSequence);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
itemmap.put("detailList", detailList);
}else {//鏈夐渶瑕佸悓鏋剁殑灞�
- List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,compound,landingSequence);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,splitTechNumbers(compound),landingSequence);
itemmap.put("detailList", detailList);
}
} else {
@@ -361,10 +428,11 @@
if (compound == null
|| "null".equals(compound)
|| compound.trim().isEmpty()){
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
itemmap.put("detailList", detailList);
}else {//鏈夐渶瑕佸悓鏋剁殑灞�
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,compound,landingSequence);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,splitTechNumbers(compound),landingSequence);
itemmap.put("detailList", detailList);
}
}
@@ -526,8 +594,24 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- flowCardMapper.updateComposing(flowCard.getProcessId());
+ //鍏堣幏鍙栨帓鐗堢姸鎬�
+ Integer layoutStatus = flowCardMapper.getLayoutStatus(flowCard.getProcessId());
+ //2浼樺寲鍗犵敤
+ if (layoutStatus!=2){
+ flowCardMapper.updateComposing(flowCard.getProcessId());
+ }
+ else {
+ return false;
+ }
+
}
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("FlowCardSv娴佺▼鍗℃帓鐗堢姸鎬�");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
return true;
} else {
return false;
@@ -641,9 +725,16 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
- list.add(itemmap);
+ Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
+ List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity());
+
+ for (Map<String, Object> detail : details) {
+ detail.put("sumQuantity", sumQuantity);
+ }
+
+ itemmap.put("data", details);
+ list.add(itemmap);
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
processedKeys.add(uniqueKey);
}
@@ -661,14 +752,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);
@@ -706,7 +797,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);
}
}
@@ -923,7 +1014,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);
}
}
@@ -1184,11 +1275,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);
//閲嶆柊鎻掑叆淇敼濂藉伐鑹烘祦绋嬪崱鐨勬暟鎹�
@@ -1204,12 +1317,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;
- }
-
}
@@ -1408,6 +1524,163 @@
List<LocalDate> date= (List<LocalDate>) dates.get("date");
return flowCardMapper.exportDateProcessMp(date);
}
+
+ public Map<String, Object> selectSortingCardSv(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectSortingCardMp(orderId, productionId,flashback,optionVal, flowCard));
+ map.put("maxFlowCard", flowCardMapper.selectMaxFlowCard(orderId, productionId));
+ map.put("orderOtherMoney", flowCardMapper.selectorderOtherMoney());
+ return map;
+ }
+
+ public Boolean updateTerminationSv(String processId, Integer orderNumber, Integer value) {
+ if (processId!=""){
+ flowCardMapper.updateTerminationMp(processId,orderNumber,value);
+ return true;
+ }else {
+ return false;
+ }
+
+ }
+
+ 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;
+ }
+
+// public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object, String printMerge, String printLike, String mergeTechnologyNumber) {
+// if (printMerge == null) {
+// printMerge = "";
+// }
+// if (printLike == null) {
+// printLike = "";
+// }
+// Map<String, Object> map = new HashMap<>();
+// List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+// List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+// if (!flowCardList.isEmpty()) {
+// Set<String> processedKeys = new HashSet<>();
+// for (FlowCard flowCard : flowCardList) {
+// String batch = flowCard.getOrder().getBatch();
+// String glassChild = flowCard.getGlassChild();
+// Map<String, Object> itemmap = new HashMap<>();
+// //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+// itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), mergeTechnologyNumber, flowCard.getPatchReason(), flowCard.getOrderId()));
+//
+// List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getPatchReason());
+// itemmap.put("detailList", detailList);
+// //宸ヨ壓娴佺▼
+// List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+// //宸ュ簭鍒楄〃
+// List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+// itemmap.put("processList", processList);
+// itemmap.put("processNameList", processNameList);
+// // itemmap.put("numberList", numberList);
+// list.add(itemmap);
+//
+// }
+// }
+// map.put("data", list);
+// //鍒濆鍖栧��
+// printLike = null;
+// return map;
+// }
+
+ public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object,
+ String printMerge,
+ String printLike,
+ String mergeTechnologyNumber) {
+ if (printMerge == null) printMerge = "";
+ if (printLike == null) printLike = "";
+
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ List<FlowCard> flowCardList = JSONArray.parseArray(
+ JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+
+ if (!flowCardList.isEmpty()) {
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勫悎骞� detailList
+ Map<String, List<Map<String, Object>>> keyToDetails = new LinkedHashMap<>();
+
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勭涓�涓� flowCard锛岀敤浜庣敓鎴� itemmap 琛ㄥご绛変俊鎭�
+ Map<String, FlowCard> keyToFirstFlowCard = new HashMap<>();
+
+ for (FlowCard flowCard : flowCardList) {
+ String batch = flowCard.getBatch();
+ String glassChild = flowCard.getProductName();
+ String key = batch + "_" + glassChild;
+
+ List<Map<String, Object>> currentDetailList = flowCardMapper.getDetailListRefund(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getOrderNumber(),
+ flowCard.getReportingWorkId(),
+ flowCard.getPatchReason()
+ );
+
+ for (Map<String, Object> detail : currentDetailList) {
+ detail.put("processId", flowCard.getProcessId());
+ detail.put("technologyNumber", flowCard.getTechnologyNumber());
+ }
+
+ // 鍚堝苟 detailList 鍒板搴� key
+ keyToDetails.computeIfAbsent(key, k -> new ArrayList<>()).addAll(currentDetailList);
+
+ // 淇濆瓨绗竴娆″嚭鐜扮殑 flowCard锛岀敤浜庣敓鎴� itemmap
+ keyToFirstFlowCard.putIfAbsent(key, flowCard);
+ }
+
+ // 閬嶅巻鍚堝苟鍚庣殑 key锛岀敓鎴� itemmap
+ for (Map.Entry<String, List<Map<String, Object>>> entry : keyToDetails.entrySet()) {
+ String key = entry.getKey();
+ List<Map<String, Object>> mergedDetailList = entry.getValue();
+
+ FlowCard firstFlowCard = keyToFirstFlowCard.get(key);
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detailList", mergedDetailList);
+
+ // 琛ㄥご琛ㄥ熬
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefundHB(
+ firstFlowCard.getProcessId(),
+ String.valueOf(firstFlowCard.getTechnologyNumber()),
+ firstFlowCard.getOrderNumber(),
+ firstFlowCard.getReportingWorkId(),
+ mergeTechnologyNumber,
+ firstFlowCard.getPatchReason(),
+ firstFlowCard.getOrderId()
+ ));
+
+ // 宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(
+ firstFlowCard.getProcessId(),
+ firstFlowCard.getTechnologyNumber()
+ );
+
+ // 宸ュ簭鍒楄〃
+ List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+
+ itemmap.put("processList", processList);
+ itemmap.put("processNameList", processNameList);
+
+ list.add(itemmap);
+ }
+ }
+
+ map.put("data", list);
+ return map;
+ }
+
+
+
+
+
}
--
Gitblit v1.8.0