From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +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 |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 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 209b033..0adef47 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,5 +1,6 @@
 package com.example.erp.mapper.pp;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
@@ -10,48 +11,61 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author SNG-016
+ */
 @Mapper
-public interface FlowCardMapper {
+public interface FlowCardMapper extends BaseMapper<FlowCard> {
     //娴佺▼鍗＄鐞嗘煡璇�
-    List<FlowCard> selectFlowCard(Date selectTime1, Date selectTime2,FlowCard flowCard);
+    List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    //鍒嗛〉鏌ヨ
+    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏁版嵁鏌ヨ
     List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏄庣粏鏌ヨ
-    List<FlowCard> DetailsSelectMp(String orderId, FlowCard flowCard);
+    List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
 
     //鍒犻櫎娴佺▼鍗�
-    Boolean DeleteFlowCardMp(String orderId, String processId);
+    Boolean deleteFlowCardMp(String orderId, String processId);
 
     //鍒嗘灦鏂板鏄庣粏鏌ヨ
-    List<Map<String,String>> SelectNoCardMp(String orderId, String productionId, FlowCard flowCard);
+    List<Map<String, String>> selectNoCardMp(String orderId, String productionId, FlowCard flowCard);
 
     //淇敼鎺掔増鐘舵��
-    Boolean UpdateLayoutStatusMp(String processId);
+    Boolean updateLayoutStatusMp(String processId,Integer state);
 
-    Integer SelectLayoutStatus(String processId);
+    Integer selectLayoutStatus(String processId);
 
     //鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
-    Integer ReportingWorkCount(String processId);
+    Integer reportingWorkCount(String processId);
 
     //鎻掑叆Flow_card琛�
-    Boolean AddFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName,Integer layer);
+    Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);
 
-    Boolean UpdateFlowState(String productionId, Integer orderNumber);
+    Boolean updateFlowState(String productionId, Integer orderNumber);
 
-    Integer SelectFlowCount(String productionId);
+    Integer selectFlowCount(String productionId);
 
 
-    Boolean UpdateProcessingCard(String productionId, int state);
+    Boolean updateProcessingCard(String productionId, int state);
 
-    Boolean UpdateDeleteState(String orderId, String processId);
+    Boolean updateDeleteState(String orderId, String processId);
 
-    List<FlowCard> SelectOkSchedulingMp(String selectTime1, String selectTime2, String orderId,String processes, FlowCard flowCard);
+    List<FlowCard> selectOkSchedulingMp(String selectTime1, String selectTime2, String orderId, String processes, FlowCard flowCard);
 
-    List<FlowCard> SelectNoSchedulingMp(String selectTime1, String selectTime2, String orderId,String processes, FlowCard flowCard);
+    List<FlowCard> selectNoSchedulingMp(String selectTime1, String selectTime2, String orderId, String processes, FlowCard flowCard);
 
-    List<Map<String,String>> selectLastSchedulingMp(String selectTime1, String selectTime2, FlowCard flowCard);
+    List<Map<String, String>> selectLastSchedulingMp(String selectTime1, String selectTime2, FlowCard flowCard);
 
-    Integer SelectLayer(String productionId, Integer orderNumber);
+    Integer selectLayer(String productionId, Integer orderNumber);
+
+
+    Integer selectFlowCardCount(String orderId);
+
+    List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
+
+    Boolean deleteReportingWork(String processId);
 }

--
Gitblit v1.8.0