From 5343507d1fde965265b67f7679e63ab4bb6461df Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 18 七月 2024 15:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   88 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 82 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 e6fe65c..2db2f77 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,17 +1,18 @@
 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(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
 
@@ -22,7 +23,7 @@
     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);
@@ -31,7 +32,7 @@
     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);
 
@@ -59,4 +60,79 @@
     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>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+
+    List<Map<String, String>> selectPrintMp(String orderId);
+
+    List<Map<String, String>> getPrimaryList(String processId, String 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);
+
+    Boolean updateComposing(String processId);
+
+    List<Map<String, String>> getPrintLabel(String projectNo);
+
+    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+
+    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
+
+    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+
+    List<Map<String,String>> selectType();
+
+    List<Map<String, Object>> getPrintTitle(String type);
+
+    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
+
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer technologyNumber);
+
+    Integer getPrintLabelCount(String processId, Integer technologyNumber);
+
+    List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
+
+    List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+
+    Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+
+    List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
+
+    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+
+    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
+
+    List<Map<String, String>> selectorderOtherMoney();
+
+    List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
+
+    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
+
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);
 }

--
Gitblit v1.8.0