From 8fb3ee9eae369f7a5c39da8ed69d0e8cea3ae2f8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 16:24:59 +0800
Subject: [PATCH] 生产加工单上显示图纸和图纸尺寸调整功能，流程卡上图纸尺寸调整功能
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 19 +++++++++++++++----
1 files changed, 15 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 5cab178..bcdbe7f 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,6 +1,5 @@
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;
@@ -121,7 +120,7 @@
Integer getPrintLabelCount(String processId, String technologyNumber);
- List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<Map<String, String>> selectReplenishPrintMp(String selectTime1, String selectTime2, FlowCard flowCard);
List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
@@ -166,11 +165,13 @@
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);
@@ -212,7 +213,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);
@@ -294,4 +297,12 @@
Boolean updateTerminationStatus(String processId, Integer orderNumber);
Boolean updateTerminationNoMp(String processId, Integer orderNumber);
+
+ List<Map<String, Object>> getNewProcessMp(String processId, String orderNumber, String technologyNumber);
+
+ Map<String, Object> getProcessInfo( String processName);
+
+ List<Map<String, String>> OrderProcess();
+
+ List<Map<String, String>> PrintProgressProcessCardData(String startDate, String endDate);
}
--
Gitblit v1.8.0