From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 |  154 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 126 insertions(+), 28 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 6588ac0..9f2f4cc 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
@@ -2,7 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.util.List;
@@ -14,10 +16,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);
@@ -39,12 +41,14 @@
     //鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
     Integer reportingWorkCount(String processId);
 
+    Integer reportingWorkCountByOrderId(String orderId);
+
     //鎻掑叆Flow_card琛�
     Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);
 
     Boolean updateFlowState(String productionId, Integer orderNumber);
 
-    Integer selectFlowCount(String productionId);
+    Integer selectFlowCount(String orderId);
 
 
     Boolean updateProcessingCard(String productionId, int state);
@@ -65,30 +69,41 @@
     List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
 
     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);
 
     List<Map<String, String>> selectPrintMp(String orderId);
 
-    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
+    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process, String orderId);
 
-    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);
+    List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
 
-    List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
+
+    List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
+
+    List<Map<String, Object>> getProcessList(String processId, String technologyNumber);
 
     Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
 
     Boolean updateComposing(String processId);
 
+    Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);
+
     List<Map<String, String>> getPrintLabel(String projectNo);
 
-    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+    List<Map<String, String>> getPrintLabel2(String projectNo);
+
+    List<Map<String, String>> getPrintLabel1(String processId,String technologyNumber);
+
+    List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
 
     List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
 
-    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+    Boolean printSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);
 
     List<Map<String,String>> selectType();
 
@@ -96,23 +111,25 @@
 
     List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
 
-    List<Map<String, Object>>  getPrintCustomData(String processId, Integer technologyNumber);
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber);
 
-    Integer getPrintLabelCount(String processId, Integer technologyNumber);
+    List<Map<String, Object>>  getPrintCustomData2(String processId);
+
+    Integer getPrintLabelCount(String processId, String technologyNumber);
 
     List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber, String reportingWorkId);
+    List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
 
-    List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+    List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
 
-    Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+    Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);
 
     List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
 
-    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+    Boolean printOrderSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);
 
-    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
+    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber, String orderId);
 
     List<Map<String, String>> selectorderOtherMoney();
 
@@ -120,37 +137,118 @@
 
     List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
 
-    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+    List<Map<String, Object>> getDetailListMerge(String processId, String process);
 
-    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
 
-    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
+
+    List<Map<String, Object>> getDetailListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
+
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
 
     List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String orderId);
 
-    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, Object>> getDetailListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber, String orderId);
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber, String process);
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
 
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
     List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 
-    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, Integer technologyNumber, String reportingWorkId);
+    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
 
     List<Map<String, String>> selectPrintAllMp(String orderId);
 
-    Boolean printAddSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+    Boolean printAddSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
 
-    Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+    Integer printAddSortCountMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
 
-    Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+    Boolean printUpdateSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
 
-    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process, String orderId);
+
+    List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+    List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
+    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);
+
+    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);
+
+    String selectUserMp(String userId);
+
+    List<Map<String, Object>> selectSortTableMp(String orderId);
+
+    String countFlowCard(String orderId);
+
+    List<Map<String, Object>> remakList(String processId);
+
+    List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);
+
+    List<Map<String, Object>> selectFlowCardMerge(String processId);
+
+    Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
+
+    Boolean deleteflowCardSort(String orderId, String processId);
+    Boolean deleteflowCardSortByOrderId(String orderId);
+
+    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+
+    List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
+
+    List<Map<String, String>> getPrintLabel3(String projectNo);
+
+    Boolean updateProcessMp(String processId, String technologyNumber, String process, String number);
+
+    Boolean deleteProcessMp(String processId, String technologyNumber);
+
+    Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);
+
+    List<FlowCard> getFlowCardListPrintProject(String printProject);
+
+    Integer updateProjectLabelPrintCount(String projectNo);
+
+    Integer selectProjectLabelPrintCount(String projectNo);
+
+    Integer updateProjectProcessPrintCount(String projectNo);
+
+    Integer selectProjectProcessPrintCount(String projectNo);
+
+    int flowCardToOptimizeCount(String orderId);
+
+    List<Map<String, Object>> getFlowCardDetail(String processId);
+
+    Map<String,Object> getGlassThicknessByProdutionId(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();
 }

--
Gitblit v1.8.0