From 4e8378a810220091e51aef35573fc56768b59a32 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 15 七月 2024 13:13:16 +0800
Subject: [PATCH] 新增发货报表导出客户简称字段
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 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 0647e20..26a4639 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,9 +68,11 @@
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);
+ List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
List<Map<String, Object>> getDetailList(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);
@@ -93,5 +96,23 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Order> getPrintCustomData(String orderId, Integer orderNumber);
+ 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();
}
--
Gitblit v1.8.0