From 942e7424d32c912e800fbb2e58a4c206467d8941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 02 八月 2024 17:39:27 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 6 ++++--
1 files changed, 4 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 47adea4..f487359 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
@@ -78,7 +78,7 @@
List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
- Boolean updateInventory(String processId, String orderNumber, String technologyNumber, int completedQuantity);
+ Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
Boolean updateComposing(String processId);
@@ -124,7 +124,7 @@
List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
- List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
@@ -139,4 +139,6 @@
List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
List<Map<String, String>> selectPrintNotMp(String orderId);
+
+ List<Map<String, String>> selectPrintNotMergeMp(String orderId);
}
--
Gitblit v1.8.0