From eff455b5d32fb24af67e220f84d3ce693a6b594e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 10:40:35 +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 | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 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 91a3128..6e1fa78 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;
@@ -85,6 +88,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;
@@ -133,7 +158,7 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try{
+
String deliveryId="";
String oddNumber;
@@ -162,7 +187,7 @@
}
}
- List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
@@ -187,8 +212,13 @@
Integer quantity = 0;
double money = 0.0;
AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
- //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ deliveryOtherMoney.setQuantity(0.0);
+ });
+
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
@@ -200,16 +230,16 @@
Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
- if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity (otherColumns.get(key)==null?0:otherColumns.get(key));
- deliveryOtherMoney.setQuantity(((value==null?0:value)*orderDetail.getDeliveryDetail().getQuantity()));
- }
- });
+ if(value!=null) {
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+ }
});
}
-
//鏂板鍙戣揣鏄庣粏鏁版嵁
deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
@@ -235,16 +265,7 @@
} else {
return false;
}
- }catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- //灏嗗紓甯镐紶鍏ユ暟鎹簱
- SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
- sysErrorService.insert(sysError);
- saveState = false;
- }
return saveState;
}
@@ -279,6 +300,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);
@@ -320,6 +351,17 @@
}
+ 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