From 92f00c92b4e6c1c61ce8461d9b72fd2969e66802 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 23 二月 2024 17:12:53 +0800
Subject: [PATCH] 流程卡新增
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 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 a1eee97..93efb63 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
@@ -1,6 +1,8 @@
package com.example.erp.service.pp;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
@@ -12,6 +14,7 @@
import java.sql.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@@ -36,9 +39,9 @@
}
//鍒嗘灦鏄庣粏鏌ヨ
- 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;
}
@@ -47,6 +50,9 @@
if (!orderId.isEmpty() && !processId.isEmpty()) {
Integer count=flowCardMapper.ReportingWorkCount(processId);
if (count==0){
+ //淇敼鍒嗘灦鐘舵��
+ flowCardMapper.UpdateDeleteState(orderId, processId);
+ //鍒犻櫎鍒嗘灦鏄庣粏
flowCardMapper.DeleteFlowCardMp(orderId, processId);
return true;
}
@@ -60,9 +66,9 @@
}
//鍒嗘灦鏂板鏄庣粏鏌ヨ
- public Map<String, Object> SelectNoCardSv(String orderId, String productionId, OrderDetail orderDetail) {
+ public Map<String, Object> SelectNoCardSv(String orderId, String productionId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.SelectNoCardMp(orderId, productionId, orderDetail));
+ map.put("data", flowCardMapper.SelectNoCardMp(orderId, productionId, flowCard));
return map;
}
@@ -72,7 +78,7 @@
if (!processId.isEmpty()) {
Integer Status = flowCardMapper.SelectLayoutStatus(processId);
- if (Status == 0) {
+ if (Status == 1) {
flowCardMapper.UpdateLayoutStatusMp(processId);
} else {
return false;
@@ -83,4 +89,42 @@
return false;
}
}
+
+ public Boolean AddFlowCardSv(Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+
+ String productionId = "";
+ if (object.get("productionId") != null) {
+ productionId = object.get("productionId").toString();
+ }
+
+ List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
+ if (!FlowCardList.isEmpty()) {
+ for (FlowCard flowCard : FlowCardList) {
+ //娣诲姞娴佺▼鍗℃暟鎹�
+ flowCardMapper.AddFlowCardMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getLandingSequence(),flowCard.getQuantity(),productionId,userName);
+ //淇敼鍒嗘灦鐘舵�侊紝灏嗙姸鎬佹敼涓�1
+ 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);
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0