From 684399b665ef8c25c43faff0fdc821a0b72b39ba Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 四月 2024 14:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 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 0c1003d..42d2719 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,47 +1,80 @@
 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;
-import com.example.erp.entity.sd.OrderGlassDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.sql.Date;
 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);
 
-    Boolean AddFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName);
+    //鎻掑叆Flow_card琛�
+    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> selectNoSchedulingMp(String selectTime1, String selectTime2, String orderId, String processes, FlowCard flowCard);
+
+    List<Map<String, String>> selectLastSchedulingMp(String selectTime1, String selectTime2, FlowCard flowCard);
+
+    Integer selectLayer(String productionId, Integer orderNumber);
+
+
+    Integer selectFlowCardCount(String orderId);
+
+    List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
+
+    Boolean deleteReportingWork(String processId);
+
+    List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+
+    List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+
+    List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+
+    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+
+    List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+
+    Boolean updateInventory(String processId, String orderNumber, String technologyNumber, int completedQuantity);
 }

--
Gitblit v1.8.0