From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 215 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 183 insertions(+), 32 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 7872e80..d433dfe 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
@@ -7,18 +7,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
-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.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
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.sd.*;
import com.example.erp.service.userInfo.LogService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
+import java.awt.*;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -45,12 +43,21 @@
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;
+
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper, OrderMapper orderMapper) {
this.flowCardMapper = flowCardMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.logService = logService;
+ this.productMapper = productMapper;
+ this.productDetailMapper = productDetailMapper;
+ this.orderDetailMapper = orderDetailMapper;
+ this.orderMapper = orderMapper;
}
//娴佺▼鍗＄鐞嗘煡璇�
@@ -290,7 +297,7 @@
}
}
- public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge) {
+ 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 = "";
}
@@ -319,12 +326,23 @@
//鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
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()));
+ 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);
+ if (compound == null
+ || "null".equals(compound)
+ || compound.trim().isEmpty()){
+ 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.getDetailCompoundList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flashback,compound,landingSequence);
+ itemmap.put("detailList", detailList);
+ }
} else {
- if (merge.equals("1") && flowCard.getMerge().equals(1)) {
+ if (merge.equals("1") && flowCard.getMerge().equals(1)) {//鍚�
// 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
if (processedKeys.contains(uniqueKey)) {
continue;
@@ -332,29 +350,38 @@
// 灏嗚 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());
+ 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());
- itemmap.put("detailList", detailList);
+ 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(),flashback,landingSequence);
+ itemmap.put("detailList", detailList);
+ }else {//鏈夐渶瑕佸悓鏋剁殑灞�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeCompound(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(),flashback,compound,landingSequence);
+ itemmap.put("detailList", detailList);
+ }
}
}
- } else {
+ } else {//鍚�
//娴佺▼鍗℃槑缁嗘暟鎹�
if (printLike.equals("") || printLike.equals("null")) {
itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge, flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), 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(), printMerge, flowCard.getProcess());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), printMerge, flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
}
}
@@ -394,7 +421,7 @@
return map;
}
- public Map<String, Object> getSelectPrintProject(String printProject, String merge) {
+ 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>>();//鏈�缁堢粨鏋�
@@ -419,7 +446,7 @@
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());
+ 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());
@@ -438,11 +465,11 @@
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());
+ 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());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getProcess(), flashback, landingSequence);
itemmap.put("detailList", detailList);
}
@@ -591,6 +618,10 @@
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);
@@ -602,12 +633,15 @@
String processId = flowCard.getProcessId();
Integer orderNumber = flowCard.getOrderNumber();
String uniqueKey = processId + "|" + orderNumber; // 鐢ㄧ壒娈婂瓧绗﹁繛鎺ラ槻姝㈠啿绐�
- // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
- if (processedKeys.contains(uniqueKey)) {
- continue;
+ if (isRepeat=="false"){//鏍规嵁mse浼犺繃鏉ョ殑鍊煎垽鏂槸鍚﹀幓闄ら噸澶�
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedKeys.contains(uniqueKey)) {
+ continue;
+ }
}
+
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
@@ -616,7 +650,27 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess()));
+ String orderNumber = "";
+ if (flowCard.getOrderNumber() != null) {
+ orderNumber = String.valueOf(flowCard.getOrderNumber());
+ }
+ // 鍒ゆ柇鏄惁涓洪潪绌哄瓧绗︿覆
+ if (orderNumber != null && !orderNumber.trim().isEmpty()) {
+
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess(),
+ flowCard.getOrderNumber()
+ ));
+ } else {
+
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getProcess()
+ ));
+ }
list.add(itemmap);
}
}
@@ -652,7 +706,7 @@
} 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()));
list.add(itemmap);
}
}
@@ -819,11 +873,16 @@
}
}
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);
@@ -842,7 +901,13 @@
continue;
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
+ 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 鍔犲叆宸插鐞嗛泦鍚�
@@ -858,10 +923,30 @@
} 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()));
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));
@@ -956,6 +1041,66 @@
}
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 = "";
@@ -1257,6 +1402,12 @@
}
}
+
+
+ public List exportDateProcessSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ return flowCardMapper.exportDateProcessMp(date);
+ }
}
--
Gitblit v1.8.0