From 6edb8b29c0b4ab9dd81f824eb5f24fa17cf6fe13 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 02 七月 2025 14:07:18 +0800
Subject: [PATCH] 可编辑标签打印添加订单总数字段
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 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 ac9c690..3d48879 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,12 +1,15 @@
package com.example.erp.mapper.pp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.pp.FlowCardDTO;
+import com.example.erp.dto.pp.TeamOutputDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.sql.Date;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -16,10 +19,10 @@
@Mapper
public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
- List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗛〉鏌ヨ
- Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
@@ -230,7 +233,7 @@
Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
- List<OrderDetail> getOrderDetailByProductionId(String orderId, String productionId,String type,Float inLenMax,Float inLenMin,Float inShortMax,Float inShortMin);
+ List<OrderDetail> getOrderDetailByProductionId(String orderId, String productionId, String type, Float inLenMax, Float inLenMin, Float inShortMax, Float inShortMin, Float glassThickness);
Boolean revokeComposing(String processId);
@@ -241,4 +244,18 @@
List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
Boolean updatePrintNumberMp(String processId, Integer orderNumber);
+
+ String getOrderIdByProcessId(String processId);
+
+ Boolean updateFlowCardIsMerge(String processId);
+
+ Integer flowCardDetailMergeMp(String processId);
+
+ String getProcessName(String processSub);
+
+ List<Map<String, Object>> getProcessNameList();
+
+ List<FlowCardDTO> exportDateProcessMp(List<LocalDate> date);
+
+ Integer getSumQuantity(String orderId);
}
--
Gitblit v1.8.0