From 3cbcba777b238256dbb44dc523111a1b807b03dd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 05 十一月 2024 09:10:24 +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 |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 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 2c4f91a..ef65afa 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
@@ -75,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, String process);
+    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);
 
@@ -87,13 +87,13 @@
 
     List<Map<String, String>> getPrintLabel2(String projectNo);
 
-    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+    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();
 
@@ -101,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);
 
@@ -127,7 +127,7 @@
 
     List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
+    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);
 
@@ -135,27 +135,27 @@
 
     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, 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);
 
     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);
 

--
Gitblit v1.8.0