From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +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 | 80 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 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 0f7bd50..d5cb01f 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
@@ -322,7 +322,7 @@
if (printMerge.equals("") || printMerge.equals("null")) {
//鏄惁鍖呭惈鍒囧壊
//boolean containsCutting = flowCard.getProcess().contains("鍒囧壊");
- String processSub = flowCard.getProcess().substring(0, 2);
+ String processSub = flowCard.getProcess().split("->")[0];
//鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
String processName = flowCardMapper.getProcessName(processSub);
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
@@ -526,8 +526,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;
@@ -618,6 +634,10 @@
public Map<String, Object> getSelectPrintCustomLabelSv(String type, Integer lableType, Map<String, Object> object) {
+ //鏍规嵁mse浼犺繃鏉ョ殑鍊�,濡傛灉涓嶅瓨鍦� 璧嬪�糵alse
+ String isRepeat = Optional.ofNullable(object.get("isRepeat"))
+ .map(Object::toString)
+ .orElse("false");
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);
@@ -629,21 +649,51 @@
String processId = flowCard.getProcessId();
Integer orderNumber = flowCard.getOrderNumber();
String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
- // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
- if (processedKeys.contains(uniqueKey)) {
- continue;
+ if (isRepeat=="false"){//鏍规嵁mse浼犺繃鏉ョ殑鍊煎垽鏂槸鍚﹀幓闄ら噸澶�
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
}
- Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber()));
- list.add(itemmap);
+ Map<String, Object> itemmap = new HashMap<>();
+
+ 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);
}
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess()));
+ String orderNumber = "";
+ if (flowCard.getOrderNumber() != null) {
+ orderNumber = String.valueOf(flowCard.getOrderNumber());
+ }
+ // 鍒ゆ柇鏄惁涓洪潪绌哄瓧绗︿覆
+ if (orderNumber != null && !orderNumber.trim().isEmpty()) {
+
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess(),
+ flowCard.getOrderNumber()
+ ));
+ } else {
+
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess()
+ ));
+ }
list.add(itemmap);
}
}
@@ -679,7 +729,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
list.add(itemmap);
}
}
@@ -896,7 +946,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
list.add(itemmap);
}
}
@@ -1381,6 +1431,14 @@
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;
+ }
}
--
Gitblit v1.8.0