From b0edff4c02128b722a9a6674b016536d4395872d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:44 +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 | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 07e9bf9..0066131 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
@@ -5,6 +5,7 @@
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.mapper.pp.FlowCardMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,26 +22,37 @@
public Map<String, Object> selectProcessCard(Date selectTime1, Date selectTime2, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- System.out.println(flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
+ //System.out.println(flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
map.put("data", flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
- // map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
return map;
}
- public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, Order order) {
+ public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, FlowCard flowCard) {
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));
+ map.put("data", flowCardMapper.selectFlowCardMp( selectTime1,selectTime2, flowCard));
return map;
}
- public Map<String, Object> DetailsSelectSv(String orderId, OrderDetail orderDetail) {
+ public Map<String, Object> DetailsSelectSv(String orderId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.DetailsSelectMp( orderId, orderDetail));
+ map.put("data", flowCardMapper.DetailsSelectMp( orderId, flowCard));
+ return map;
+ }
- // map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
+ public Boolean DeleteFlowCardSv(String orderId, String processId) {
+ if (!orderId.isEmpty()&&!processId.isEmpty()){
+ flowCardMapper.DeleteFlowCardMp(orderId, processId);
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+
+ public Map<String, Object> SelectNoCardSv(String orderId, String productionId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.SelectNoCardMp( orderId,productionId, flowCard));
return map;
}
}
--
Gitblit v1.8.0