From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 102 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 46 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..a898137 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;
@@ -22,9 +21,9 @@
@Autowired
WorkOrderMapper workOrderMapper;
+ //鏌ヨ宸ュ崟
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 {
@@ -34,72 +33,83 @@
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();
}
+ //瀹氫箟鐢熶骇璁㈠崟鍙风敓鎴愰渶瑕佺殑鏉′欢
char lettr = 'A';
char letters = '1';
int count = 25;
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;
+ }
- }
- 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) {
- 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;
}
- public Boolean DeleteOrderWorkSv(String orderId, String productName) {
- if (!orderId.isEmpty() && !productName.isEmpty()) {
- workOrderMapper.DeleteOrderWorkMp(orderId, productName);
- Integer State = 0;
- Integer States = 1;
- Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderId);
- Integer YesWorkCount = workOrderMapper.SelectYesWorkCount(orderId);
- System.out.println(NoWorkCount);
- if (NoWorkCount ==YesWorkCount) {
- workOrderMapper.UpdateWorkType(orderId, State);
- } else {
- workOrderMapper.UpdateWorkType(orderId, States);
+ //鍒犻櫎鐢熶骇璁㈠崟
+ public Boolean deleteOrderWorkSv(String orderId, String productionId) {
+ if (!orderId.isEmpty() && !productionId.isEmpty()) {
+ //鏌ヨ璇ヨ鍗曟槸鍚﹀凡缁忓缓绔嬫祦绋嬪崱
+ Integer getProcessCard = workOrderMapper.selectProcessCard(orderId);
+ if (getProcessCard == 0){
+ //鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
+ workOrderMapper.deleteOrderWorkMp(orderId, productionId);
+ int state = 0;
+ int states = 1;
+ //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
+ Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
+ //鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
+ Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
+ if (noWorkCount.equals(yesWorkCount)) {
+ workOrderMapper.updateWorkType(orderId, state);
+ } else {
+ workOrderMapper.updateWorkType(orderId, states);
+ }
+ return true;
}
- return true;
+ else {
+ return false;
+ }
+
} else {
return false;
}
--
Gitblit v1.8.0