From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 29cbb5f..07e9bf9 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
@@ -3,6 +3,8 @@
import com.baomidou.dynamic.datasource.annotation.DS;
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.mapper.pp.FlowCardMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,5 +28,19 @@
}
+ public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, Order order) {
+ Map<String, Object> map = new HashMap<>();
+ System.out.println(flowCardMapper.selectFlowCardMp( selectTime1,selectTime2, order));
+ map.put("data", flowCardMapper.selectFlowCardMp( selectTime1,selectTime2, order));
+ // map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
+ return map;
+ }
+ public Map<String, Object> DetailsSelectSv(String orderId, OrderDetail orderDetail) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.DetailsSelectMp( orderId, orderDetail));
+
+ // map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
+ return map;
+ }
}
--
Gitblit v1.8.0