出入库业务单添加金额逻辑;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java

@@ -340,6 +340,10 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
     @Excel(name = "总价")
     private BigDecimal totalPrice;
 
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
     @ApiModelProperty("合同收费")
     @Excel(name = "合同收费")
     private BigDecimal contractFee;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java

@@ -477,4 +477,5 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
     private String lotNumber;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java

@@ -438,4 +438,8 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     private Date drinkDate;
     private String expiryDate;
     private String productionDate;
+
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java

@@ -385,6 +385,11 @@ public class ReservationOutMaterialDetail extends BaseVOEntity {
     @Excel(name = "总价")
     private BigDecimal totalAmount;
 
+
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
     /**
      * 单位
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java

@@ -35,7 +35,6 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase
     @ApiModelProperty("业务唯一id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long uniqueId;
-
     @ApiModelProperty("组织表ID")
     @Excel(name = "组织表ID")
     private Long organizationId;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java

@@ -34,7 +34,9 @@ public class ReservationOutMaterialDetailDO extends BaseVOEntity {
     @ApiModelProperty("组织表ID")
     @Excel(name = "组织表ID")
     private Long organizationId;
-
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
     @ApiModelProperty("组织名称")
     @Excel(name = "组织名称")
     private String organizationName;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java

@@ -420,7 +420,9 @@ public class ReservationStockInOrder extends BaseVOEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("推送时间")
     private Date pushTime;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("推送人")
     private Long pushBy;
 

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -442,7 +442,9 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("推送人")
     private Long pushBy;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("推送人姓名")
     private String pushByName;
     @ApiModelProperty("附件url")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -163,6 +163,10 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @Excel(name = "体积 单位：立方米")
     private BigDecimal volumeLimit;
 
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
+
     @ApiModelProperty("是否取消订单: 1-是 2-否")
     @Excel(name = "是否取消订单: 1-是 2-否")
     private Integer cancelOrder;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java

@@ -40,7 +40,9 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @ApiModelProperty("仓库id")
     @Excel(name = "仓库id")
     private Long warehouseId;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("仓库编码")
     @Excel(name = "仓库编码")
     private String warehouseCode;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -111,6 +111,9 @@ public class ReservationStockInOrderDomainService {
 //        //统计总计划数
         BigDecimal quantity =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderDO.setQuantity(quantity);
+
+        BigDecimal amount =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getTotalPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockInOrderDO.setAmount(amount);
 //        //统计总重量
 //        BigDecimal weightLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 //        stockInOrderDO.setWeightLimit(weightLimit);
@@ -165,6 +168,8 @@ public class ReservationStockInOrderDomainService {
         BigDecimal quantity =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderPO.setQuantity(quantity);
         stockInOrderDO.setQuantity(quantity);
+        BigDecimal amount =  stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getTotalPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockInOrderDO.setAmount(amount);
         //统计总重量
         BigDecimal weightLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReservationInMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockInOrderDO.setWeightLimit(weightLimit);

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -481,7 +481,9 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @ApiModelProperty("运输业务单号")
     @Excel(name = "运输业务单号")
     private String businessNumber;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private Integer trainNo;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -32,7 +32,9 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("出库单id")
     private Long outOrderId;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("组织表ID")
     @Excel(name = "组织表ID")
     private Long organizationId;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -40,7 +40,9 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("一级组织表ID")
     @Excel(name = "一级组织表ID")
     private Long topOrganizationId;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
 
     @ApiModelProperty("通知单号")
     @Excel(name = "通知单号")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -31,7 +31,9 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @ApiModelProperty("组织表ID")
     @Excel(name = "组织表ID")
     private Long organizationId;
-
+    @ApiModelProperty("总价")
+    @Excel(name = "总价")
+    private BigDecimal amount;
     @ApiModelProperty("组织名称")
     @Excel(name = "组织名称")
     private String organizationName;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -108,6 +108,8 @@ public class ReservationStockOutOrderDomainService {
         stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size());
         BigDecimal quantity = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setQuantity(quantity);
+        BigDecimal totalAmount = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getTotalAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockOutOrderDO.setAmount(totalAmount);
         BigDecimal weightLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setWeightLimit(weightLimit);
         BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -177,6 +179,8 @@ public class ReservationStockOutOrderDomainService {
         //统计总数量
         BigDecimal quantity = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setQuantity(quantity);
+        BigDecimal totalAmount = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getTotalAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockOutOrderDO.setAmount(totalAmount);
         //统计总重量
         BigDecimal weightLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setWeightLimit(weightLimit);