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 |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 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 d2bcfab..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,5 +1,6 @@
 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;
@@ -124,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);
@@ -162,11 +166,16 @@
 
     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);
 
@@ -205,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);
 
@@ -281,4 +292,10 @@
                                      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