From b0edff4c02128b722a9a6674b016536d4395872d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:44 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 e0a24a1..41bb073 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
@@ -3,17 +3,26 @@
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
import java.util.List;
+import java.util.Map;
@Mapper
public interface FlowCardMapper {
+ //娴佺▼鍗＄鐞嗘煡璇�
List<FlowCard> selectFlowCard(Date selectTime1, Date selectTime2,FlowCard flowCard);
- List<Order> selectFlowCardMp(Date selectTime1, Date selectTime2, Order order);
+ //鍒嗘灦鏁版嵁鏌ヨ
+ List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
- List<OrderDetail> DetailsSelectMp(String orderId, OrderDetail orderDetail);
- // Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
+ //鍒嗘灦鏄庣粏鏌ヨ
+ List<FlowCard> DetailsSelectMp(String orderId, FlowCard flowCard);
+
+ Boolean DeleteFlowCardMp(String orderId, String processId);
+
+
+ List<Map<String,String>> SelectNoCardMp(String orderId, String productionId, FlowCard flowCard);
}
--
Gitblit v1.8.0