From ecb3045fb71d05b7ee3bf73fdf413f5091d65f65 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 19 三月 2024 09:22:33 +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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 cee1cc8..36c8166 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
@@ -22,6 +22,7 @@
@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));
@@ -34,44 +35,42 @@
return map;
}
+ //杞敓浜ц鍗曟煡璇�
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) {
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();
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 ) {
+ if (workCount < 1) {
break;
}
}
-
//娣诲姞鐢熶骇璁㈠崟
workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
Integer State = 2;
@@ -85,7 +84,6 @@
workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
}
}
-
return true;
} else {
return false;
@@ -93,14 +91,18 @@
}
+ //鍒犻櫎鐢熶骇璁㈠崟
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);
- if (NoWorkCount ==YesWorkCount) {
+ if (NoWorkCount == YesWorkCount) {
workOrderMapper.updateWorkType(orderId, State);
} else {
workOrderMapper.updateWorkType(orderId, States);
--
Gitblit v1.8.0