From 209ed077c07f53746761e5149c97345f62e38cc1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 02 八月 2024 18:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 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 3cf1515..dbc234f 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
@@ -160,7 +160,7 @@
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
-
+ try {
String deliveryId="";
String oddNumber;
if (object.get("deliveryId") != null) {
@@ -168,6 +168,7 @@
} else {
deliveryId = "";
}
+ String deliveryIdType = object.get("deliveryIdType").toString();
Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
@@ -206,7 +207,7 @@
deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
} else {
//鑾峰彇鍗曞彿
- oddNumber = orderNumberSetting("鍙戣揣");
+ oddNumber = orderNumberSetting("鍙戣揣",deliveryIdType);
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
@@ -239,7 +240,7 @@
)*orderDetail.getPrice()));
}else if (calculateType==2){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
}else if (calculateType==3){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
@@ -255,9 +256,14 @@
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
- otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
- moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
- moneryList.add(moneryItemmap);
+ if(deliveryDetailOtherMoney.get("monery")!=null){
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return false;
+ }
}
}
@@ -309,14 +315,23 @@
freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
}
- int intMoney= (int) Math.floor(money+freight+otherMoneys);
+ int intMoney= (int) Math.round(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
} else {
return false;
}
+ }catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("insertDelivery");
+ sysErrorService.insert(sysError);
+ saveState = false;
+ }
return saveState;
}
@@ -369,8 +384,8 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("deleteDelivery");
sysErrorService.insert(sysError);
saveState = false;
@@ -472,6 +487,10 @@
public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
+ }
+
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
}
@@ -720,21 +739,34 @@
}
}
- public String orderNumberSetting(String type) {
+ public String orderNumberSetting(String type,String deliveryIdType) {
//鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
String alias="";
if(Objects.equals(type, "鍙戣揣")){
alias="FH";
}
- //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
- Integer maximum=deliveryMapper.getmaximum(type);
- //璁剧疆涓や綅涓嶅琛�0
- String formattedNumber = String.format("%02d", maximum+1);
- //鏍煎紡鍖栧綋鍓嶆棩鏈�
- Date currentDate = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
- String formattedDate = dateFormat.format(currentDate);
- String oddNumbers = alias+formattedDate+formattedNumber;
+ String oddNumbers="";
+
+ if(deliveryIdType.equals("day")){
+ //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
+ Integer maximum=deliveryMapper.getmaximum(type);
+ //璁剧疆涓や綅涓嶅琛�0
+ String formattedNumber = String.format("%02d", maximum+1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+ }else if(deliveryIdType.equals("month")){
+ Integer maximum = deliveryMapper.getmaximumMonth();
+ String formattedNumber = String.format("%04d", maximum+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
+ String formattedDate = dateFormat.format(currentDate);
+ oddNumbers = alias+formattedDate+formattedNumber;
+
+ }
+
return oddNumbers;
}
}
--
Gitblit v1.8.0