From 5e6e399169e41222d71cd21b9b7c667c5690326a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 14:19:53 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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 0066131..a1eee97 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
@@ -18,41 +18,69 @@
@DS("pp")
public class FlowCardService {
@Autowired
- FlowCardMapper flowCardMapper;
+ FlowCardMapper flowCardMapper;
- public Map<String, Object> selectProcessCard(Date selectTime1, Date selectTime2, FlowCard flowCard) {
+ //娴佺▼鍗＄鐞嗘煡璇�
+ 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));
- map.put("data", flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
+ map.put("data", flowCardMapper.selectFlowCard(selectTime1, selectTime2, flowCard));
return map;
}
-
+ //鍒嗘灦鏌ヨ
public Map<String, Object> selectAddProcess(Date selectTime1, Date selectTime2, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectFlowCardMp( selectTime1,selectTime2, flowCard));
+ map.put("data", flowCardMapper.selectFlowCardMp(selectTime1, selectTime2, flowCard));
return map;
}
- public Map<String, Object> DetailsSelectSv(String orderId, FlowCard flowCard) {
+ //鍒嗘灦鏄庣粏鏌ヨ
+ public Map<String, Object> DetailsSelectSv(String orderId, OrderDetail orderDetail) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.DetailsSelectMp( orderId, flowCard));
+ map.put("data", flowCardMapper.DetailsSelectMp(orderId, orderDetail));
return map;
}
+ //鍒犻櫎宸ュ崟
public Boolean DeleteFlowCardSv(String orderId, String processId) {
- if (!orderId.isEmpty()&&!processId.isEmpty()){
- flowCardMapper.DeleteFlowCardMp(orderId, processId);
- return true;
- }
- else {
+ if (!orderId.isEmpty() && !processId.isEmpty()) {
+ Integer count=flowCardMapper.ReportingWorkCount(processId);
+ if (count==0){
+ flowCardMapper.DeleteFlowCardMp(orderId, processId);
+ return true;
+ }
+ else {
+ return false;
+ }
+
+ } else {
return false;
}
}
- public Map<String, Object> SelectNoCardSv(String orderId, String productionId, FlowCard flowCard) {
+ //鍒嗘灦鏂板鏄庣粏鏌ヨ
+ public Map<String, Object> SelectNoCardSv(String orderId, String productionId, OrderDetail orderDetail) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.SelectNoCardMp( orderId,productionId, flowCard));
+ map.put("data", flowCardMapper.SelectNoCardMp(orderId, productionId, orderDetail));
return map;
}
+
+
+ //淇敼鎺掔増鐘舵��
+ public Boolean UpdateLayoutStatusSv(String processId) {
+
+ if (!processId.isEmpty()) {
+ Integer Status = flowCardMapper.SelectLayoutStatus(processId);
+ if (Status == 0) {
+ flowCardMapper.UpdateLayoutStatusMp(processId);
+ } else {
+ return false;
+ }
+
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0