From a15dba424e67b4773a546246c396b83d3b820d98 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 04 七月 2024 10:27:12 +0800
Subject: [PATCH] 提交重复订单提示
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 126 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 insertions(+), 8 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 f774212..f609666 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
@@ -6,6 +6,9 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
+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.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
@@ -16,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -184,7 +188,7 @@
}
}
- List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
@@ -218,12 +222,36 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ 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){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
+ *orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
+ }else if (calculateType==2){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }else if (calculateType==3){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
+
+ }
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+
+
+ //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity();
- money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity();
+ area += orderDetail.getComputeArea() * orderDetail.getDeliveryDetail().getQuantity();
+ money += deliveryDetailMoney;
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
+ //棰濆閲戦淇敼
Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
@@ -239,7 +267,7 @@
}
//鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
@@ -256,8 +284,9 @@
deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
}
});
+ int intMoney= (int) Math.floor(money);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
} else {
return false;
@@ -297,6 +326,16 @@
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
}
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
+ if (!deliveryDetaillist.isEmpty()) {
+ for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
+ //杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
+ finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
+ deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
+ }
+ }
+ //鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
+ deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
deliveryMapper.deleteDelivery(deliveryId);
@@ -315,29 +354,100 @@
}
- public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) {
+ public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) throws IllegalAccessException {
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<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
+ String orderId="";
for (DeliveryDetail detail : deliveryDetailList) {
-
+ System.out.println(detail);
+ orderId=detail.getOrderDetail().getOrderId();
Map<String, Object> itemmap = new HashMap<>();
+
List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().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<>();
+ List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(), detail.getDeliveryId(), key, jsonObject.get(key).toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+ }
+
+ }
+ }
itemmap.put("DeliveryDetail", detail);
itemmap.put("DeliveryDetailList", deliveryDetailList2);
list.add(itemmap);
-
}
Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
map.put("data", list);
+ map.put("otherMoney",moneryList);
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
map.put("money", toChinese(delivery.getMoney().toString(), false));
return map;
}
+ public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail) {
+ 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) {
+
+ 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<>();
+ List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),key,jsonObject.get(key).toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+
+ }
+
+ }
+ }
+ itemmap.put("DeliveryDetail", detail);
+ itemmap.put("DeliveryDetailList", deliveryDetailList2);
+ list.add(itemmap);
+
+ }
+ Order order=deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail);
+ map.put("data", list);
+ map.put("otherMoney",moneryList);
+ map.put("delivery", deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail));
+ map.put("money", toChinese(order.getMoney().toString(), false));
+ return map;
+
+ }
+
+ public List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailReport(dates);
+ }
+
+ public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
+ }
+
+
+
+
private static final String[] NUMBERS = {"闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�"};
private static final String[] IUNIT = {"鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�"};
--
Gitblit v1.8.0