From 77976f0fe94ccd536f6a6aeaca5da044c394d5b2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 四月 2024 16:56:52 +0800
Subject: [PATCH] 修改分架界面周长计算错误
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index ebe1495..a898137 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -88,20 +88,28 @@
//鍒犻櫎鐢熶骇璁㈠崟
public Boolean deleteOrderWorkSv(String orderId, String productionId) {
if (!orderId.isEmpty() && !productionId.isEmpty()) {
- //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
- workOrderMapper.deleteOrderWorkMp(orderId, productionId);
- int state = 0;
- int states = 1;
- //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
- Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
- //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
- Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount.equals(yesWorkCount)) {
- workOrderMapper.updateWorkType(orderId, state);
- } else {
- workOrderMapper.updateWorkType(orderId, states);
+ //鏌ヨ璇ヨ鍗曟槸鍚﹀凡缁忓缓绔嬫祦绋嬪崱
+ Integer getProcessCard = workOrderMapper.selectProcessCard(orderId);
+ if (getProcessCard == 0){
+ //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
+ workOrderMapper.deleteOrderWorkMp(orderId, productionId);
+ int state = 0;
+ int states = 1;
+ //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
+ Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
+ //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
+ Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
+ if (noWorkCount.equals(yesWorkCount)) {
+ workOrderMapper.updateWorkType(orderId, state);
+ } else {
+ workOrderMapper.updateWorkType(orderId, states);
+ }
+ return true;
}
- return true;
+ else {
+ return false;
+ }
+
} else {
return false;
}
--
Gitblit v1.8.0