From 26633e17d9e9a612e4744405d214cf513d13bffd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 13:56:34 +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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 8d786ea..351d331 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;
@@ -88,7 +89,7 @@
List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
- List<Map<String, String>> getPrintLabelDetail(String processId,Integer orderNumber);
+ List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
@@ -160,6 +161,8 @@
List<Map<String, String>> selectPrintDetailsMp(String orderId);
+ List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
String selectUserMp(String userId);
--
Gitblit v1.8.0