From cd4a24e07e643b5be854f0a355e040e382062e2b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 七月 2024 11:35:22 +0800
Subject: [PATCH] 添加标签样式需要的字段

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 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 aaa3210..2db2f77 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,6 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.PrintSetup;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.sql.Date;
@@ -69,9 +68,11 @@
 
     List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
 
-    List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+    List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
 
-    List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+    List<Map<String, String>> selectPrintMp(String orderId);
+
+    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
 
     List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
 
@@ -81,10 +82,57 @@
 
     Boolean updateComposing(String processId);
 
-    List<Map<String, String>> getPrintLabel(String processId, Integer technologyNumber);
+    List<Map<String, String>> getPrintLabel(String projectNo);
+
+    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
 
     List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
 
     Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
 
+    List<Map<String,String>> selectType();
+
+    List<Map<String, Object>> getPrintTitle(String type);
+
+    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
+
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer technologyNumber);
+
+    Integer getPrintLabelCount(String processId, Integer technologyNumber);
+
+    List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
+
+    List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+
+    Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+
+    List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
+
+    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+
+    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
+
+    List<Map<String, String>> selectorderOtherMoney();
+
+    List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
+
+    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
+
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);
 }

--
Gitblit v1.8.0