From ae106d4b363018dcfaa4359b57b61f3a7043fcad Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 15:23:36 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 29 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 1e2ec82..a5afc74 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
@@ -6,16 +6,27 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.PrintSetup;
import com.example.erp.entity.pp.ProductionScheduling;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jdk.nashorn.internal.parser.JSONParser;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+
+
+import java.io.StringReader;
import java.sql.Date;
+import java.time.LocalDate;
import java.util.*;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -205,12 +216,28 @@
return map;
}
- public Object selectPrintSv(String orderId, FlowCard flowCard) {
+ public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ map.put("data", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
return map;
}
+ public Object selectPrintSv(String orderId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ map.put("type", flowCardMapper.selectType());
+ return map;
+ }
+
+ private static Map<String, Object> parseJson(String json) {
+ ObjectMapper objectMapper = new ObjectMapper();
+ try {
+ return objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {});
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
public Map<String, Object> getSelectPrintingSv(Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
@@ -220,14 +247,16 @@
Map<String, Object> itemmap = new HashMap<>();
//娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ itemmap.put("numberList", flowCardMapper.getGlassNumber(flowCard.getTechnologyNumber(),flowCard.getProcessId()));
+
//娴佺▼鍗℃槑缁嗘暟鎹�
List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ List<Map<String, Object>> glassList = flowCardMapper.getGlassNumber(flowCard.getTechnologyNumber(),flowCard.getProcessId());
//宸ヨ壓娴佺▼
List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
itemmap.put("detailList", detailList);
itemmap.put("processList", processList);
list.add(itemmap);
-
}
}
@@ -249,20 +278,27 @@
}
}
- public Map<String, Object> getSelectPrintLabelSv(Map<String, Object> object) {
+ public Map<String, Object> getSelectPrintLabelSv(String projectNo) {
Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getPrintLabel(projectNo));
+ return map;
+ /* 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()) {
for (FlowCard flowCard : flowCardList) {
- Integer count=flowCard.getQuantity();
- for (int i = 0; i < count; i++) {
- map.put("data", flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
- //System.out.println(flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
- }
+ // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ Map<String, Object> itemmap = new HashMap<>();
+ // for (int i = 0; i < count; i++) {
+ itemmap.put("data", flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+ //}
+
}
}
- return map;
+ map.put("data", list);
+ return map;*/
}
public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, FlowCard flowCard) {
@@ -281,27 +317,30 @@
return true;
}
- public Map<String, Object> printSetup(PrintSetup printSetup) {
+
+ public Map<String, Object> getSelectPrintCustomLabelSv(String type, Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintSetup(printSetup));
- return map;
- }
- public Boolean updatePrintSetup(Map<String, Object> object) {
- System.out.println(object);
- boolean saveState = true;
- String[] stringList=new String[]{"customerName","orderId","typeName","specifications","project","remarks","glassChild","processingNote"};
- for(String strings:stringList){
- if (object.get(strings) != null) {
- if (Objects.equals(object.get(strings).toString(), "true")){
- flowCardMapper.updatePrintSetup(strings,1);
- }else {
- flowCardMapper.updatePrintSetup(strings,0);
- }
- }else {
- saveState=false;
+ 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()) {
+ for (FlowCard flowCard : flowCardList) {
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+
+
}
}
- return saveState;
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Object getCustomLabelDetailSv(String name, String form, String id, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getCustomLabelDetailMp(name, form,id, flowCard));
+ return map;
}
}
--
Gitblit v1.8.0