From 9d03f27756f048330952c86e51cfaa6bbe61a3ae Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 12 六月 2024 16:49:56 +0800
Subject: [PATCH] 流程卡打印排序功能，排产查询修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 61387e1..1933568 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
@@ -187,7 +187,7 @@
}
}
- List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
+ List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
if (!deliveryDetaillist.isEmpty()) {
for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
//杩樺師搴撳瓨鏁颁互鍙婅鍗曟槑缁嗙殑鍙戣揣鏁�
@@ -221,12 +221,27 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ double deliveryDetailMoney = 0.0;
+ if (orderDetail.getOrder().getCalculateType()==1){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
+ *orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
+ }else if (orderDetail.getOrder().getCalculateType()==2){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }else if (orderDetail.getOrder().getCalculateType()==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();
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) ->{
@@ -242,7 +257,7 @@
}
//鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
@@ -300,6 +315,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);
--
Gitblit v1.8.0