From aa3bd3741b94f50f0c1d7e3a137bb681d7421294 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 三月 2025 09:59:21 +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 | 146 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 123 insertions(+), 23 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 f487359..7f8ff34 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,7 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.sql.Date;
import java.util.List;
@@ -39,12 +41,14 @@
//鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
Integer reportingWorkCount(String processId);
+ Integer reportingWorkCountByOrderId(String orderId);
+
//鎻掑叆Flow_card琛�
Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);
Boolean updateFlowState(String productionId, Integer orderNumber);
- Integer selectFlowCount(String productionId);
+ Integer selectFlowCount(String orderId);
Boolean updateProcessingCard(String productionId, int state);
@@ -65,30 +69,41 @@
List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
Boolean deleteReportingWork(String processId);
+ Boolean deleteReportingWorkByOrderId(String orderId);
- List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, 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, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process, String orderId);
- List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+ List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
- List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
+
+ List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
+
+ List<Map<String, Object>> getProcessList(String processId, String technologyNumber);
Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
Boolean updateComposing(String processId);
+ Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);
+
List<Map<String, String>> getPrintLabel(String projectNo);
- List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
+ List<Map<String, String>> getPrintLabel2(String projectNo);
- List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
+ List<Map<String, String>> getPrintLabel1(String processId,String technologyNumber);
- Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+ 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, String technologyNumber, Integer sort);
List<Map<String,String>> selectType();
@@ -96,49 +111,134 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Map<String, Object>> getPrintCustomData(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);
- Integer getPrintLabelCount(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getPrintCustomData2(String processId);
+
+ Integer getPrintLabelCount(String processId, String 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>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
- List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+ List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
- Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+ Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);
List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
- Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+ Boolean printOrderSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);
- List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
+ List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber, String orderId);
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, Object>> getDetailListLike(String processId, String technologyNumber, String process);
- List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+ List<Map<String, Object>> getDetailListMerge(String processId, String process);
- List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
- List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
+
+ List<Map<String, Object>> getDetailListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
+
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+ List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String orderId);
- List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, Object>> getDetailListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+ List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber, String orderId);
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
List<Map<String, String>> selectPrintNotMp(String orderId);
List<Map<String, String>> selectPrintNotMergeMp(String orderId);
+
+ List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+ List<Map<String, String>> selectPrintAllMp(String orderId);
+
+ Boolean printAddSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
+
+ Integer printAddSortCountMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
+
+ Boolean printUpdateSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
+
+ List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process, String orderId);
+
+ List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+ List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
+ List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);
+
+ 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);
+ Boolean deleteflowCardSortByOrderId(String orderId);
+
+ List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+
+ List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
+
+ List<Map<String, String>> getPrintLabel3(String projectNo);
+
+ Boolean updateProcessMp(String processId, String technologyNumber, String process, String number);
+
+ Boolean deleteProcessMp(String processId, String technologyNumber);
+
+ Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);
+
+ List<FlowCard> getFlowCardListPrintProject(String printProject);
+
+ Integer updateProjectLabelPrintCount(String projectNo);
+
+ Integer selectProjectLabelPrintCount(String projectNo);
+
+ Integer updateProjectProcessPrintCount(String projectNo);
+
+ Integer selectProjectProcessPrintCount(String projectNo);
+
+ int flowCardToOptimizeCount(String orderId);
+
+ List<Map<String, Object>> getFlowCardDetail(String processId);
+
+ Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
+
+ List<OrderDetail> getOrderDetailByProductionId(String orderId, String productionId);
+
+ Boolean revokeComposing(String processId);
+
+ Integer selectProjectNo(String processId);
+
+ List<Map<String, String>> selectPrintDetailsMp2(String orderId);
+
+ List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
+
+ Boolean updatePrintNumberMp(String processId, Integer orderNumber);
}
--
Gitblit v1.8.0