From 606e7a619b7d3f6388c19c462b74f60ea2334ea4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 二月 2025 08:55:25 +0800
Subject: [PATCH] 修改配置文件
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 a898137..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) {
@@ -99,10 +104,10 @@
Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount.equals(yesWorkCount)) {
- workOrderMapper.updateWorkType(orderId, state);
+ if (noWorkCount.equals(yesWorkCount)) {//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴杞伐鍗�
+ workOrderMapper.updateWorkType(orderId, state);//鍏ㄩ儴
} else {
- workOrderMapper.updateWorkType(orderId, states);
+ workOrderMapper.updateWorkType(orderId, states);//閮ㄥ垎
}
return true;
}
--
Gitblit v1.8.0