From eba3314826d53ff0f7e5679d185baaff84e50354 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 十二月 2025 10:07:56 +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/mapper/pp/FlowCardMapper.java |   96 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 83 insertions(+), 13 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..7acc163 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,15 @@
 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 com.example.erp.entity.sd.OrderProcessDetail;
 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,13 +19,13 @@
 @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);
+    List<FlowCard> selectFlowCardMp(String selectTime1, String selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏄庣粏鏌ヨ
     List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
@@ -71,9 +74,9 @@
     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(String selectTime1, String selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
 
-    List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+    List<Map<String, String>> selectPrintFlowCard(String selectTime1, String selectTime2);
 
     List<Map<String, String>> selectPrintMp(String orderId);
 
@@ -81,7 +84,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);
 
@@ -111,7 +114,7 @@
 
     List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
 
-    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber);
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber, Integer printQuantity);
 
     List<Map<String, Object>>  getPrintCustomData2(String processId);
 
@@ -120,6 +123,9 @@
     List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
     List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+    List<Map<String, Object>> getReworkPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
 
     List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
 
@@ -135,9 +141,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);
 
@@ -157,13 +163,18 @@
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
+
+    List<Map<String, Object>> getgetPrintCustomDataSemiSp(String processId, String technologyNumber, Integer orderNumber);
 
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
     List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 
-    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+    List<Map<String, Object>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+    List<Map<String, String>> getReworkPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
 
     List<Map<String, String>> selectPrintAllMp(String orderId);
 
@@ -202,7 +213,9 @@
 
     List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
 
-    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+    List<Map<String, Object>> getPrintProjectDetailsMpSp(String projectNo,List<Integer> stockId);
+
+    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId,Integer polysId);
 
     List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
 
@@ -230,5 +243,62 @@
 
     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);
+
+    List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
+
+    Integer getLayoutStatus(String processId);
+
+    List<Map<String, String>> selectSortingCardMp(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard);
+
+    Boolean updateTerminationMp(String processId, Integer orderNumber, Integer value);
+
+    Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
+
+    String getProcessOk(String processId,String orderNumber, String technologyNumber);
+
+    List<OrderProcessDetail> getProcessDetail(String processId,String orderNumber, String technologyNumber, String process);
+
+    Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
+                                     int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
+
+    List<Map<String, String>> getPrimaryListRefundHB(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
+
+    Map<String, Object> getTerminationQuantity(String processId, Integer orderNumber);
+
+    Boolean updateTerminationStatus(String processId, Integer orderNumber);
+
+    Boolean updateTerminationNoMp(String processId, Integer orderNumber);
+
+    List<Map<String, Object>> getNewProcessMp(String processId, String orderNumber, String technologyNumber);
+
+    Map<String, Object> getProcessInfo( String processName);
 }

--
Gitblit v1.8.0