From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/WorkOrderMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
index a6b07e5..01c6bd6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
@@ -12,10 +12,10 @@
@Mapper
public interface WorkOrderMapper {
//宸ュ崟绠＄悊鏌ヨ鏈浆宸ュ崟鏁版嵁
- List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ List<OrderGlassDetail> selectWordOrder(String selectTime1, String selectTime2, OrderGlassDetail orderGlassDetail);
//鏌ヨ宸茶浆宸ュ崟鏁版嵁
- List<OrderGlassDetail> selectWordOrderNo(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ List<OrderGlassDetail> selectWordOrderNo(String selectTime1, String selectTime2, OrderGlassDetail orderGlassDetail);
//鏌ヨ闇�瑕佽浆宸ュ崟鏄庣粏
List<OrderDetail> addWordOrder(String orderId, OrderDetail orderDetail);
@@ -30,11 +30,13 @@
Integer selectOrderNumber(String productIdVl);
//鍒犻櫎宸ュ崟,灏嗗搴斾骇鍝佺敓浜ц鍗曞彿鏀逛负null
- Boolean deleteOrderWorkMp(String orderId, String productName);
+ Boolean deleteOrderWorkMp(String orderId, String productionId);
Integer selectWorkCount(String orderId);
Boolean updateWorkType(String orderId, Integer state);
Integer selectYesWorkCount(String orderId);
+
+ Integer selectProcessCard(String orderId);
}
--
Gitblit v1.8.0