From ad7b64d59cfdcd95c5da328d0e0b349df401eaf4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:53:46 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index f2df3fe..86ca4da 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -6,14 +6,11 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Date;
@@ -195,4 +192,22 @@
map.put("data", flowCardMapper.flowCardDetailMp(processId, flowCard));
return map;
}
+
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard) {
+ if("null".equals(orderId)){
+ orderId="";
+ }
+ if("null".equals(project)){
+ project="";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2,orderId,project,flowCard));
+ return map;
+ }
+
+ public Object selectPrintSv(String orderId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ return map;
+ }
}
--
Gitblit v1.8.0