From b09e0423b15d6402b44d4ef338bfb85f027daf3c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 二月 2024 14:03:58 +0800
Subject: [PATCH] 更新程序，流程卡删除，修改排版状态
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 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 93efb63..aba88e0 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
@@ -45,18 +45,19 @@
return map;
}
- //鍒犻櫎宸ュ崟
+ //鍒犻櫎娴佺▼鍗�
public Boolean DeleteFlowCardSv(String orderId, String processId) {
if (!orderId.isEmpty() && !processId.isEmpty()) {
- Integer count=flowCardMapper.ReportingWorkCount(processId);
- if (count==0){
+ Integer count = flowCardMapper.ReportingWorkCount(processId);
+ if (count == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
+ flowCardMapper.UpdateProcessingCard(orderId, 1);
//淇敼鍒嗘灦鐘舵��
flowCardMapper.UpdateDeleteState(orderId, processId);
//鍒犻櫎鍒嗘灦鏄庣粏
flowCardMapper.DeleteFlowCardMp(orderId, processId);
return true;
- }
- else {
+ } else {
return false;
}
@@ -90,6 +91,7 @@
}
}
+ //淇濆瓨娴佺▼鍗℃暟鎹�
public Boolean AddFlowCardSv(Map<String, Object> object) {
String userName = "";
if (object.get("userName") != null) {
@@ -104,27 +106,46 @@
List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!FlowCardList.isEmpty()) {
for (FlowCard flowCard : FlowCardList) {
+ //鏌ヨ姣忎釜搴忓彿鐨勫眰鏁�
+ Integer layer = flowCardMapper.SelectLayer(productionId, flowCard.getOrderNumber());
//娣诲姞娴佺▼鍗℃暟鎹�
- flowCardMapper.AddFlowCardMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getLandingSequence(),flowCard.getQuantity(),productionId,userName);
+ flowCardMapper.AddFlowCardMp(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getLandingSequence(), flowCard.getQuantity(), productionId, userName,layer);
//淇敼鍒嗘灦鐘舵�侊紝灏嗙姸鎬佹敼涓�1
- flowCardMapper.UpdateFlowState(productionId,flowCard.getOrderNumber());
+ flowCardMapper.UpdateFlowState(productionId, flowCard.getOrderNumber());
//鏌ヨ璇ヨ鍗曟湭鍒嗘灦鏁伴噺
- Integer FlowCount= flowCardMapper.SelectFlowCount(productionId);
-
- if (FlowCount==0){
- //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负2
- System.out.println("鎴戞潵璇曡瘯1");
- flowCardMapper.UpdateProcessingCard(productionId,2);
- }
- else{
- //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
- System.out.println("鎴戞潵璇曡瘯2");
- flowCardMapper.UpdateProcessingCard(productionId,1);
- }
+ Integer FlowCount = flowCardMapper.SelectFlowCount(productionId);
+ if (FlowCount == 0) {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负2
+ flowCardMapper.UpdateProcessingCard(productionId, 2);
+ } else {
+ //淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鏈叏閮ㄥ垎鏋跺畬鎴�
+ flowCardMapper.UpdateProcessingCard(productionId, 1);
+ }
}
- return true;
+ return true;
} else {
- return false;
+ return false;
}
}
+
+ public Map<String, Object> SelectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ if (state==2){//宸叉帓浜�
+ map.put("data", flowCardMapper.SelectOkSchedulingMp(selectTime1, selectTime2,orderId,processes, flowCard));
+
+ }else if (state==1){//鏈帓浜�
+ map.put("data", flowCardMapper.SelectNoSchedulingMp(selectTime1, selectTime2,orderId,processes, flowCard));
+
+ }
+
+ return map;
+ }
+
+
+ //棣栨鏌ヨ鎺掔増鏁版嵁
+ public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectLastSchedulingMp(selectTime1, selectTime2, flowCard));
+ return map;
+ }
}
--
Gitblit v1.8.0