From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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 | 22 ++++++++++++++++++++--
1 files changed, 20 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 ec5ea6a..0e89cea 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
@@ -4,6 +4,7 @@
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;
@@ -113,7 +114,7 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber, Integer printQuantity);
List<Map<String, Object>> getPrintCustomData2(String processId);
@@ -159,7 +160,7 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
List<Map<String, String>> selectPrintNotMp(String orderId);
@@ -261,4 +262,21 @@
List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
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, 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);
}
--
Gitblit v1.8.0