From 7f94e21461561f335ee87a387eeabf528318fce1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 24 十月 2024 16:04:33 +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 | 25 ++++++++++++++++++++++---
1 files changed, 22 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 6fa55c8..2c4f91a 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,6 +89,8 @@
List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+ List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
+
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
@@ -124,13 +127,13 @@
List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
- List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
- List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason);
List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+ List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
@@ -158,7 +161,11 @@
List<Map<String, String>> selectPrintDetailsMp(String orderId);
+ List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+
+ List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);
String selectUserMp(String userId);
@@ -167,4 +174,16 @@
String countFlowCard(String orderId);
List<Map<String, Object>> remakList(String processId);
+
+ List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);
+
+ List<Map<String, Object>> selectFlowCardMerge(String processId);
+
+ Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
+
+ Boolean deleteflowCardSort(String orderId, String processId);
+
+ List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
}
--
Gitblit v1.8.0