From e748d7c052c9b06f2a2ffe5dbc1cb21babfdbdb4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 10:09:07 +0800
Subject: [PATCH] 添加右键菜单相关语言，对应界面添加客户名称字段，配置标签打印按钮和打印类型下拉框
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 15 +++++++++++++--
1 files changed, 13 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 4817d98..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.sd.Order;
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,7 +82,9 @@
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);
@@ -96,4 +99,12 @@
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