From 0294300e78c5e816d7b6ad06ab0fac7a263363eb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 18:03:59 +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 | 14 ++++++++++++--
1 files changed, 12 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 0c1003d..209b033 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
@@ -21,7 +21,7 @@
//鍒嗘灦鏄庣粏鏌ヨ
List<FlowCard> DetailsSelectMp(String orderId, FlowCard flowCard);
- //鍒犻櫎宸ュ崟
+ //鍒犻櫎娴佺▼鍗�
Boolean DeleteFlowCardMp(String orderId, String processId);
//鍒嗘灦鏂板鏄庣粏鏌ヨ
@@ -32,9 +32,11 @@
Integer SelectLayoutStatus(String processId);
+ //鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
Integer ReportingWorkCount(String processId);
- Boolean AddFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName);
+ //鎻掑叆Flow_card琛�
+ Boolean AddFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName,Integer layer);
Boolean UpdateFlowState(String productionId, Integer orderNumber);
@@ -44,4 +46,12 @@
Boolean UpdateProcessingCard(String productionId, int state);
Boolean UpdateDeleteState(String orderId, String processId);
+
+ List<FlowCard> SelectOkSchedulingMp(String selectTime1, String selectTime2, String orderId,String processes, FlowCard flowCard);
+
+ List<FlowCard> SelectNoSchedulingMp(String selectTime1, String selectTime2, String orderId,String processes, FlowCard flowCard);
+
+ List<Map<String,String>> selectLastSchedulingMp(String selectTime1, String selectTime2, FlowCard flowCard);
+
+ Integer SelectLayer(String productionId, Integer orderNumber);
}
--
Gitblit v1.8.0