From b0edff4c02128b722a9a6674b016536d4395872d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 a75796b..c917a79 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
@@ -25,10 +25,9 @@
public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
Map<String, Object> map = new HashMap<>();
// System.out.println(workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
- if (state==1){
+ if (state == 1) {
map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
- }
- else {
+ } else {
map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
}
@@ -62,15 +61,24 @@
letters = lettr++;
productIdVl = orderID + letters;
Integer workCount = workOrderMapper.SelectOrderNumber(productIdVl);
- if (workCount <1)
- {
+ if (workCount < 1) {
break;
}
}
System.out.println(productIdVl);
- workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(),userName);
+ workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
+ Integer State = 2;
+ Integer States = 1;
+ Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderDetail.getOrderId());
+ System.out.println(NoWorkCount);
+ if (NoWorkCount == 0) {
+ workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
+ } else {
+ workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
+ }
}
+
return true;
} else {
return false;
@@ -79,11 +87,20 @@
}
public Boolean DeleteOrderWorkSv(String orderId, String productName) {
- if (!orderId.isEmpty()&&!productName.isEmpty()){
+ 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);
+ System.out.println(NoWorkCount);
+ if (NoWorkCount ==YesWorkCount) {
+ workOrderMapper.UpdateWorkType(orderId, State);
+ } else {
+ workOrderMapper.UpdateWorkType(orderId, States);
+ }
return true;
- }
- else {
+ } else {
return false;
}
}
--
Gitblit v1.8.0