From 613e4e92157dd697629dbad17fd091ae37637bc7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 17 十一月 2025 08:50:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 1485 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 1,290 insertions(+), 195 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 a4f9f41..738d9e2 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
@@ -5,26 +5,38 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderGlassDetail;
-import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
+import com.example.erp.entity.userInfo.SysError;
+import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.FlowCardMapper;
-import com.example.erp.mapper.sd.OrderGlassDetailMapper;
-import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.mapper.pp.ReportingWorkMapper;
+import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.LogService;
+import com.example.erp.service.userInfo.SysErrorService;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.core.type.TypeReference;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
import java.io.IOException;
import java.sql.Date;
import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -39,27 +51,90 @@
OrderProcessDetailMapper orderProcessDetailMapper;
final
LogService logService;
+ private final ProductMapper productMapper;
+ private final ProductDetailMapper productDetailMapper;
- public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper,LogService logService) {
+ private final OrderDetailMapper orderDetailMapper;
+ private final OrderMapper orderMapper;
+ private final ReportingWorkMapper reportingWorkMapper;
+ @Autowired
+ SysErrorService sysErrorService;
+
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper,
+ OrderProcessDetailMapper orderProcessDetailMapper, LogService logService,
+ ProductMapper productMapper, ProductDetailMapper productDetailMapper,
+ OrderDetailMapper orderDetailMapper, OrderMapper orderMapper,ReportingWorkMapper reportingWorkMapper) {
this.flowCardMapper = flowCardMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
- this.logService= logService;
+ this.logService = logService;
+ this.productMapper = productMapper;
+ this.productDetailMapper = productDetailMapper;
+ this.orderDetailMapper = orderDetailMapper;
+ this.orderMapper = orderMapper;
+ this.reportingWorkMapper = reportingWorkMapper;
}
+ //灏嗗眰鏁板瓧绗︿覆鐢ㄩ�楀彿闅斿紑
+ public static String splitTechNumbers(String input) {
+ if (input == null || input.isEmpty()) {
+ return "";
+ }
+
+ List<String> result = new ArrayList<>();
+ for (int i = 0; i < input.length(); i++) {
+ // 鐗规畩澶勭悊 "10"
+ if (input.charAt(i) == '1' && i + 1 < input.length() && input.charAt(i + 1) == '0') {
+ result.add("10");
+ i++; // 璺宠繃涓嬩竴涓瓧绗�
+ } else {
+ result.add(String.valueOf(input.charAt(i)));
+ }
+ }
+
+ return String.join(",", result);
+ }
//娴佺▼鍗＄鐞嗘煡璇�
- public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard) {
+ public Map<String, Object> selectProcessCard(Integer pageNum, Integer pageSize,List<String> selectDate, FlowCard flowCard) {
Integer offset = (pageNum - 1) * pageSize;
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
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));
+ map.put("data", flowCardMapper.selectFlowCard(offset, pageSize, startDate, endDate, flowCard));
+ map.put("total", flowCardMapper.getPageTotal(offset, pageSize, startDate, endDate, flowCard));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
//鍒嗘灦鏌ヨ
- public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, FlowCard flowCard) {
+ public Map<String, Object> selectAddProcess(List<String> selectDate, FlowCard flowCard) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectFlowCardMp(selectTime1, selectTime2, flowCard));
+ map.put("data", flowCardMapper.selectFlowCardMp( startDate, endDate, flowCard));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -83,6 +158,8 @@
flowCardMapper.deleteReportingWork(processId);
//鍒犻櫎鍒嗘灦鏄庣粏
flowCardMapper.deleteFlowCardMp(orderId, processId);
+ //鍒犻櫎鎺掑簭琛ㄦ暟鎹�
+ flowCardMapper.deleteflowCardSort(orderId, processId);
//鍒ゆ柇璇ヨ鍗曟祦绋嬪崱鏄惁鍏ㄩ儴鍒犻櫎
Integer flowNumber = flowCardMapper.selectFlowCardCount(orderId);
if (flowNumber == 0) {
@@ -95,7 +172,7 @@
//淇濆瓨鏃ュ織
Log log = new Log();
- log.setContent(orderId+processId);
+ log.setContent(orderId + processId);
log.setFunction("deleteFlowCardSv娴佺▼鍗″垹闄�");
log.setOperatorId(userId);
log.setOperator(userName);
@@ -124,11 +201,7 @@
public Boolean updateLayoutStatusSv(String processId, Integer state) {
if (!processId.isEmpty()) {
-// Integer Status = flowCardMapper.selectLayoutStatus(processId);
-
flowCardMapper.updateLayoutStatusMp(processId, state);
-
-
return true;
} else {
return false;
@@ -136,61 +209,76 @@
}
//淇濆瓨娴佺▼鍗℃暟鎹�
- public Boolean addFlowCardSv(Map<String, Object> object) {
- String userName = "";
- if (object.get("userName") != null) {
- userName = object.get("userName").toString();
- }
-
- String productionId = "";
- if (object.get("productionId") != null) {
- productionId = object.get("productionId").toString();
- }
-
- List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
- if (!FlowCardList.isEmpty()) {
- for (FlowCard flowCard : FlowCardList) {
- //鏌ヨ姣忎釜搴忓彿鐨勫眰鏁�
- Integer layer = flowCardMapper.selectLayer(productionId, flowCard.getOrderNumber());
- //娣诲姞娴佺▼鍗℃暟鎹�
- flowCardMapper.addFlowCardMp(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getLandingSequence(), flowCard.getQuantity(), productionId, userName, layer);
- //淇敼鍒嗘灦鐘舵�侊紝灏嗙姸鎬佹敼涓�1
- flowCardMapper.updateFlowState(productionId, flowCard.getOrderNumber());
- //鏌ヨ璇ヨ鍗曟湭鍒嗘灦鏁伴噺
- Integer FlowCount = flowCardMapper.selectFlowCount(productionId);
- if (FlowCount == 0) {
- //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负2
- flowCardMapper.updateProcessingCard(productionId, 2);
- } else {
- //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负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);
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean addFlowCardSv(String orderId, Map<String, Object> object) {
+ boolean saveState = true;
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
}
- //淇濆瓨鏃ュ織
- Log log = new Log();
- log.setContent(object.toString());
- log.setFunction("addFlowCardSv娴佺▼鍗℃柊澧�");
- log.setOperatorId((String) object.get("userId"));
- log.setOperator((String) object.get("userName"));
- logService.saveLog(log);
- return true;
- } else {
- return false;
+ String productionId = "";
+ if (object.get("productionId") != null) {
+ productionId = object.get("productionId").toString();
+ }
+
+ List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
+ if (!FlowCardList.isEmpty()) {
+ for (FlowCard flowCard : FlowCardList) {
+ //鏌ヨ姣忎釜搴忓彿鐨勫眰鏁�
+ Integer layer = flowCardMapper.selectLayer(productionId, flowCard.getOrderNumber());
+ //娣诲姞娴佺▼鍗℃暟鎹�
+ flowCardMapper.addFlowCardMp(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getLandingSequence(), flowCard.getQuantity(), productionId, userName, layer);
+ //淇敼鍒嗘灦鐘舵�侊紝灏嗙姸鎬佹敼涓�1
+ flowCardMapper.updateFlowState(productionId, flowCard.getOrderNumber());
+ //鏌ヨ璇ヨ鍗曟湭鍒嗘灦鏁伴噺
+ Integer FlowCount = flowCardMapper.selectFlowCount(orderId);
+ if (FlowCount == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负2
+ flowCardMapper.updateProcessingCard(orderId, 2);
+ } else {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
+ flowCardMapper.updateProcessingCard(orderId, 1);
+ }
+ //鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
+ List<OrderGlassDetail> orderGlassDetailList =
+ orderGlassDetailMapper.selectList(
+ new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", orderId)
+ .eq("order_number", flowCard.getOrderNumber())
+ );
+ List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList);
+ orderProcessDetailList.forEach(
+ orderGlassDetail -> orderGlassDetail.setProcessId(flowCard.getProcessId()));
+
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
+ }
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("addFlowCardSv娴佺▼鍗℃柊澧�");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
+ } else {
+ saveState = false;
+ }
+
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("updateFinishedGoodsInventoryAllocate");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
}
+ return saveState;
+
}
public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId, String processes, Integer state, FlowCard flowCard) {
@@ -202,7 +290,6 @@
map.put("data", flowCardMapper.selectNoSchedulingMp(selectTime1, selectTime2, orderId, processes, flowCard));
}
-
return map;
}
@@ -217,26 +304,55 @@
public Object flowCardDetailSv(String processId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.flowCardDetailMp(processId, flowCard));
+ map.put("merge", flowCardMapper.flowCardDetailMergeMp(processId));
return map;
}
- public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project,String userId, FlowCard flowCard) {
+ public Object selectPrintFlowCardSv(List<String> selectDate, String orderId, String project, String userId, Integer state, FlowCard flowCard) {
if ("null".equals(orderId)) {
orderId = "";
}
if ("null".equals(project)) {
project = "";
}
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
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 );
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(startDate, endDate, orderId, project,state, flowCard));
+ String roleId = flowCardMapper.selectUserMp(userId);
+ map.put("user", roleId);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
- public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
+ public Object selectPrintFlowCard(List<String> selectDate) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
+ map.put("data", flowCardMapper.selectPrintFlowCard(startDate, endDate));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -247,11 +363,11 @@
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- if ("1".equals(inquiryMode)){
+ if ("1".equals(inquiryMode)) {//鍚堝苟娴佺▼鍗�
itemmap.put("detail", flowCardMapper.selectPrintMp(flowCard.getOrderId()));
- } else if ("3".equals(inquiryMode)) {
+ } else if ("3".equals(inquiryMode)) {//鍚堝苟娴佺▼鍗′笉鎸夐厤缃樉绀�
itemmap.put("detail", flowCardMapper.selectPrintAllMp(flowCard.getOrderId()));
- } else {
+ } else {//闈炲悎骞舵祦绋嬪崱
itemmap.put("detail", flowCardMapper.selectPrintNotMp(flowCard.getOrderId()));
}
@@ -266,60 +382,90 @@
private static Map<String, Object> parseJson(String json) {
ObjectMapper objectMapper = new ObjectMapper();
try {
- return objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {});
+ 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= "";
+
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge, String flashback, String compound, String landingSequence) {
+ if (printMerge == null) {
+ printMerge = "";
}
- if (printLike == null){
- printLike= "";
+ if (printLike == null) {
+ printLike = "";
+ }
+ if (merge == null) {
+ merge = "";
}
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> processedKeys = new HashSet<>();
for (FlowCard flowCard : flowCardList) {
+ String processId = flowCard.getProcessId();
+ Integer orderNumber = flowCard.getOrderNumber();
+ String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
Map<String, Object> itemmap = new HashMap<>();
//娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
//鏄惁浼犲叆鍚堝苟灞傛暟
- if (printMerge.equals("")||printMerge.equals("null") ){
+ 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()));
+ String processSub = flowCard.getProcess().split("->")[0];
+ //鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
+ String processName = flowCardMapper.getProcessName(processSub);
+ //processName.equals("stepC") || processName.equals("stepD")
+ if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖锛屾祦绋嬪崱鏌ヨ鍚堝苟
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
+ flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
- 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()));
+ if (compound == null
+ || "null".equals(compound)
+ || compound.trim().isEmpty()){
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
+ itemmap.put("detailList", detailList);
+ }else {//鏈夐渶瑕佸悓鏋剁殑灞�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailCompoundList(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,splitTechNumbers(compound),landingSequence);
+ itemmap.put("detailList", detailList);
+ }
+ } else {
+ if (merge.equals("1") && flowCard.getMerge().equals(1)) {//鏈惎鐢�,閰嶇疆鏂囦欢flowCardMerge鍊间负1
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedKeys.add(uniqueKey);
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(),flashback,landingSequence);
+ itemmap.put("detailList", detailList);
+ } else {
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
+ String.valueOf("null".equals(compound)
+ ? flowCard.getTechnologyNumber()//姝ｅ父灞�
+ : compound ),//鍚屾灦灞�
+ flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ if (compound == null
+ || "null".equals(compound)
+ || compound.trim().isEmpty()){
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
- itemmap.put("detailList", detailList);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,landingSequence);
+ itemmap.put("detailList", detailList);
+ }else {//鏈夐渶瑕佸悓鏋剁殑灞�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), splitTechNumbers(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,splitTechNumbers(compound),landingSequence);
+ 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);
- }
}
//宸ヨ壓娴佺▼
@@ -343,7 +489,7 @@
}
itemmap.put("processList", processList);
- // itemmap.put("numberList", numberList);
+ // itemmap.put("numberList", numberList);
itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
itemmap.put("remarkList", flowCardMapper.remakList(flowCard.getProcessId()));
list.add(itemmap);
@@ -353,7 +499,108 @@
map.put("data", list);
//鍒濆鍖栧��
- printLike=null;
+ printLike = null;
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintProject(String printProject, String merge, String flashback, String landingSequence) {
+
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ if (merge == null) {
+ merge = "";
+ }
+ List<FlowCard> flowCardList = flowCardMapper.getFlowCardListPrintProject(printProject);
+ if (!flowCardList.isEmpty()) {
+ Set<String> processedKeys = new HashSet<>();
+
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+
+ String processId = flowCard.getProcessId();
+ Integer orderNumber = flowCard.getOrderNumber();
+ String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
+ //鏄惁鍖呭惈鍒囧壊
+ //boolean containsCutting = flowCard.getProcess().contains("鍒囧壊");
+ String processSub = flowCard.getProcess().substring(0, 2);
+ //鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
+ String processName = flowCardMapper.getProcessName(processSub);
+ if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
+ itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ if (flowCard.getPatchState().equals(0)) {
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flashback, landingSequence);
+ itemmap.put("detailList", detailList);
+ } else {
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailLists(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber());
+ itemmap.put("detailList", detailList);
+ }
+
+ } else {
+
+ if (flowCard.getPatchState().equals(0)) {
+ if (merge.equals("1") && flowCard.getMerge().equals(1)) {
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedKeys.add(uniqueKey);
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess(), flashback, landingSequence);
+ itemmap.put("detailList", detailList);
+ } else {
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(), flashback, landingSequence);
+ itemmap.put("detailList", detailList);
+ }
+
+ } else {
+ itemmap.put("detail", flowCardMapper.getPrimaryLists(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId(), flowCard.getQuantity()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(), printProject, flowCard.getQuantity());
+ 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);
+
+ if (flowCard.getPatchState().equals(0)) {
+ itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
+ } else {
+ itemmap.put("count", flowCardList.size());
+ }
+ itemmap.put("state", flowCard.getPatchState());
+ itemmap.put("remarkList", flowCardMapper.remakList(flowCard.getProcessId()));
+ list.add(itemmap);
+
+ }
+ }
+
+ map.put("data", list);
return map;
}
@@ -361,22 +608,52 @@
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 {
+ } else {
return false;
}
}
- public Map<String, Object> getSelectPrintLabelSv(String projectNo,String type) {
+ public Boolean updateProcessCardRack(Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ flowCardMapper.updateProcessCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getRack());
+ }
+ 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")){
+ if (Objects.equals(type, "1")) {
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;
@@ -384,28 +661,40 @@
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);
- //}
-
- }
+ 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.getPrintLabel1(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ list.add(itemmap);
}
- map.put("data", list);
+ }
+ map.put("data", list);
+
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintLabelDetails(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.getPrintLabelDetail(flowCard));
+ 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));
+ map.put("data", flowCardMapper.printFlowCardDetailsMp(processId, technologyNumber, process, flowCard));
return map;
}
@@ -413,13 +702,12 @@
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());
+ 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());
}
}
}
@@ -428,32 +716,109 @@
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);
if (!flowCardList.isEmpty()) {
- Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
- if (lableType != 2){
+ Set<String> processedKeys = new HashSet<>();
+ if (lableType != 2) {//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
String processId = flowCard.getProcessId();
+ Integer orderNumber = flowCard.getOrderNumber();
+ String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
+ if (isRepeat=="false"){//鏍规嵁mse浼犺繃鏉ョ殑鍊煎垽鏂槸鍚﹀幓闄ら噸澶�
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
+ }
+
+ 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<>();
+ String orderNumber = "";
+ if (flowCard.getOrderNumber() != null) {
+ orderNumber = String.valueOf(flowCard.getOrderNumber());
+ }
+ // 鍒ゆ柇鏄惁涓洪潪绌哄瓧绗︿覆
+ if (orderNumber != null && !orderNumber.trim().isEmpty()) {
+
+ List<Map<String, Object>> customDataSemi =flowCardMapper.getPrintCustomDataSemi(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess(),
+ flowCard.getOrderNumber(), flowCard.getPrintQuantity());
+ for (Map<String, Object> dataMap : customDataSemi) {
+ dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
+ flowCard.getProcessId(),
+ dataMap.get("technologyNumber").toString(),
+ flowCard.getOrderNumber()
+ ));
+ }
+ itemmap.put("data", customDataSemi);
+ } else {
+ //鐢ㄤ簬澶╂触鐜板満娴佺▼鍗℃墦鍗扮晫闈㈢殑灏忕墖鏍囩鎵撳嵃
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess(), flowCard.getPrintQuantity()
+ ));
+ }
+ list.add(itemmap);
+ }
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelSv2(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> processedKeys = new HashSet<>();
+ if (lableType != 2) {//鎴愬搧鏍囩
+ for (FlowCard flowCard : flowCardList) {
+ String processId = flowCard.getProcessId();
+ Integer orderNumber = flowCard.getOrderNumber();
+ String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
// 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
- if (processedProcessIds.contains(processId)) {
+ if (processedKeys.contains(uniqueKey)) {
continue;
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomData2(flowCard.getProcessId()));
list.add(itemmap);
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
- processedProcessIds.add(processId);
+ processedKeys.add(uniqueKey);
}
- }
- else{
+ } 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(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
@@ -465,7 +830,7 @@
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));
+ map.put("data", flowCardMapper.getCustomLabelDetailMp(name, form, id, flowCard));
return map;
}
@@ -474,7 +839,7 @@
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
// 鏇存柊鎵撳嵃鐘舵��
- flowCardMapper.updatePrintStateMp(printState,flowCard.getProcessId(),flowCard.getTechnologyNumber());
+ flowCardMapper.updatePrintStateMp(printState, flowCard.getProcessId(), flowCard.getTechnologyNumber());
}
return true;
} else {
@@ -493,18 +858,18 @@
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());
+ 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= "";
+ public Map<String, Object> getSelectPrintingRefundSv(Map<String, Object> object, String printMerge, String printLike, String mergeTechnologyNumber) {
+ if (printMerge == null) {
+ printMerge = "";
}
- if (printLike == null){
- printLike= "";
+ if (printLike == null) {
+ printLike = "";
}
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
@@ -514,32 +879,32 @@
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());
+ if (printMerge.equals("") || printMerge.equals("null")) {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), mergeTechnologyNumber, flowCard.getPatchReason(), flowCard.getOrderId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getPatchReason());
itemmap.put("detailList", detailList);
- }
- else {
+ } else {
//娴佺▼鍗℃槑缁嗘暟鎹�
- if (printLike.equals("")||printLike.equals("null") ){
- itemmap.put("detail", flowCardMapper.getPrimaryListMergeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));
+ if (printLike.equals("") || printLike.equals("null")) {
+ itemmap.put("detail", flowCardMapper.getPrimaryListMergeRefund(flowCard.getProcessId(), printMerge, flowCard.getOrderNumber(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getPatchReason());
itemmap.put("detailList", detailList);
- }
- else {
- itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(), flowCard.getReportingWorkId()));
+ } else {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), mergeTechnologyNumber, flowCard.getPatchReason(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,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());
-
+ //宸ュ簭鍒楄〃
+ List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
itemmap.put("processList", processList);
+ itemmap.put("processNameList", processNameList);
// itemmap.put("numberList", numberList);
list.add(itemmap);
@@ -547,16 +912,16 @@
}
map.put("data", list);
//鍒濆鍖栧��
- printLike=null;
+ printLike = null;
return map;
}
public Map<String, Object> getSelectPrinReworkSv(Map<String, Object> object, String printMerge, String printLike) {
- if (printMerge == null){
- printMerge= "";
+ if (printMerge == null) {
+ printMerge = "";
}
- if (printLike == null){
- printLike= "";
+ if (printLike == null) {
+ printLike = "";
}
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
@@ -566,24 +931,22 @@
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());
+ if (printMerge.equals("") || printMerge.equals("null")) {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getOrderId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId());
itemmap.put("detailList", detailList);
- }
- else {
+ } else {
//娴佺▼鍗℃槑缁嗘暟鎹�
- if (printLike.equals("")||printLike.equals("null") ){
- itemmap.put("detail", flowCardMapper.getPrimaryListMergeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));
+ if (printLike.equals("") || printLike.equals("null")) {
+ itemmap.put("detail", flowCardMapper.getPrimaryListMergeRework(flowCard.getProcessId(), printMerge, flowCard.getOrderNumber(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), 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 {
- itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber(), flowCard.getReportingWorkId()));
+ } else {
+ itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge, flowCard.getOrderNumber(), flowCard.getReportingWorkId());
itemmap.put("detailList", detailList);
}
}
@@ -599,48 +962,112 @@
}
map.put("data", list);
//鍒濆鍖栧��
- printLike=null;
+ printLike = null;
return map;
}
- public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode) {
+ public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode, Integer type) {
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 (type == 1) {//鏄庣粏鎵撳嵃
itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
+ } else if (type == 2) {//鏄庣粏鍒嗘灦鎵撳嵃
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp1(flowCard.getOrderId()));
+ }else if (type == 3) {//璁㈠崟鎵撳嵃
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp2(flowCard.getOrderId()));
+ }
+
list.add(itemmap);
}
}
map.put("data", list);
+ map.put("orderOtherMoney", flowCardMapper.selectorderOtherMoney());
map.put("type", flowCardMapper.selectType());
return map;
}
public Map<String, Object> getSelectPrintCustomLabelDetailsSv(String type, Integer lableType, Map<String, Object> object) {
+ String landingSequence = "";
+ if (object.get("landingSequence") != null) {
+ landingSequence = object.get("landingSequence").toString();
+ }
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> processedKeys = new HashSet<>();
- if (lableType != 2){
+ 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);
+ String orderId = flowCard.getOrderId();
+ String processId = flowCard.getProcessId();
+ String orderNumber = flowCard.getOrderNumber().toString();
+ String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
+ if (processId!=null){
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
+ Map<String, Object> itemmap = new HashMap<>();
+ Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
+ List<Map<String, Object>> details = flowCardMapper.getPrintCustomDataDetails(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{
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintOrderDataDetails(flowCard.getOrderId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
+ list.add(itemmap);
+ }
+
}
- }
- else{
+ } 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(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
}
+
+ if (!"1".equals(landingSequence)) {
+ // 鏋勯�犱竴涓厛鎸夌煭杈广�佸啀鎸夐暱杈圭殑姣旇緝鍣�
+ Comparator<Map<String,Object>> comparator = Comparator
+ .comparingDouble((Map<String,Object> m) -> {
+ Map<String,Object> first = ((List<Map<String,Object>>)m.get("data")).get(0);
+ double w = ((Number) first.get("width")).doubleValue();
+ double h = ((Number) first.get("height")).doubleValue();
+ return Math.min(w, h);
+ })
+ .thenComparingDouble(m -> {
+ Map<String,Object> first = ((List<Map<String,Object>>)m.get("data")).get(0);
+ double w = ((Number) first.get("width")).doubleValue();
+ double h = ((Number) first.get("height")).doubleValue();
+ return Math.max(w, h);
+ });
+
+ // 瀵规暣涓� list 鎺掑簭锛屽苟鏁翠綋鍙嶈浆锛岀煭杈瑰ぇ鈫掑墠锛岀煭杈圭浉鍚屾椂闀胯竟澶р啋鍓�
+ list.sort(comparator.reversed());
+ }
map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Map<String, Object> getPrintCustomDataProjectNo(String type, String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getPrintCustomDataProjectNo(projectNo));
map.put("title", flowCardMapper.getPrintTitle(type));
return map;
}
@@ -663,6 +1090,674 @@
}
+
+ public String mergeFlowCard(Map<String, Object> object, Integer merge) {
+ String returns = "false";
+ 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 (merge == 0){
+ 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";
+ }
+ }
+ }else {//鍙栨秷鍚堝苟
+ flowCardMapper.updateFlowCardIsMerge(flowCardList.get(0).getProcessId());
+ returns = "true";
+ }
+
+ }
+
+ return returns;
+
+
+ }
+
+ public List<FlowCard> getProcessCard(Map<String, String> processCards) {
+ String processCard = processCards.get("processCard");
+ if (!processCard.contains("/")) {
+ throw new ServiceException(Constants.Code_600, "閿欒鐨勬祦绋嬪崱鍙凤紝璇锋鏌�!");
+ }
+
+ String[] processCardList = processCard.split("/");
+ List<String> result = IntStream.range(0, processCardList[1].length())
+ .mapToObj(i -> String.valueOf(processCardList[1].charAt(i)))
+ .collect(Collectors.toList());
+
+ List<FlowCard> flowCardList = flowCardMapper.selectList(
+ new QueryWrapper<FlowCard>()
+ .eq("process_id", processCardList[0])
+ .in("technology_number", result)
+ );
+ for (FlowCard flowCard : flowCardList) {
+ flowCard.setOrderGlassDetail(
+ orderGlassDetailMapper.selectOne(
+ new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", flowCard.getOrderId())
+ .eq("order_number", flowCard.getOrderNumber())
+ .eq("technology_number", flowCard.getTechnologyNumber())
+ )
+ );
+ String str = flowCard.getOrderGlassDetail().getGlassChild();
+ String delimiter = "mm";
+ int index = str.indexOf(delimiter);
+ Integer subString = Integer.valueOf(str.substring(0, index).trim());
+ flowCard.getOrderGlassDetail().setThickness(subString);
+ }
+ return flowCardList;
+ }
+
+ public Map<String,Object> getProcessCardAll(Map<String, String> processCards) {
+ String processCard = processCards.get("processCard");
+ if (!processCard.contains("/")) {
+ throw new ServiceException(Constants.Code_600, "閿欒鐨勬祦绋嬪崱鍙凤紝璇锋鏌�!");
+ }
+
+ String[] processCardList = processCard.split("/");
+ List<String> result = IntStream.range(0, processCardList[1].length())
+ .mapToObj(i -> String.valueOf(processCardList[1].charAt(i)))
+ .collect(Collectors.toList());
+
+ List<FlowCard> flowCardList = flowCardMapper.selectList(
+ new QueryWrapper<FlowCard>()
+ .eq("process_id", processCardList[0])
+ .in("technology_number", result)
+ );
+ for (FlowCard flowCard : flowCardList) {
+ flowCard.setOrderGlassDetail(
+ orderGlassDetailMapper.selectOne(
+ new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", flowCard.getOrderId())
+ .eq("order_number", flowCard.getOrderNumber())
+ .eq("technology_number", flowCard.getTechnologyNumber())
+ )
+ );
+ String str = flowCard.getOrderGlassDetail().getGlassChild();
+ String delimiter = "mm";
+ int index = str.indexOf(delimiter);
+ Integer subString = Integer.valueOf(str.substring(0, index).trim());
+ flowCard.getOrderGlassDetail().setThickness(subString);
+ }
+ OrderDetail orderDetail = orderDetailMapper
+ .selectOne(new QueryWrapper<OrderDetail>()
+ .eq("order_id", flowCardList.get(0).getOrderId())
+ .eq("order_number", flowCardList.get(0).getOrderNumber())
+ );
+ Product product = productMapper
+ .selectOne(new QueryWrapper<Product>()
+ .eq("id",orderDetail.getProductId()));
+ product.setProductDetails(productDetailMapper
+ .selectList(new QueryWrapper<ProductDetail>()
+ .eq("prod_id",orderDetail.getProductId())
+ )
+ );
+
+ Order order = orderMapper.
+ selectOne(new QueryWrapper<Order>()
+ .eq("order_id", flowCardList.get(0).getOrderId()));
+ order.setMoney(null);
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("product",product);
+ map.put("flowCard",flowCardList);
+ map.put("order",order);
+
+
+ return map;
+ }
+
+
+ public Boolean checkboxDeleteSv(Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ String userId = "";
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ for (FlowCard flowCard : flowCardList) {
+ //鏌ヨ鏄惁鎶ュ伐
+ Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
+ if (count == 0) {
+ //淇敼鍒嗘灦鐘舵��
+ flowCardMapper.updateDeleteState(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒犻櫎鎶ュ伐娴佺▼鏄庣粏琛ㄦ暟鎹�
+ flowCardMapper.deleteReportingWork(flowCard.getProcessId());
+ //鍒犻櫎鍒嗘灦鏄庣粏
+ flowCardMapper.deleteFlowCardMp(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒犻櫎鎺掑簭琛ㄦ暟鎹�
+ flowCardMapper.deleteflowCardSort(flowCard.getOrderId(), flowCard.getProcessId());
+ //鍒ゆ柇璇ヨ鍗曟祦绋嬪崱鏄惁鍏ㄩ儴鍒犻櫎
+ Integer flowNumber = flowCardMapper.selectFlowCardCount(flowCard.getOrderId());
+ if (flowNumber == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负0,鍏ㄩ儴鍒犻櫎
+ flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 0);
+ } else {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鍒犻櫎閮ㄥ垎
+ flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 1);
+ }
+
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(flowCard.getOrderId() + flowCard.getProcessId());
+ log.setFunction("checkboxDeleteSv娴佺▼鍗″垹闄�");
+ log.setOperatorId(userId);
+ log.setOperator(userName);
+ logService.saveLog(log);
+ } else {
+ return false;
+ }
+ }
+ return true;
+
+
+ }
+
+ public Map<String, Object> getPrintProjectDetails(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getPrintProjectDetailsMp(projectNo));
+ return map;
+ }
+
+ public Map<String, Object> selectPrintProjectDetailSmallPiece(Map<String, Object> object) throws JsonProcessingException {
+ Map<String, Object> map = new HashMap<>();
+ String projectNo=object.get("projectNo").toString();
+ String stockIdsStr=object.get("stockId").toString();
+ ObjectMapper objectMapper = new ObjectMapper();
+ if (stockIdsStr != null && !stockIdsStr.isEmpty()) {
+ List<Integer> list = objectMapper.readValue(stockIdsStr, new TypeReference<List<Integer>>() {});
+ map.put("data", flowCardMapper.getPrintProjectDetailsMpSp(projectNo,list));
+ }
+
+ return map;
+ }
+
+ 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);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //鏄惁鏄伐绋嬫槑缁嗘墦鍗�
+ if (detailType == 0) {//宸ョ▼鎵撳嵃鏄庣粏
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(), flowCard.getStockId(),flowCard.getPolysId()));
+
+
+ }
+ //闈炲伐绋嬫墦鍗�
+ else if (detailType == 1) {
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
+
+ } else {
+ itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
+
+ }
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Boolean updateProcessSv(String processId,String orderNumber, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
+ List<OrderProcessDetail> resultList = new ArrayList<>();
+ //鑾峰彇宸叉姤宸ュ伐鑹烘祦绋�
+ String processOk = flowCardMapper.getProcessOk(processId,orderNumber,technologyNumber);
+ if (processOk != null && !processOk.isEmpty()){
+ List<String> okList = Arrays.asList(processOk.split("->"));
+ List<String> orderList = Arrays.asList(Orderprocess.split("->"));
+
+ // 鍒ゆ柇 processOk 鐨勬瘡涓伐搴忔槸鍚﹂兘鍖呭惈鍦� orderProcess 涓�
+ for (String p : okList) {
+ if (!orderList.contains(p)) {
+ return false;
+ }
+ }
+
+
+
+ for (String process : okList) {
+ List<OrderProcessDetail> details =
+ flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);
+
+ if (details != null && !details.isEmpty()) {
+ resultList.addAll(details);
+ }
+ }
+ }
+
+ //鍒犻櫎灏忕墖宸ヨ壓琛ㄥ搴旂殑鏁版嵁
+ 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);
+ }
+ }
+ }
+ //灏嗗師鏉ュ凡鎶ュ伐鐨勬暟鎹洿鏂�
+ if (resultList != null && !resultList.isEmpty()) {
+ for (OrderProcessDetail d : resultList) {
+ flowCardMapper.updateOrderProcessDetail(d.getProcessId(),d.getOrderNumber(),d.getTechnologyNumber(),
+ d.getReportingWorkNumCount(),d.getReportingWorkNum(),d.getBrokenNum(),d.getProcess());
+
+ }
+ }
+ return true;
+
+ }
+
+ public Integer updateProjectLabelPrintCount(String projectNo) {
+ flowCardMapper.updateProjectLabelPrintCount(projectNo);
+ return flowCardMapper.selectProjectLabelPrintCount(projectNo);
+ }
+
+ public Integer updateProjectProcessPrintCount(String projectNo) {
+ flowCardMapper.updateProjectProcessPrintCount(projectNo);
+ return flowCardMapper.selectProjectProcessPrintCount(projectNo);
+ }
+
+
+ public Map<String, Object> flowCardDetail(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("detail", flowCardMapper.getFlowCardDetail(flowCard.getProcessId()));
+ list.add(itemmap);
+
+ }
+ }
+
+ map.put("data", list);
+ return map;
+ }
+
+ public Object processCardAutoRack(Map<String, Object> object) {
+ String orderId = object.get("orderId").toString();
+ String productionId = object.get("productionId").toString();
+ Integer inMaxQuantity = Integer.parseInt(object.get("inMaxQuantity").toString());
+ Float inWeight = Float.parseFloat(object.get("inWeight").toString());
+ Float shelfThickness = Float.parseFloat(object.get("shelfThickness").toString());
+ Float spacerThickness = Float.parseFloat(object.get("spacerThickness").toString());
+ Float inLenMax = Float.parseFloat(object.get("inLenMax").toString());
+ Float inLenMin = Float.parseFloat(object.get("inLenMin").toString());
+ Float inShortMax = Float.parseFloat(object.get("inShortMax").toString());
+ Float inShortMin = Float.parseFloat(object.get("inShortMin").toString());
+
+ /*String orderId = "NG25000004";
+ String productionId = "NG25000004A";
+ Integer inMaxQuantity = 1;
+ Float inWeight = 4000.0f;
+ Float shelfThickness = 2000.0f;
+ Float maxHeight = 1520.0f;
+ Float maxWid = 400.0f;
+ Float spacerThickness = 0.0f;//鍨墖鍘氬害*/
+
+
+ Map<String, Object> thickness = flowCardMapper.getGlassThicknessByProdutionId(orderId, productionId);
+
+ //鎴愬搧鐜荤拑鎬诲帤搴�
+ Float glassTotalThickness = Float.parseFloat(thickness.get("totalThickness").toString());
+ //鎴愬搧鐜荤拑鍘氬害
+ Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());
+
+ //鑾峰彇姝ゅ伐绋嬪彿璁㈠崟鏄庣粏淇℃伅
+ List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"scope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);
+ List<OrderDetail> orderDetailsNotScope = flowCardMapper.getOrderDetailByProductionId(orderId, productionId,"notScope",inLenMax,inLenMin,inShortMax,inShortMin,glassThickness);
+
+ //鏍规嵁鐜荤拑鍘氬害鍜屽灚鐗囧帤搴﹀綋鍓嶆灦瀛愭渶澶у彲鏀炬暟閲�
+ Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness + spacerThickness));
+
+ //鐢ㄤ簬鎺ユ敹鏈�缁堢敓鎴愮殑娴佺▼鍗�
+ List<OrderDetail> orderDetailList = new ArrayList<>();
+
+ //娴佺▼鍗¤嚜澧炵鍙�
+ int flowCardNo = 1;
+ // 褰撳墠鏋跺瓙鍓╀綑鍙斁鏁伴噺
+ Integer shelfQuantity = 0;
+ for (OrderDetail orderDetail : orderDetails) {
+ //鏋跺瓙鏍规嵁灏哄閲嶉噺鏈�澶ц兘鏀惧灏�
+ int shelfQuantityByWeight = (int) (inWeight /
+ (orderDetail.getHeight()
+ * orderDetail.getWidth()
+ * glassThickness
+ * 2.5 / 1000000)
+ );
+ //褰撳墠璁㈠崟鏄庣粏鍓╀綑鏁伴噺
+ if (shelfQuantity == 0) {
+ shelfQuantity =Math.min( Math.min(shelfMaxQuantityByThickness,inMaxQuantity),shelfQuantityByWeight);
+ }else if(shelfQuantity>0){//鏋跺瓙鍓╀綑鏁伴噺澶т簬0鏃讹紝鍒ゆ柇褰撳墠鏋跺瓙鍓╀綑閲嶉噺锛屾槸鍚︽敮鎸佹渶鏂板簭鍙风殑鐨勬垚鍝侀噸閲�
+ String FlowCardId = orderDetailList.get(orderDetailList.size() - 1).getProcessId();
+ double flowCardWeight = 0.0;
+ for (OrderDetail orderDetail1 : orderDetailList) {
+ if (orderDetail1.getProcessId().equals(FlowCardId)) {
+ flowCardWeight += orderDetail1.getHeight()*orderDetail1.getQuantity()* orderDetail1.getWidth()* glassThickness* 2.5 / 1000000;
+ }
+ }
+ if(flowCardWeight>0){
+ flowCardWeight = inWeight - flowCardWeight;
+ //鎸夌収褰撳墠娴佺▼鍗″墿浣欓噸閲忥紝璁＄畻褰撳墠娴佺▼鍗″墿浣欐暟閲�
+ int remainingQuantity = (int) (flowCardWeight /
+ (orderDetail.getHeight()
+ * orderDetail.getWidth()
+ * glassThickness
+ * 2.5 / 1000000));
+ shelfQuantity =Math.min(Math.min(Math.min(shelfQuantityByWeight, Math.min(inMaxQuantity, shelfMaxQuantityByThickness)),shelfQuantity),remainingQuantity);
+ if (shelfQuantity == 0) {
+ shelfQuantity = Math.min(shelfQuantityByWeight, Math.min(inMaxQuantity, shelfMaxQuantityByThickness));
+ flowCardNo += 1;
+ }
+ }
+
+ }
+ //鍙栨渶灏忓��
+ //Integer maxQuantity = 0;
+ while (orderDetail.getQuantity() > 0) {
+ OrderDetail newOrderDetail = new OrderDetail();
+ //褰撴寰幆涓紝褰撳墠鏋跺瓙鍓╀綑鏁伴噺涓�0鏃讹紝閲嶆柊璁＄畻鏋跺瓙鍓╀綑鏁伴噺
+ if (shelfQuantity == 0) {
+ shelfQuantity = Math.min(Math.min(shelfMaxQuantityByThickness,inMaxQuantity),shelfQuantityByWeight);
+ }
+ String processId = productionId + String.format("%03d", flowCardNo);
+ //鍙栨渶灏忓��
+ //maxQuantity = Math.min(shelfQuantity, Math.min(inMaxQuantity, shelfMaxQuantityByThickness));
+ //maxQuantity = Math.min(shelfQuantity, shelfMaxQuantityByThickness);
+
+ /*System.out.println("璁㈠崟搴忓彿锛�"+orderDetail.getOrderNumber());
+ System.out.println(shelfQuantity + "," + "," + shelfMaxQuantityByThickness);
+ System.out.println(flowCardNo + "," + maxQuantity);
+ System.out.println("------");*/
+ if(shelfQuantity<=0){
+ return false;
+ }
+
+ if (orderDetail.getQuantity() > shelfQuantity) {
+ newOrderDetail.setProcessId(processId);
+ newOrderDetail.setLongSide(orderDetail.getLongSide());
+ newOrderDetail.setShortSide(orderDetail.getShortSide());
+ newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());
+ newOrderDetail.setQuantity(Long.valueOf(shelfQuantity));
+ newOrderDetail.setHeight(orderDetail.getHeight());
+ newOrderDetail.setWidth(orderDetail.getWidth());
+ newOrderDetail.setOrderNumber(orderDetail.getOrderNumber());
+ newOrderDetail.setShape(orderDetail.getShape());
+ newOrderDetail.setLandingSequence(flowCardNo);
+ orderDetailList.add(newOrderDetail);
+ orderDetail.setQuantity(orderDetail.getQuantity() - shelfQuantity);
+ orderDetail.setBaiscQuantity(String.valueOf(Integer.valueOf(orderDetail.getBaiscQuantity())-shelfQuantity));
+ flowCardNo += 1;
+ shelfQuantity = shelfQuantity - shelfQuantity;
+ } else {
+ newOrderDetail.setProcessId(processId);
+ newOrderDetail.setLongSide(orderDetail.getLongSide());
+ newOrderDetail.setShortSide(orderDetail.getShortSide());
+ newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());
+
+ newOrderDetail.setQuantity(orderDetail.getQuantity());
+ newOrderDetail.setHeight(orderDetail.getHeight());
+ newOrderDetail.setWidth(orderDetail.getWidth());
+ newOrderDetail.setOrderNumber(orderDetail.getOrderNumber());
+ newOrderDetail.setShape(orderDetail.getShape());
+ newOrderDetail.setLandingSequence(flowCardNo);
+ newOrderDetail.setBaiscQuantity(String.valueOf(orderDetail.getBaiscQuantity()));
+ orderDetailList.add(newOrderDetail);
+ //褰撳墠鏋跺瓙鍓╀綑鏁伴噺
+ shelfQuantity = shelfQuantity - Math.toIntExact(orderDetail.getQuantity());
+ if (shelfQuantity == 0) {
+ flowCardNo += 1;
+ }
+ orderDetail.setQuantity(0L);
+ }
+ }
+
+ }
+ Map<String, Object> map = new HashMap<>();
+ Collections.reverse(orderDetailList);
+ map.put("orderDetailList", orderDetailList);
+ map.put("orderDetailsNotScope", orderDetailsNotScope);
+ return map;
+ }
+
+
+ public Boolean revokeComposingSv(Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ //鑾峰彇娌℃湁宸ョ▼鍙风殑鏉℃暟锛屽凡鐢熸垚宸ョ▼鍙蜂笉鑳芥挙鍥�
+ Integer count = flowCardMapper.selectProjectNo(flowCard.getProcessId());
+ if (count == 0){
+ flowCardMapper.revokeComposing(flowCard.getProcessId());
+ } else {
+ return false;
+ }
+
+ }
+ return true;
+ } else {
+ return false;
+
+ }
+ }
+
+
+ public List exportDateProcessSv(Map<String, Object> dates) {
+ 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;
+ }
+
+ public Boolean updateTerminationSv(String processId, Integer orderNumber, Integer value) {
+ if (processId!=""){
+
+ flowCardMapper.updateTerminationMp(processId,orderNumber,value);
+ //鑾峰彇缁堟鏁伴噺涓庢祦绋嬪崱鏁伴噺姣旇緝
+ Map<String, Object> data = flowCardMapper.getTerminationQuantity(processId,orderNumber);
+ Integer terminationNum = (Integer) data.get("termination_quantity");
+ Integer totalNum = (Integer) data.get("quantity");
+ if (terminationNum==totalNum){
+ flowCardMapper.updateTerminationStatus(processId,orderNumber);
+ }
+ return true;
+ }else {
+ return false;
+ }
+
+ }
+
+ public Boolean updateTerminationNoSv(String processId, Integer orderNumber) {
+ if (processId!=""){
+ flowCardMapper.updateTerminationNoMp(processId,orderNumber);
+
+ return true;
+ }else {
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectCompletedSv(String processId, Integer orderNumber, String process) {
+ Map<String, Object> map = new HashMap<>();
+ String[] processList = process.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ map.put("data", flowCardMapper.selectCompletedMp(processId, orderNumber,interceptProcess));
+
+ return map;
+ }
+
+// public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object, String printMerge, String printLike, String mergeTechnologyNumber) {
+// 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()) {
+// Set<String> processedKeys = new HashSet<>();
+// for (FlowCard flowCard : flowCardList) {
+// String batch = flowCard.getOrder().getBatch();
+// String glassChild = flowCard.getGlassChild();
+// Map<String, Object> itemmap = new HashMap<>();
+// //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+// itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), mergeTechnologyNumber, flowCard.getPatchReason(), flowCard.getOrderId()));
+//
+// List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getPatchReason());
+// itemmap.put("detailList", detailList);
+// //宸ヨ壓娴佺▼
+// List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+// //宸ュ簭鍒楄〃
+// List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+// itemmap.put("processList", processList);
+// itemmap.put("processNameList", processNameList);
+// // itemmap.put("numberList", numberList);
+// list.add(itemmap);
+//
+// }
+// }
+// map.put("data", list);
+// //鍒濆鍖栧��
+// printLike = null;
+// return map;
+// }
+
+ public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object,
+ String printMerge,
+ String printLike,
+ String mergeTechnologyNumber) {
+ if (printMerge == null) printMerge = "";
+ if (printLike == null) printLike = "";
+
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ List<FlowCard> flowCardList = JSONArray.parseArray(
+ JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+
+ if (!flowCardList.isEmpty()) {
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勫悎骞� detailList
+ Map<String, List<Map<String, Object>>> keyToDetails = new LinkedHashMap<>();
+
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勭涓�涓� flowCard锛岀敤浜庣敓鎴� itemmap 琛ㄥご绛変俊鎭�
+ Map<String, FlowCard> keyToFirstFlowCard = new HashMap<>();
+
+ for (FlowCard flowCard : flowCardList) {
+ String batch = flowCard.getBatch();
+ String glassChild = flowCard.getProductName();
+ String key = batch + "_" + glassChild;
+
+ List<Map<String, Object>> currentDetailList = flowCardMapper.getDetailListRefund(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getOrderNumber(),
+ flowCard.getReportingWorkId(),
+ flowCard.getPatchReason()
+ );
+
+ for (Map<String, Object> detail : currentDetailList) {
+ detail.put("processId", flowCard.getProcessId());
+ detail.put("technologyNumber", flowCard.getTechnologyNumber());
+ }
+
+ // 鍚堝苟 detailList 鍒板搴� key
+ keyToDetails.computeIfAbsent(key, k -> new ArrayList<>()).addAll(currentDetailList);
+
+ // 淇濆瓨绗竴娆″嚭鐜扮殑 flowCard锛岀敤浜庣敓鎴� itemmap
+ keyToFirstFlowCard.putIfAbsent(key, flowCard);
+ }
+
+ // 閬嶅巻鍚堝苟鍚庣殑 key锛岀敓鎴� itemmap
+ for (Map.Entry<String, List<Map<String, Object>>> entry : keyToDetails.entrySet()) {
+ String key = entry.getKey();
+ List<Map<String, Object>> mergedDetailList = entry.getValue();
+
+ FlowCard firstFlowCard = keyToFirstFlowCard.get(key);
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detailList", mergedDetailList);
+
+ // 琛ㄥご琛ㄥ熬
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefundHB(
+ firstFlowCard.getProcessId(),
+ String.valueOf(firstFlowCard.getTechnologyNumber()),
+ firstFlowCard.getOrderNumber(),
+ firstFlowCard.getReportingWorkId(),
+ mergeTechnologyNumber,
+ firstFlowCard.getPatchReason(),
+ firstFlowCard.getOrderId()
+ ));
+
+ // 宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(
+ firstFlowCard.getProcessId(),
+ firstFlowCard.getTechnologyNumber()
+ );
+
+ // 宸ュ簭鍒楄〃
+ List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+
+ itemmap.put("processList", processList);
+ itemmap.put("processNameList", processNameList);
+
+ list.add(itemmap);
+ }
+ }
+
+ map.put("data", list);
+ return map;
+ }
+
+
+ public Result selectProcessCardProgressSv(Map<String, String> object) {
+ String orderId = object.get("orderId");
+ String processId = object.get("processId");
+ String orderNumber = object.get("orderNumber");
+ String technologyNumber = object.get("technologyNumber");
+ String process = object.get("process");
+ Result result = new Result();
+ //褰撴祦绋嬪崱鍜岃鍗曞彿閮戒负绌烘椂锛岃繑鍥炴彁绀轰俊鎭�
+ if (orderId == null &&processId == null){
+ result.setCode(Constants.Code_600);
+ result.setMsg("Please enter at least one parameter for the order number and the process card.");
+ return result;
+ }
+ return result.success(
+ orderProcessDetailMapper
+ .selectProcessCardProgressSv( orderId, processId, orderNumber, technologyNumber, process)
+ );
+
+ }
+
}
--
Gitblit v1.8.0