From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 16 +++++++++++++---
1 files changed, 13 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 60ead89..ebf22f3 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,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.PrintSetup;
+import com.example.erp.entity.sd.Order;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -83,7 +83,17 @@
List<Map<String, String>> getPrintLabel(String processId, Integer technologyNumber);
- List<Map<String, String>> selectPrintSetup(PrintSetup printSetup);
+ List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
- Boolean updatePrintSetup(String alias,Integer printState);
+ 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<Order> getPrintCustomData(String processId, Integer technologyNumber);
+
+ Integer getPrintLabelCount(String processId, Integer technologyNumber);
}
--
Gitblit v1.8.0