From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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 | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 4 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 1efab6e..2c4f91a 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
@@ -2,10 +2,8 @@
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 org.apache.ibatis.annotations.Param;
import java.sql.Date;
import java.util.List;
@@ -26,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);
@@ -68,4 +66,124 @@
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, String glassChild, String process);
+
+ List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);
+
+ List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+
+ Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
+
+ Boolean updateComposing(String processId);
+
+ List<Map<String, String>> getPrintLabel(String projectNo);
+
+ List<Map<String, String>> getPrintLabel2(String projectNo);
+
+ List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+
+ List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
+
+ List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, 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, String reportingWorkId);
+
+ 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, String process);
+
+ List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
+
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason);
+
+ List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+
+ List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+
+ List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+
+ List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+
+ List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
+
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber, String process);
+
+ List<Map<String, String>> selectPrintNotMp(String orderId);
+
+ List<Map<String, String>> selectPrintNotMergeMp(String orderId);
+
+ List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, Integer technologyNumber, String reportingWorkId);
+
+ List<Map<String, String>> selectPrintAllMp(String orderId);
+
+ Boolean printAddSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+
+ Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+
+ Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
+
+ List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+
+ List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+ List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
+ List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+
+ List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);
+
+ String selectUserMp(String userId);
+
+ List<Map<String, Object>> selectSortTableMp(String orderId);
+
+ String countFlowCard(String orderId);
+
+ List<Map<String, Object>> remakList(String processId);
+
+ List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);
+
+ List<Map<String, Object>> selectFlowCardMerge(String processId);
+
+ Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
+
+ Boolean deleteflowCardSort(String orderId, String processId);
+
+ List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
}
--
Gitblit v1.8.0