From 8202686b06680db9b82d4a99a31dc7f9dca4ee86 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:20: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 | 70 ++++++++++++++++-------------------
1 files changed, 32 insertions(+), 38 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 36c8166..3b90001 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
@@ -4,9 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.mapper.pp.WorkOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,7 +24,6 @@
//鏌ヨ宸ュ崟
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) {
map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
} else {
@@ -56,38 +54,34 @@
String productIdVl = "";
//灏嗘帴鏀跺埌鐨勪俊鎭В鏋愭垚list
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderdetail")), OrderDetail.class);
- String orderID = orderDetaillist.get(0).getOrderId();
+ String orderId = orderDetaillist.get(0).getOrderId();
- 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) {
- break;
- }
+ for (OrderDetail orderDetail : orderDetaillist) {
+ //鐢熸垚鐢熶骇璁㈠崟鍙�
+ for (int i = 0; i < count; i++) {
+ letters = lettr++;
+ productIdVl = orderId + letters;
+ //鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
+ Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
+ if (workCount < 1) {
+ break;
+ }
- }
- //娣诲姞鐢熶骇璁㈠崟
- 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;
+ //娣诲姞鐢熶骇璁㈠崟
+ 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;
}
@@ -96,16 +90,16 @@
if (!orderId.isEmpty() && !productName.isEmpty()) {
//鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
workOrderMapper.deleteOrderWorkMp(orderId, productName);
- Integer State = 0;
- Integer States = 1;
+ int state = 0;
+ int states = 1;
//鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
- Integer NoWorkCount = workOrderMapper.selectWorkCount(orderId);
+ Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
- Integer YesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (NoWorkCount == YesWorkCount) {
- workOrderMapper.updateWorkType(orderId, State);
+ Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
+ if (noWorkCount.equals(yesWorkCount)) {
+ workOrderMapper.updateWorkType(orderId, state);
} else {
- workOrderMapper.updateWorkType(orderId, States);
+ workOrderMapper.updateWorkType(orderId, states);
}
return true;
} else {
--
Gitblit v1.8.0