From b13c552870d145f287dfd93a502e91cf9efc8ec3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 13 三月 2024 10:05:37 +0800
Subject: [PATCH] 修改界面中英文
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 c917a79..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
@@ -34,13 +34,14 @@
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();
@@ -57,25 +58,31 @@
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());
- System.out.println(NoWorkCount);
+ //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
+ Integer NoWorkCount = workOrderMapper.selectWorkCount(orderDetail.getOrderId());
if (NoWorkCount == 0) {
- workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
+ //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), State);
} else {
- workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
}
}
@@ -86,18 +93,17 @@
}
- public Boolean DeleteOrderWorkSv(String orderId, String productName) {
+ public Boolean deleteOrderWorkSv(String orderId, String productName) {
if (!orderId.isEmpty() && !productName.isEmpty()) {
- workOrderMapper.DeleteOrderWorkMp(orderId, productName);
+ workOrderMapper.deleteOrderWorkMp(orderId, productName);
Integer State = 0;
Integer States = 1;
- Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderId);
- Integer YesWorkCount = workOrderMapper.SelectYesWorkCount(orderId);
- System.out.println(NoWorkCount);
+ Integer NoWorkCount = workOrderMapper.selectWorkCount(orderId);
+ Integer YesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
if (NoWorkCount ==YesWorkCount) {
- workOrderMapper.UpdateWorkType(orderId, State);
+ workOrderMapper.updateWorkType(orderId, State);
} else {
- workOrderMapper.UpdateWorkType(orderId, States);
+ workOrderMapper.updateWorkType(orderId, States);
}
return true;
} else {
--
Gitblit v1.8.0