From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +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 | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..a469aca 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
@@ -36,6 +36,7 @@
public Map<String, Object> AddDateWork(String orderId, OrderDetail orderDetail) {
Map<String, Object> map = new HashMap<>();
+
map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
return map;
}
@@ -57,22 +58,29 @@
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) {
+ System.out.println("鐢熶骇璁㈠崟鍙凤細" + productIdVl + " 鏌ヨ缁撴灉锛�" + workCount);
+ if (workCount < 1 ) {
break;
}
}
- System.out.println(productIdVl);
+
+ //娣诲姞鐢熶骇璁㈠崟
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) {
+ //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
} else {
workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
--
Gitblit v1.8.0