From 0594d4dc4fe30d44b6959bf0e71b24f3a46e3628 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 05 三月 2025 11:30:36 +0800
Subject: [PATCH] 修改现补代码出现的问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 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 73c8648..6dc5223 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
@@ -24,9 +24,9 @@
//鏌ヨ宸ュ崟
public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
Map<String, Object> map = new HashMap<>();
- if (state == 1) {
+ if (state == 1) {//宸茶浆宸ュ崟
map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
- } else {
+ } else {//鏈浆宸ュ崟
map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
}
@@ -57,10 +57,15 @@
String orderId = orderDetaillist.get(0).getOrderId();
for (OrderDetail orderDetail : orderDetaillist) {
+ if(orderDetail.getOrderId()!= orderId){
+ orderId = orderDetail.getOrderId();
+ letters = '1';
+ lettr = 'A';
+ }
//鐢熸垚鐢熶骇璁㈠崟鍙�
for (int i = 0; i < count; i++) {
letters = lettr++;
- productIdVl = orderId + letters;
+ productIdVl = orderDetail.getOrderId() + letters;
//鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
if (workCount < 1) {
@@ -86,22 +91,30 @@
}
//鍒犻櫎鐢熶骇璁㈠崟
- public Boolean deleteOrderWorkSv(String orderId, String productName) {
- if (!orderId.isEmpty() && !productName.isEmpty()) {
- //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
- workOrderMapper.deleteOrderWorkMp(orderId, productName);
- Integer state = 0;
- Integer states = 1;
- //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
- Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
- //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
- Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount == yesWorkCount) {
- workOrderMapper.updateWorkType(orderId, state);
- } else {
- workOrderMapper.updateWorkType(orderId, states);
+ public Boolean deleteOrderWorkSv(String orderId, String productionId) {
+ if (!orderId.isEmpty() && !productionId.isEmpty()) {
+ //鏌ヨ璇ヨ鍗曟槸鍚﹀凡缁忓缓绔嬫祦绋嬪崱
+ 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