From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 20 ++++++++++++++++----
1 files changed, 16 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 43abc0b..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,15 +2,15 @@
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;
import java.util.List;
import java.util.Map;
+/**
+ * @author SNG-016
+ */
@Mapper
public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
@@ -23,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);
@@ -65,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