From 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 22 三月 2024 16:48:18 +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 | 10 ++++++++--
1 files changed, 8 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 e6fe65c..43abc0b 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
@@ -1,5 +1,6 @@
package com.example.erp.mapper.pp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
@@ -11,7 +12,7 @@
import java.util.Map;
@Mapper
-public interface FlowCardMapper {
+public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
@@ -31,7 +32,7 @@
List<Map<String, String>> selectNoCardMp(String orderId, String productionId, FlowCard flowCard);
//淇敼鎺掔増鐘舵��
- Boolean updateLayoutStatusMp(String processId);
+ Boolean updateLayoutStatusMp(String processId,Integer state);
Integer selectLayoutStatus(String processId);
@@ -59,4 +60,9 @@
Integer selectLayer(String productionId, Integer orderNumber);
+ Integer selectFlowCardCount(String orderId);
+
+ List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
+
+ Boolean deleteReportingWork(String processId);
}
--
Gitblit v1.8.0