From b2cefd84dfd1aa051ae4ab342874fbafef74ab3b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 13:19:59 +0800
Subject: [PATCH] 修改补片打印筛选
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 14 ++++++++++----
1 files changed, 10 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 f44aab9..218252f 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
@@ -4,6 +4,7 @@
import com.example.erp.dto.pp.FlowCardDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,7 +25,7 @@
Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
- List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCardMp(String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
@@ -73,9 +74,9 @@
Boolean deleteReportingWork(String processId);
Boolean deleteReportingWorkByOrderId(String orderId);
- List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCardMp(String selectTime1, String selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
- List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+ List<Map<String, String>> selectPrintFlowCard(String selectTime1, String selectTime2);
List<Map<String, String>> selectPrintMp(String orderId);
@@ -272,5 +273,10 @@
Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
- String getProcessOk(String processId, String technologyNumber);
+ String getProcessOk(String processId,String orderNumber, String technologyNumber);
+
+ List<OrderProcessDetail> getProcessDetail(String processId,String orderNumber, String technologyNumber, String process);
+
+ Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
+ int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
}
--
Gitblit v1.8.0