From d4f6c4154611408d3be9fbe04816d761a9e4cd2c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 六月 2024 16:29:41 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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 21d95fa..5e1ed14 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,20 +6,22 @@
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.io.StringReader;
import java.sql.Date;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -211,6 +213,7 @@
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;
}
@@ -260,18 +263,51 @@
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()));
+ System.out.println(flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
}
}
}
-
return map;
}
- public Map<String, Object> printSetup(PrintSetup printSetup) {
+ public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintSetup(printSetup));
+ map.put("data", flowCardMapper.printFlowCardDetailsMp(processId, technologyNumber, flowCard));
+ return map;
+ }
+
+ public Boolean printSortSv(Map<String, Object> object) {
+ List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
+ if (!FlowCardList.isEmpty()) {
+ for (FlowCard flowCard : FlowCardList) {
+ flowCardMapper.printSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort());
+ }
+ }
+ return true;
+ }
+
+
+ public Map<String, Object> getSelectPrintCustomLabelSv(String type, 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);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ map.put("data", flowCardMapper.getPrintCustomData(flowCard.getOrderId(),flowCard.getOrderNumber()));
+ map.put("quantity", flowCard.getQuantity());
+ }
+ }
+
+ 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