From 1edc3d1f85e2bcde84190db79804c98eb9303ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 十二月 2024 13:27:19 +0800
Subject: [PATCH] 提交打印相关页面程序
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 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 c084d04..659e5a1 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
@@ -27,6 +27,7 @@
import java.sql.Date;
import java.util.*;
+import java.util.stream.Collectors;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -381,6 +382,8 @@
map.put("data", flowCardMapper.getPrintLabel(projectNo));
} else if (Objects.equals(type, "2")) {
map.put("data", flowCardMapper.getPrintLabel2(projectNo));
+ } else if (Objects.equals(type, "3")) {
+ map.put("data", flowCardMapper.getPrintLabel3(projectNo));
}
return map;
@@ -666,7 +669,7 @@
continue;
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getPrintQuantity()));
list.add(itemmap);
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
@@ -718,10 +721,18 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!flowCardList.isEmpty()) {
List<Map<String, Object>> flowCardList1=flowCardMapper.selectFlowCardMerge(flowCardList.get(0).getProcessId());
- if(flowCardList1.size()==1){
- flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId());
- returns="true";
+ int index=1;
+ for(int i = 0;i < flowCardList1.size();i++){
+ if(Integer.valueOf(flowCardList1.get(i).get("count2").toString())>1){
+ List<Integer> technologyNumber = Arrays.stream(flowCardList1.get(i).get("count1").toString().split(","))
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+ flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId(),technologyNumber,index);
+ index+=1;
+ returns="true";
+ }
}
+
}
@@ -814,7 +825,7 @@
return map;
}
- public Map<String, Object> getPrintCustomDataProjectNoDetailSv(String type, Map<String, Object> object) {
+ public Map<String, Object> getPrintCustomDataProjectNoDetailSv(String type, Integer detailType, Map<String, Object> object) {
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);
@@ -822,7 +833,18 @@
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
+ if (detailType==0){
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
+
+ }
+ else if (detailType==1) {
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
+
+ }
+ else {
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
+
+ }
list.add(itemmap);
}
}
@@ -830,6 +852,36 @@
map.put("title", flowCardMapper.getPrintTitle(type));
return map;
}
+
+ public Boolean updateProcessSv(String processId, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
+
+ //鍒ゆ柇璇ユ祦绋嬪崱鏄惁鎶ュ伐
+ Integer count = flowCardMapper.reportingWorkCount(processId);
+ if (count == 0) {
+ //鍒犻櫎灏忕墖宸ヨ壓琛ㄥ搴旂殑鏁版嵁
+ flowCardMapper.deleteProcessMp(processId,technologyNumber);
+ //閲嶆柊鎻掑叆淇敼濂藉伐鑹烘祦绋嬪崱鐨勬暟鎹�
+ List<String> newCraftList = (List<String>) object.get("newCraft");
+ List<String> numberList = (List<String>) object.get("technologyNumber");
+ // 鍒ゆ柇 newCraftList 鏄惁涓虹┖
+ if (newCraftList != null) {
+ for (String number : numberList) {
+ //淇敼璁㈠崟灏忕墖琛ㄥ伐鑹烘祦绋�
+ flowCardMapper.updateOrderProcessMp(orderId,number,technologyNumber,Orderprocess);
+ for (String process : newCraftList) {
+ flowCardMapper.updateProcessMp(processId,technologyNumber,process,number);
+ }
+ }
+ }
+
+ return true;
+ }else {
+ return false;
+ }
+
+
+
+ }
}
--
Gitblit v1.8.0