From dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 七月 2024 15:58:34 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 255 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 231 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 1473de8..99fa912 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
@@ -1,29 +1,29 @@
package com.example.erp.service.sd;
import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.entity.sd.Delivery;
-import com.example.erp.entity.sd.DeliveryDetail;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
+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;
-import com.example.erp.mapper.sd.DeliveryDetailMapper;
-import com.example.erp.mapper.sd.DeliveryMapper;
-import com.example.erp.mapper.sd.OrderDetailMapper;
-import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.*;
-import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicReference;
@Service
@DS("sd")
@@ -39,6 +39,8 @@
OrderDetailMapper orderDetailMapper;
@Autowired
FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;
+ @Autowired
+ DeliveryOtherMoneyMapper deliveryOtherMoneyMapper;
@Autowired
SysErrorService sysErrorService;
@@ -87,6 +89,28 @@
return map;
}
+ public Map<String, Object> getSelectDeliveryDetailProductReport(Integer pageNum, Integer pageSize,List<String> selectDate, DeliveryDetail deliveryDetail) {
+ Integer offset = (pageNum - 1) * pageSize;
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deliveryDetailMapper.getSelectDeliveryDetailProductReport(offset, pageSize,startDate,endDate, deliveryDetail));
+ map.put("total", deliveryDetailMapper.getSelectDeliveryDetailProductReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+ return map;
+ }
+
public Map<String, Object> getSelectShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
Integer offset = (pageNum - 1) * pageSize;
@@ -94,6 +118,7 @@
map.put("data", deliveryDetailMapper.getSelectShippingOrderDetail(offset, pageSize, orderDetail));
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDelivery(offset, pageSize, orderDetail));
map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailPageTotal(offset, pageSize, orderDetail));
+ map.put("orderOtherMoneyList",deliveryOtherMoneyMapper.findById(orderDetail.getDeliveryDetail().getDeliveryId()));
return map;
}
@@ -134,15 +159,18 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try {
- String deliveryId = "";
+ try {
+ String deliveryId="";
String oddNumber;
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
+ } else {
+ deliveryId = "";
}
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);
@@ -159,7 +187,8 @@
}
}
- List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
+
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
@@ -168,43 +197,131 @@
}
}
//杩樺師鍙戣揣琛ㄧ殑闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(0.0, 0, 0.0, deliveryId);
+ deliveryMapper.updatedelivery(0.0, 0, 0.0,0.0, deliveryId);
//鍒犻櫎鍙戣揣鏄庣粏鐨勬暟鎹�
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
+ //鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
+ deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
+ deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
} else {
//鑾峰彇鍗曞彿
oddNumber = orderNumberSetting("鍙戣揣");
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
- Double area = 0.0;
+ double area = 0.0;
Integer quantity = 0;
- Double money = 0.0;
- //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ double money = 0.0;
+ AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ 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) {
+ 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.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()));
+ }else if (calculateType==3){
+ deliveryDetailMoney=Double.valueOf(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());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return false;
+ }
+ }
+ }
+
+ }
+
+
+ //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
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,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);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
}
+ //寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ deliveryOtherMoney.setId(null);
+ deliveryOtherMoney.setDeliveryId(oddNumber);
+ if(deliveryOtherMoney.getQuantity()!=null && deliveryOtherMoney.getPrice()!=null){
+ deliveryOtherMoney.setMoney((deliveryOtherMoney.getQuantity()*deliveryOtherMoney.getPrice()));
+ otherMoney.updateAndGet(v -> new Double((double) (v + deliveryOtherMoney.getMoney())));
+ deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
+ }
+ });
+ double freight=0.0;
+ if (delivery.getFreightPrice()!=null&&delivery.getFreightQuantity()!=null){
+ freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
+ }
+
+ int intMoney= (int) Math.round(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
} else {
return false;
}
- } catch (Exception e) {
+ }catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
@@ -214,6 +331,7 @@
saveState = false;
}
+
return saveState;
}
@@ -247,6 +365,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);
@@ -265,29 +393,108 @@
}
- 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="";
+ double otherMoney=0.0;
for (DeliveryDetail detail : deliveryDetailList) {
-
+ 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<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
+ detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), 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);
+ delivery.setMoney(delivery.getMoney()+otherMoney);
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<>();
+ 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);
+ }
+
+ }
+
+ }
+ }
+ 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);
+ }
+
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
+ }
+
+
+
+
private static final String[] NUMBERS = {"闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�"};
private static final String[] IUNIT = {"鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�"};
--
Gitblit v1.8.0