From 1e9a52cf65f364b4332a008210700adbaea0c35e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 06 九月 2024 11:34:16 +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/sd/DeliveryService.java | 219 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 140 insertions(+), 79 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 7d633d6..3df2aca 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
@@ -22,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.*;
@@ -158,9 +160,9 @@
return map;
}
- public Boolean insertDelivery(Map<String,Object> object) {
+ public String insertDelivery(Map<String,Object> object) {
- boolean saveState = true;
+ String saveState = "true";
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -237,17 +239,50 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
- double deliveryDetailotherMoneys=0.0;
- Integer calculateType=0;
+ if(orderDetail.getDeliveryDetail().getQuantity()>0){
+ OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail);
+ Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum();
+ Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum());
+ //鍒ゆ柇鏄惁宸茬粡鍙戣揣
+ if(aBoolean1 && aBoolean2){
+ double deliveryDetailotherMoneys=0.0;
+ Integer calculateType=0;
- if (orderDetail.getOrder().getOrderId()==null){
- Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
- calculateType=order.getCalculateType();
- }else{
- calculateType=orderDetail.getOrder().getCalculateType();
- }
- double deliveryDetailMoney = 0.0;
- if (calculateType==1){
+ if (orderDetail.getOrder().getOrderId()==null){
+ Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
+ calculateType=order.getCalculateType();
+ }else{
+ calculateType=orderDetail.getOrder().getCalculateType();
+ }
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 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=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).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();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }
+ /*if (calculateType==1){
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
@@ -264,60 +299,64 @@
}else if (calculateType==3){
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
- }
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ }*/
- if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
- JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
- for(String key : jsonObject.keySet()){
- boolean isnull = key.contains("M");
- if(isnull) {
- Map<String, Object> moneryItemmap = new HashMap<>();
- 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{
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- return false;
+
+ if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
+ JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull) {
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ 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{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false1";
+ }
+ }
}
+
}
- }
-
- }
- //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
- quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += orderDetail.getComputeArea() * orderDetail.getDeliveryDetail().getQuantity();
- money += deliveryDetailMoney;
- Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
+ //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
+ quantity += orderDetail.getDeliveryDetail().getQuantity();
+ area += deliveryDetailArea;
+ money += deliveryDetailMoney;
+ Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
- //棰濆閲戦淇敼
- Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
- if(otherColumns!=null){
- otherColumns.forEach((key, value) ->{
- boolean isnull = key.contains("M");
- if(isnull){
- deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
- if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
+ //棰濆閲戦淇敼
+ Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
+ if(otherColumns!=null){
+ otherColumns.forEach((key, value) ->{
+ boolean isnull = key.contains("M");
+ if(isnull){
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+
}
});
-
}
- });
+ //鏂板鍙戣揣鏄庣粏鏁版嵁
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys,deliveryDetailArea);
+ //淇敼璁㈠崟鏄庣粏
+ deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
+ //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false2";
+ }
}
-
- //鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
- //淇敼璁㈠崟鏄庣粏
- deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
- //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
- finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
}
//寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
@@ -340,7 +379,7 @@
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
logService.saveLog(log);
} else {
- return false;
+ return "false3";
}
}catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -349,7 +388,7 @@
sysError.setError(e+Arrays.toString(e.getStackTrace()));
sysError.setFunc("insertDelivery");
sysErrorService.insert(sysError);
- saveState = false;
+ saveState = "false4";
}
@@ -460,42 +499,64 @@
}
- public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail) {
+ public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail,List<String> productId) {
Map<String, Object> map = new HashMap<>();
List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
- List<OrderDetail> orderDetailList=deliveryDetailMapper.getSelectOrderPrinting(orderDetail);
- for (OrderDetail detail : orderDetailList) {
+ List<Map<String,Object>> orderProductDistinct;
+ if (!Objects.equals(productId.get(0), "null")){
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderDetail.getOrderId(),productId);
+ }else{
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderDetail.getOrderId());
+ }
+ BigDecimal areSum=new BigDecimal("0");
+ BigDecimal grossAmount=new BigDecimal("0");
+ int quantity=0;
+ for (Map<String, Object> maps : orderProductDistinct) {
+ List<OrderDetail> orderDetails = deliveryDetailMapper.getSelectOrderPrinting(maps.get("productId"),orderDetail.getOrderId());
+ for (OrderDetail detail : orderDetails) {
- Map<String, Object> itemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectOrderDetailPrinting(
- detail.getProductId(), detail.getOrderId());
- for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
+ areSum=areSum.add(BigDecimal.valueOf(detail.getArea()));
+ quantity+=detail.getQuantity();
+ grossAmount=grossAmount.add(BigDecimal.valueOf(detail.getGrossAmount()));
- if(stringObjectMap.get("other_columns")!=null){
- JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
- for(String key : jsonObject.keySet()){
- boolean isnull = key.contains("M");
- if(isnull){
- Map<String, Object> moneryItemmap = new HashMap<>();
- Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
- moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
- moneryList.add(moneryItemmap);
+ Map<String, Object> itemmap = new HashMap<>();
+ List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectOrderDetailPrinting(
+ detail.getProductId(), detail.getOrderId());
+ for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
+
+ if(stringObjectMap.get("other_columns")!=null){
+ JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull){
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
+ grossAmount=grossAmount.add(BigDecimal.valueOf(Double.parseDouble(deliveryDetailOtherMoney.get("monery").toString())));
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+
}
}
-
}
- }
- itemmap.put("DeliveryDetail", detail);
- itemmap.put("DeliveryDetailList", deliveryDetailList2);
- list.add(itemmap);
+ itemmap.put("productId",maps.get("productId"));
+ itemmap.put("productName",maps.get("productName"));
+ itemmap.put("DeliveryDetail", detail);
+ itemmap.put("DeliveryDetailList", deliveryDetailList2);
+ list.add(itemmap);
+ }
}
+
Order order=deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail);
+ order.setMoney((double) Math.round(grossAmount.doubleValue()));
+ order.setQuantity((long) quantity);
+ order.setArea(areSum.doubleValue());
map.put("data", list);
map.put("otherMoney",moneryList);
- map.put("delivery", deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail));
+ map.put("delivery", order);
map.put("money", toChinese(order.getMoney().toString(), false));
return map;
--
Gitblit v1.8.0