From ad4e0e5444d2f4f6a4df45742a146428d646d02e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 七月 2024 13:23:56 +0800
Subject: [PATCH] 提交空闲位置
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 1933568..f0525b5 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
@@ -237,8 +237,8 @@
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
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);
//棰濆閲戦淇敼
@@ -366,6 +366,29 @@
}
+ public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail) {
+ Map<String, Object> map = new HashMap<>();
+ List <Map<String, Object>> list=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());
+ itemmap.put("DeliveryDetail", detail);
+ itemmap.put("DeliveryDetailList", deliveryDetailList2);
+ list.add(itemmap);
+
+
+ }
+ Order order=deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail);
+ map.put("data", list);
+ 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);
}
--
Gitblit v1.8.0