From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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, 19 insertions(+), 6 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 3d48879..ecedcc1 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.dto.pp.FlowCardDTO;
-import com.example.erp.dto.pp.TeamOutputDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
@@ -84,7 +83,7 @@
List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
- List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback, String landingSequence);
List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
@@ -114,7 +113,7 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber, Integer printQuantity);
List<Map<String, Object>> getPrintCustomData2(String processId);
@@ -138,9 +137,9 @@
List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
- List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback, String landingSequence);
- List<Map<String, Object>> getDetailListMerge(String processId, String process);
+ List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback, String landingSequence);
List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
@@ -160,7 +159,7 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
List<Map<String, String>> selectPrintNotMp(String orderId);
@@ -258,4 +257,18 @@
List<FlowCardDTO> exportDateProcessMp(List<LocalDate> date);
Integer getSumQuantity(String orderId);
+
+ List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
+
+ List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
+
+ List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
+
+ Integer getLayoutStatus(String processId);
+
+ List<Map<String, String>> selectSortingCardMp(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard);
+
+ Boolean updateTerminationMp(String processId, Integer orderNumber, Integer value);
+
+ Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
}
--
Gitblit v1.8.0