|
@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -180,7 +181,7 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
|
|
|
Map<Long, List<InventoryFinishedOrderDetail>> inventoryFinishedOrderMap = inventoryFinishedOrderDetailService.mapKGroup(
|
|
|
InventoryFinishedOrderDetail::getOrderInfoId,
|
|
|
- q -> q.eq(InventoryFinishedOrderDetail::getOperationType, 1)
|
|
|
+ q -> q.eq(InventoryFinishedOrderDetail::getOperationType, 2)
|
|
|
.in(InventoryFinishedOrderDetail::getOrderInfoId, orderIds));
|
|
|
Map<Long, OrderSku> orderSkuMap = orderSkuService.mapKEntity(BaseIdPo::getId, q -> q.in(OrderSku::getOrderId, orderIds));
|
|
|
|
|
@@ -270,8 +271,8 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
.add(orderSku.getDeliveryMaterialsFee())
|
|
|
.add(orderSku.getPackagingMaterialCost());
|
|
|
}
|
|
|
- inOutStorageBomErpExportVo.setUnitCost(unitCost.toPlainString());
|
|
|
- inOutStorageBomErpExportVo.setCostAmt(unitCost.multiply(new BigDecimal(item.getQuantity())).toPlainString());
|
|
|
+ inOutStorageBomErpExportVo.setUnitCost(unitCost.setScale(2, RoundingMode.HALF_UP).toPlainString());
|
|
|
+ inOutStorageBomErpExportVo.setCostAmt(unitCost.multiply(new BigDecimal(item.getQuantity())).setScale(2, RoundingMode.HALF_UP).toPlainString());
|
|
|
return inOutStorageBomErpExportVo;
|
|
|
})
|
|
|
.sorted(comparing(InOutStorageBomErpExportVo::getCode, Comparator.nullsFirst(String::compareTo)))
|