From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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..527db11 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
@@ -11,6 +11,8 @@
import org.springframework.stereotype.Service;
import java.sql.Date;
+import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -22,14 +24,27 @@
WorkOrderMapper workOrderMapper;
//鏌ヨ宸ュ崟
- public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
- Map<String, Object> map = new HashMap<>();
- if (state == 1) {
- map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
- } else {
- map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
+ public Map<String, Object> defaultDateWork(List<String> selectDate, Integer state, OrderGlassDetail orderGlassDetail) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
}
-
+ Map<String, Object> map = new HashMap<>();
+ if (state == 1) {//宸茶浆宸ュ崟
+ map.put("data", workOrderMapper.selectWordOrder(startDate, endDate, orderGlassDetail));
+ } else {//鏈浆宸ュ崟
+ map.put("data", workOrderMapper.selectWordOrderNo(startDate, endDate, orderGlassDetail));
+ }
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -57,10 +72,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 +119,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