From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   77 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 18 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 0f2e78f..8aec501 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;
@@ -74,9 +75,9 @@
 
     List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
 
-    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
 
-    List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getProcessList(String processId, String technologyNumber);
 
     Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
 
@@ -84,11 +85,15 @@
 
     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>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
+    List<Map<String, String>> getPrintLabel1(String processId,String technologyNumber);
 
-    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+    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, String technologyNumber, Integer sort);
 
     List<Map<String,String>> selectType();
 
@@ -96,21 +101,21 @@
 
     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, String technologyNumber);
 
-    Integer getPrintLabelCount(String processId, Integer technologyNumber);
+    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);
 
-    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);
 
@@ -118,31 +123,67 @@
 
     List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
+    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>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+    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);
+    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);
+    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>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
+    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);
 
     List<Map<String, String>> selectPrintAllMp(String orderId);
+
+    Boolean printAddSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
+
+    Integer printAddSortCountMp(String processId, Integer orderNumber, String 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>> 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);
+
+    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
 }

--
Gitblit v1.8.0