From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +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 |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 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 3d836b2..2c4f91a 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.FlowCard;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.sql.Date;
 import java.util.List;
@@ -84,7 +85,11 @@
 
     List<Map<String, String>> getPrintLabel(String projectNo);
 
+    List<Map<String, String>> getPrintLabel2(String projectNo);
+
     List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+
+    List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
 
     List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
 
@@ -122,13 +127,13 @@
 
     List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
 
-    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason);
 
     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);
 
     List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
 
@@ -151,4 +156,34 @@
     Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
 
     Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+
+    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+
+    List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+    List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
+    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+
+    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);
+
+    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
 }

--
Gitblit v1.8.0