From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 01956c4..289d005 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -117,7 +117,7 @@
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
}
- Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Delivery.class);
+ Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
//鏌ヨ鍙戣揣鍗曟槸鍚﹀瓨鍦�
Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);
@@ -154,7 +154,7 @@
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
-
+ System.out.println(4);
Double area = 0.0;
Integer quantity = 0;
Double money = 0.0;
@@ -215,6 +215,33 @@
}
+ public Boolean deleteDelivery(Map<String,Object> object) {
+ boolean saveState = true;
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ String deliveryId = "";
+ if (object.get("deliveryId") != null) {
+ deliveryId = object.get("deliveryId").toString();
+ }
+ deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
+ deliveryMapper.deleteDelivery(deliveryId);
+
+ return true;
+ }catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
+ }
+ return saveState;
+
+ }
+
public String orderNumberSetting(String type) {
//鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
--
Gitblit v1.8.0