From 613e4e92157dd697629dbad17fd091ae37637bc7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 17 十一月 2025 08:50:44 +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 | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 eb30ad4..d668410 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;
@@ -165,6 +166,8 @@
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);
@@ -211,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);
@@ -287,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