From f53fb4af943e9a82c250fb60ad6ed941fd8f5d33 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 七月 2024 09:07:53 +0800
Subject: [PATCH] 提交相关程序

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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..1c8d309 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,6 +68,8 @@
 
     List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
 
+    List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+
     List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
 
     List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
@@ -81,10 +82,29 @@
 
     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);
 }

--
Gitblit v1.8.0