From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index c7d0c18..ec5ea6a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -1,12 +1,14 @@
 package com.example.erp.mapper.pp;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.pp.FlowCardDTO;
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.sd.OrderDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -16,10 +18,10 @@
 @Mapper
 public interface FlowCardMapper extends BaseMapper<FlowCard> {
     //娴佺▼鍗＄鐞嗘煡璇�
-    List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+    List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
 
     //鍒嗛〉鏌ヨ
-    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏁版嵁鏌ヨ
     List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
@@ -71,7 +73,7 @@
     Boolean deleteReportingWork(String processId);
     Boolean deleteReportingWorkByOrderId(String orderId);
 
-    List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+    List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
 
     List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
 
@@ -81,7 +83,7 @@
 
     List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
 
-    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
+    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback, String landingSequence);
 
     List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
 
@@ -135,9 +137,9 @@
 
     List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
+    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback, String landingSequence);
 
-    List<Map<String, Object>> getDetailListMerge(String processId, String process);
+    List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback, String landingSequence);
 
     List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
 
@@ -230,5 +232,33 @@
 
     Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
 
-    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId);
+    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId, String type, Float inLenMax, Float inLenMin, Float inShortMax, Float inShortMin, Float glassThickness);
+
+    Boolean revokeComposing(String processId);
+
+    Integer selectProjectNo(String processId);
+
+    List<Map<String, String>> selectPrintDetailsMp2(String orderId);
+
+    List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
+
+    Boolean updatePrintNumberMp(String processId, Integer orderNumber);
+
+    String getOrderIdByProcessId(String processId);
+
+    Boolean updateFlowCardIsMerge(String processId);
+
+    Integer flowCardDetailMergeMp(String processId);
+
+    String getProcessName(String processSub);
+
+    List<Map<String, Object>> getProcessNameList();
+
+    List<FlowCardDTO> exportDateProcessMp(List<LocalDate> date);
+
+    Integer getSumQuantity(String orderId);
+
+    List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
+
+    List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
 }

--
Gitblit v1.8.0