From c069f2cce3c10a773e8c474c0031e316ffd8ad9e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 10:57:02 +0800
Subject: [PATCH] 打印流程卡新增北玻logo
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 1ec5f5e..453bed3 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,9 +1,11 @@
package com.example.erp.mapper.pp;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.pp.FlowCardDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,7 +26,7 @@
Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
- List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCardMp(String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
@@ -73,9 +75,9 @@
Boolean deleteReportingWork(String processId);
Boolean deleteReportingWorkByOrderId(String orderId);
- List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCardMp(String selectTime1, String selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
- List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+ List<Map<String, String>> selectPrintFlowCard(String selectTime1, String selectTime2);
List<Map<String, String>> selectPrintMp(String orderId);
@@ -123,6 +125,9 @@
List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+ List<Map<String, Object>> getReworkPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+
List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);
@@ -159,13 +164,18 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
+
+ List<Map<String, Object>> getgetPrintCustomDataSemiSp(String processId, String technologyNumber, Integer orderNumber);
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, Object>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+ List<Map<String, String>> getReworkPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
List<Map<String, String>> selectPrintAllMp(String orderId);
@@ -204,7 +214,9 @@
List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
- List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+ List<Map<String, Object>> getPrintProjectDetailsMpSp(String projectNo,List<Integer> stockId);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId,Integer polysId);
List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
@@ -262,9 +274,28 @@
List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
- List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
Integer getLayoutStatus(String processId);
List<Map<String, String>> selectSortingCardMp(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard);
+
+ Boolean updateTerminationMp(String processId, Integer orderNumber, Integer value);
+
+ Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
+
+ String getProcessOk(String processId,String orderNumber, String technologyNumber);
+
+ List<OrderProcessDetail> getProcessDetail(String processId,String orderNumber, String technologyNumber, String process);
+
+ Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
+ int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
+
+ List<Map<String, String>> getPrimaryListRefundHB(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
+
+ Map<String, Object> getTerminationQuantity(String processId, Integer orderNumber);
+
+ Boolean updateTerminationStatus(String processId, Integer orderNumber);
+
+ Boolean updateTerminationNoMp(String processId, Integer orderNumber);
}
--
Gitblit v1.8.0