From dbec8a881baf27254a13f1f9c7b0167b9f064ab5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 15 三月 2024 15:36:09 +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 | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 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..cee1cc8 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,23 +25,23 @@
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));
}
return map;
}
- public Map<String, Object> AddDateWork(String orderId, OrderDetail orderDetail) {
+ public Map<String, Object> addDateWork(String orderId, OrderDetail orderDetail) {
Map<String, Object> map = new HashMap<>();
+
map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
return map;
}
- public Boolean AddOrderWorkSv(Map<String, Object> object) {
+ public Boolean addOrderWorkSv(Map<String, Object> object) {
String userName = "";
if (object.get("userName") != null) {
userName = object.get("userName").toString();
@@ -58,19 +58,34 @@
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ //鐢熸垚鐢熶骇璁㈠崟鍙�
+
for (int i = 0; i < count; i++) {
letters = lettr++;
productIdVl = orderID + letters;
- Integer workCount = workOrderMapper.SelectOrderNumber(productIdVl);
- if (workCount <1)
- {
+ //鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
+
+ Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
+ 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());
+ if (NoWorkCount == 0) {
+ //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), State);
+ } else {
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
+ }
}
+
return true;
} else {
return false;
@@ -78,12 +93,20 @@
}
- public Boolean DeleteOrderWorkSv(String orderId, String productName) {
- if (!orderId.isEmpty()&&!productName.isEmpty()){
- workOrderMapper.DeleteOrderWorkMp(orderId, productName);
+ 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);
+ }
return true;
- }
- else {
+ } else {
return false;
}
}
--
Gitblit v1.8.0