From 2e2356dd4fec268f6be6ed923b14bfa667de0c0d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期六, 21 六月 2025 16:02:54 +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 | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 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..e41fea7 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,16 +7,14 @@
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
@@ -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;
}
//娴佺▼鍗＄鐞嗘煡璇�
@@ -957,6 +964,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 = "";
if (object.get("userName") != null) {
@@ -1257,6 +1324,8 @@
}
}
+
+
}
--
Gitblit v1.8.0