From 54edbc2458f55026b05e4f8481778456ea89a7ba Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 09 八月 2024 17:18:10 +0800
Subject: [PATCH] 流程卡排序添加右键功能，修改流程卡打印查询
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 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 99fa912..57a64b7 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
@@ -10,9 +10,11 @@
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.*;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.sd.*;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,6 +22,8 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -41,6 +45,8 @@
FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;
@Autowired
DeliveryOtherMoneyMapper deliveryOtherMoneyMapper;
+ @Autowired
+ LogService logService;
@Autowired
SysErrorService sysErrorService;
@@ -168,11 +174,17 @@
} 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);
//鏌ヨ鍙戣揣鍗曟槸鍚﹀瓨鍦�
Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);
+
+ Log log = new Log();
+ log.setOperator(delivery.getCreator());
+ log.setOperatorId(delivery.getCreatorId());
+ log.setContent(object.toString());
if (deliveryConut != 0) {
//缂栬緫杩樺師鏁版嵁
@@ -204,11 +216,13 @@
deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
+ log.setFunction("insertDelivery淇敼:"+oddNumber);
} else {
//鑾峰彇鍗曞彿
- oddNumber = orderNumberSetting("鍙戣揣");
+ oddNumber = orderNumberSetting("鍙戣揣",deliveryIdType);
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
+ log.setFunction("insertDelivery鏂板:"+oddNumber);
}
double area = 0.0;
Integer quantity = 0;
@@ -220,10 +234,12 @@
deliveryOtherMoney.setQuantity(0.0);
});
double otherMoneys=0.0;
+
List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ double deliveryDetailotherMoneys=0.0;
Integer calculateType=0;
if (orderDetail.getOrder().getOrderId()==null){
@@ -233,19 +249,48 @@
calculateType=orderDetail.getOrder().getCalculateType();
}
double deliveryDetailMoney = 0.0;
+
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
+ BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
if (calculateType==1){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+
+ }else if (calculateType==2){
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+
+ }
+ /*if (calculateType==1){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
}else if (calculateType==2){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
- )*orderDetail.getPrice()));
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getWidth()*orderDetail.getHeight()*orderDetail.getDeliveryDetail().getQuantity()/1000000)
+ )*orderDetail.getPrice()));
+ }else{
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }
}else if (calculateType==3){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
- }
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ }*/
+
if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
@@ -257,6 +302,7 @@
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
if(deliveryDetailOtherMoney.get("monery")!=null){
otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}else{
@@ -292,7 +338,7 @@
}
//鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
@@ -317,7 +363,7 @@
int intMoney= (int) Math.round(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
-
+ logService.saveLog(log);
} else {
return false;
}
@@ -325,8 +371,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("insertDelivery");
sysErrorService.insert(sysError);
saveState = false;
@@ -383,8 +429,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;
@@ -738,21 +784,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