From 5343507d1fde965265b67f7679e63ab4bb6461df Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 18 七月 2024 15:43:16 +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 | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 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 f495e15..2db2f77 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;
@@ -71,9 +70,9 @@
List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
- List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> selectPrintMp(String orderId);
- 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);
@@ -85,6 +84,8 @@
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);
@@ -95,7 +96,43 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Order> getPrintCustomData(String processId, Integer technologyNumber);
+ 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();
+
+ List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+ List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
+
+ List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
+
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);
}
--
Gitblit v1.8.0