From 684399b665ef8c25c43faff0fdc821a0b72b39ba Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 四月 2024 14:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 1efab6e..42d2719 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
@@ -2,9 +2,6 @@
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;
-import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -26,7 +23,7 @@
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
- List<FlowCard> detailsSelectMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
//鍒犻櫎娴佺▼鍗�
Boolean deleteFlowCardMp(String orderId, String processId);
@@ -68,4 +65,16 @@
List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
Boolean deleteReportingWork(String processId);
+
+ List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+
+ List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+
+ List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+
+ List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+
+ List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
+
+ Boolean updateInventory(String processId, String orderNumber, String technologyNumber, int completedQuantity);
}
--
Gitblit v1.8.0