From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +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 |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 5 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..ebf22f3 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,19 @@
 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 +24,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 +33,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 +61,39 @@
     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);
+
+    Boolean updateComposing(String processId);
+
+    List<Map<String, String>> getPrintLabel(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<Order> getPrintCustomData(String processId, Integer technologyNumber);
+
+    Integer getPrintLabelCount(String processId, Integer technologyNumber);
 }

--
Gitblit v1.8.0