From ff195859283806241f3cb40e33170dd77a7eed61 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 09 七月 2025 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 20 +++++++++++++++++---
1 files changed, 17 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 8f103e8..ec5ea6a 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
@@ -1,12 +1,14 @@
package com.example.erp.mapper.pp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.pp.FlowCardDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.sql.Date;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -81,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);
@@ -135,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);
@@ -247,4 +249,16 @@
Boolean updateFlowCardIsMerge(String processId);
Integer flowCardDetailMergeMp(String processId);
+
+ String getProcessName(String processSub);
+
+ List<Map<String, Object>> getProcessNameList();
+
+ 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);
}
--
Gitblit v1.8.0