From 1d193f2cc23f54634ef8ed73c11436fbe76bb575 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 19 八月 2024 14:13:39 +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 | 548 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 522 insertions(+), 26 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 84a81e1..b74585e 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
@@ -4,32 +4,50 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.mapper.pp.FlowCardMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.erp.mapper.sd.OrderGlassDetailMapper;
+import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
-import java.sql.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
+
+
+import java.sql.Date;
+import java.util.*;
+
+import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@Service
@DS("pp")
public class FlowCardService {
- @Autowired
+ final
FlowCardMapper flowCardMapper;
+ final
+ OrderGlassDetailMapper orderGlassDetailMapper;
+ final
+ OrderProcessDetailMapper orderProcessDetailMapper;
+
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper) {
+ this.flowCardMapper = flowCardMapper;
+ this.orderGlassDetailMapper = orderGlassDetailMapper;
+ this.orderProcessDetailMapper = orderProcessDetailMapper;
+ }
//娴佺▼鍗＄鐞嗘煡璇�
- public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize,Date selectTime1, Date selectTime2, FlowCard flowCard) {
- Integer offset = (pageNum-1)*pageSize;
+ public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard) {
+ Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectFlowCard(offset, pageSize,selectTime1, selectTime2, flowCard));
- map.put("total",flowCardMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, flowCard));
- System.out.println(map);
+ map.put("data", flowCardMapper.selectFlowCard(offset, pageSize, selectTime1, selectTime2, flowCard));
+ map.put("total", flowCardMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, flowCard));
return map;
}
@@ -50,14 +68,25 @@
//鍒犻櫎娴佺▼鍗�
public Boolean deleteFlowCardSv(String orderId, String processId) {
if (!orderId.isEmpty() && !processId.isEmpty()) {
+ //鍒ゆ柇璇ユ祦绋嬪崱鏄惁鎶ュ伐
Integer count = flowCardMapper.reportingWorkCount(processId);
if (count == 0) {
- //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
- flowCardMapper.updateProcessingCard(orderId, 1);
+
//淇敼鍒嗘灦鐘舵��
flowCardMapper.updateDeleteState(orderId, processId);
+ //鍒犻櫎鎶ュ伐娴佺▼鏄庣粏琛ㄦ暟鎹�
+ flowCardMapper.deleteReportingWork(processId);
//鍒犻櫎鍒嗘灦鏄庣粏
flowCardMapper.deleteFlowCardMp(orderId, processId);
+ //鍒ゆ柇璇ヨ鍗曟祦绋嬪崱鏄惁鍏ㄩ儴鍒犻櫎
+ Integer flowNumber = flowCardMapper.selectFlowCardCount(orderId);
+ if (flowNumber == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负0,鍏ㄩ儴鍒犻櫎
+ flowCardMapper.updateProcessingCard(orderId, 0);
+ } else {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鍒犻櫎閮ㄥ垎
+ flowCardMapper.updateProcessingCard(orderId, 1);
+ }
return true;
} else {
return false;
@@ -72,20 +101,20 @@
public Map<String, Object> selectNoCardSv(String orderId, String productionId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.selectNoCardMp(orderId, productionId, flowCard));
+ map.put("maxFlowCard", flowCardMapper.selectMaxFlowCard(orderId, productionId));
+ map.put("orderOtherMoney", flowCardMapper.selectorderOtherMoney());
return map;
}
//淇敼鎺掔増鐘舵��
- public Boolean updateLayoutStatusSv(String processId) {
+ public Boolean updateLayoutStatusSv(String processId, Integer state) {
if (!processId.isEmpty()) {
- Integer Status = flowCardMapper.selectLayoutStatus(processId);
- if (Status == 1) {
- flowCardMapper.updateLayoutStatusMp(processId);
- } else {
- return false;
- }
+// Integer Status = flowCardMapper.selectLayoutStatus(processId);
+
+ flowCardMapper.updateLayoutStatusMp(processId, state);
+
return true;
} else {
@@ -111,7 +140,7 @@
//鏌ヨ姣忎釜搴忓彿鐨勫眰鏁�
Integer layer = flowCardMapper.selectLayer(productionId, flowCard.getOrderNumber());
//娣诲姞娴佺▼鍗℃暟鎹�
- flowCardMapper.addFlowCardMp(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getLandingSequence(), flowCard.getQuantity(), productionId, userName,layer);
+ flowCardMapper.addFlowCardMp(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getLandingSequence(), flowCard.getQuantity(), productionId, userName, layer);
//淇敼鍒嗘灦鐘舵�侊紝灏嗙姸鎬佹敼涓�1
flowCardMapper.updateFlowState(productionId, flowCard.getOrderNumber());
//鏌ヨ璇ヨ鍗曟湭鍒嗘灦鏁伴噺
@@ -123,20 +152,35 @@
//淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
flowCardMapper.updateProcessingCard(productionId, 1);
}
+ //鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
+ List<OrderGlassDetail> orderGlassDetailList =
+ orderGlassDetailMapper.selectList(
+ new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", flowCard.getProcessId().substring(0, 10))
+ .eq("order_number", flowCard.getOrderNumber())
+ );
+ List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList);
+ orderProcessDetailList.forEach(
+ orderGlassDetail -> orderGlassDetail.setProcessId(flowCard.getProcessId()));
+
+
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
+
return true;
} else {
return false;
}
}
- public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, FlowCard flowCard) {
+ public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId, String processes, Integer state, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- if (state==2){//宸叉帓浜�
- map.put("data", flowCardMapper.selectOkSchedulingMp(selectTime1, selectTime2,orderId,processes, flowCard));
+ if (state == 2) {//宸叉帓浜�
+ map.put("data", flowCardMapper.selectOkSchedulingMp(selectTime1, selectTime2, orderId, processes, flowCard));
- }else if (state==1){//鏈帓浜�
- map.put("data", flowCardMapper.selectNoSchedulingMp(selectTime1, selectTime2,orderId,processes, flowCard));
+ } else if (state == 1) {//鏈帓浜�
+ map.put("data", flowCardMapper.selectNoSchedulingMp(selectTime1, selectTime2, orderId, processes, flowCard));
}
@@ -150,4 +194,456 @@
map.put("data", flowCardMapper.selectLastSchedulingMp(selectTime1, selectTime2, flowCard));
return map;
}
+
+ public Object flowCardDetailSv(String processId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.flowCardDetailMp(processId, flowCard));
+ return map;
+ }
+
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project,String userId, FlowCard flowCard) {
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(project)) {
+ project = "";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ String roleId=flowCardMapper.selectUserMp(userId);
+ map.put("user",roleId );
+ return map;
+ }
+
+ public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
+ return map;
+ }
+
+ public Object selectPrintSv(Map<String, Object> object, String inquiryMode) {
+ 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<String, Object> itemmap = new HashMap<>();
+ if ("1".equals(inquiryMode)){
+ itemmap.put("detail", flowCardMapper.selectPrintMp(flowCard.getOrderId()));
+ } else if ("3".equals(inquiryMode)) {
+ itemmap.put("detail", flowCardMapper.selectPrintAllMp(flowCard.getOrderId()));
+ } else {
+ itemmap.put("detail", flowCardMapper.selectPrintNotMp(flowCard.getOrderId()));
+ }
+
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
+ 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, String printMerge, String printLike) {
+ 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()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+ //鏄惁浼犲叆鍚堝苟灞傛暟
+ if (printMerge.equals("")||printMerge.equals("null") ){
+ //鏄惁鍖呭惈鍒囧壊
+ //boolean containsCutting = flowCard.getProcess().contains("鍒囧壊");
+ String processSub=flowCard.getProcess().substring(0, 2);
+ if(processSub.equals("澶硅兌") || processSub.equals("涓┖")){
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+
+ }
+ else {
+
+ //娴佺▼鍗℃槑缁嗘暟鎹�
+ if (printLike.equals("")||printLike.equals("null") ){
+ itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), printMerge, flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+ }
+
+ //宸ヨ壓娴佺▼
+ //List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ String input = flowCard.getProcess();
+ String delimiter = "->";
+
+ // 鍒嗗壊瀛楃涓�
+ String[] parts = input.split(delimiter);
+
+ // 鍒涘缓 List<Map<String, Object>>
+ List<Map<String, Object>> processList = new ArrayList<>();
+
+ // 閬嶅巻鍒嗗壊鍚庣殑閮ㄥ垎骞跺皢鍏跺瓨鍏� List<Map<String, Object>>
+ for (int i = 0; i < parts.length; i++) {
+ Map<String, Object> maps = new HashMap<>();
+ maps.put("id", i); // 娣诲姞涓�涓储寮曞瓧娈�
+ maps.put("process", parts[i]); // 娣诲姞瀹為檯鐨勫��
+
+ processList.add(maps);
+ }
+
+ itemmap.put("processList", processList);
+ // itemmap.put("numberList", numberList);
+ itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
+ itemmap.put("remarkList", flowCardMapper.remakList(flowCard.getProcessId()));
+ list.add(itemmap);
+
+ }
+ }
+
+ map.put("data", list);
+ //鍒濆鍖栧��
+ printLike=null;
+ return map;
+ }
+
+ public Boolean updateComposingSv(Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ flowCardMapper.updateComposing(flowCard.getProcessId());
+ }
+ return true;
+ }
+ else {
+ return false;
+
+ }
+ }
+
+ public Map<String, Object> getSelectPrintLabelSv(String projectNo,String type) {
+ Map<String, Object> map = new HashMap<>();
+ if(Objects.equals(type, "1")){
+ map.put("data", flowCardMapper.getPrintLabel(projectNo));
+ } else if (Objects.equals(type, "2")) {
+ map.put("data", flowCardMapper.getPrintLabel2(projectNo));
+ }
+
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintLabelSv1(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) {
+ // 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.getPrintLabel1(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+ //}
+
+ }
+ }
+ map.put("data", list);
+
+ return map;
+ }
+
+ public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, String process, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.printFlowCardDetailsMp(processId, technologyNumber,process, 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());
+ //鍒ゆ柇淇濆瓨鐨勬暟鎹槸鍚﹀凡瀛樺湪
+ Integer count = flowCardMapper.printAddSortCountMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort(),flowCard.getProcess());
+ if (count >0){
+ flowCardMapper.printUpdateSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort(),flowCard.getProcess());
+ }else {
+ flowCardMapper.printAddSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort(),flowCard.getProcess());
+ }
+ }
+ }
+ return true;
+ }
+
+
+ public Map<String, Object> getSelectPrintCustomLabelSv(String type, Integer lableType, 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()) {
+ Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
+
+ if (lableType != 2){
+ for (FlowCard flowCard : flowCardList) {
+ String processId = flowCard.getProcessId();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(processId)) {
+ continue;
+ }
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(processId);
+ }
+ }
+ else{
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
+ list.add(itemmap);
+ }
+ }
+ }
+ 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;
+ }
+
+ public Boolean updatePrintStateSv(Integer printState, Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ // 鏇存柊鎵撳嵃鐘舵��
+ flowCardMapper.updatePrintStateMp(printState,flowCard.getProcessId(),flowCard.getTechnologyNumber());
+ }
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ public Map<String, Object> printFlowCardOrderSortSv(String orderId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.printFlowCardOrderSortMp(orderId, flowCard));
+ return map;
+ }
+
+ public Boolean printOrderSort(Map<String, Object> object) {
+ List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
+ if (!FlowCardList.isEmpty()) {
+ for (FlowCard flowCard : FlowCardList) {
+ flowCardMapper.printOrderSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort());
+ }
+ }
+ return true;
+ }
+
+ public Map<String, Object> getSelectPrintingRefundSv(Map<String, Object> object, String printMerge, String printLike) {
+ 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()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+ //鏄惁浼犲叆鍚堝苟灞傛暟
+ if (printMerge.equals("")||printMerge.equals("null") ){
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(),flowCard.getReportingWorkId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+
+ //娴佺▼鍗℃槑缁嗘暟鎹�
+ if (printLike.equals("")||printLike.equals("null") ){
+ itemmap.put("detail", flowCardMapper.getPrimaryListMergeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(), flowCard.getReportingWorkId()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ }
+
+ //宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+
+ itemmap.put("processList", processList);
+ // itemmap.put("numberList", numberList);
+ list.add(itemmap);
+
+ }
+ }
+ map.put("data", list);
+ //鍒濆鍖栧��
+ printLike=null;
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrinReworkSv(Map<String, Object> object, String printMerge, String printLike) {
+ 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()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+ //鏄惁浼犲叆鍚堝苟灞傛暟
+ if (printMerge.equals("")||printMerge.equals("null") ){
+ itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(),flowCard.getReportingWorkId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+
+ //娴佺▼鍗℃槑缁嗘暟鎹�
+ if (printLike.equals("")||printLike.equals("null") ){
+ itemmap.put("detail", flowCardMapper.getPrimaryListMergeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ else {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(), flowCard.getReportingWorkId()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());
+ itemmap.put("detailList", detailList);
+ }
+ }
+
+ //宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+
+ itemmap.put("processList", processList);
+ // itemmap.put("numberList", numberList);
+ list.add(itemmap);
+
+ }
+ }
+ map.put("data", list);
+ //鍒濆鍖栧��
+ printLike=null;
+ return map;
+ }
+
+ public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode) {
+ 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<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
+ map.put("type", flowCardMapper.selectType());
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelDetailsSv(String type, Integer lableType, 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()) {
+
+ if (lableType != 2){
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
+ list.add(itemmap);
+ }
+ }
+ else{
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
+ list.add(itemmap);
+ }
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Object selectSortTableSv(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<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.selectSortTableMp(flowCard.getOrderId()));
+ list.add(itemmap);
+
+ }
+ }
+ map.put("data", list);
+
+ return map;
+
+
+ }
}
+
+
--
Gitblit v1.8.0