供应商

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -540,7 +540,8 @@
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
                t.cp_id,
-               t.flg_valid
+               t.flg_valid,
+               t.fact_amt
         FROM dkic_b.t_psi_order as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/model/vo/ivt/OutboundVO.java

@@ -48,6 +48,11 @@ public class OutboundVO{
     @Excel(name = "收款金额")
     @ApiModelProperty(value = "收款金额")
     private BigDecimal sumAmtRec;
+    /**
+     * 合计金额
+     */
+    @ApiModelProperty(value = "合计金额")
+    private BigDecimal sumAmount;
 
     /**
      * 实际金额

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -297,6 +297,12 @@ public class OrderService extends BaseService<Order> {
             for (OrderItemVO orderItemVO : orderVO.getItemList()) {
                 OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
                 orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+               if( orderItem.getPriceStd()==null){
+                 orderItem.setPriceStd(BigDecimal.ZERO);
+               }
+                if( orderItem.getAmtStd()==null){
+                    orderItem.setAmtStd(BigDecimal.ZERO);
+                }
                 orderItemMapper.insert(orderItem);
             }
         }
@@ -454,6 +460,11 @@ public class OrderService extends BaseService<Order> {
             outboundVO.setOutingAmt(orderVO.getSumAmount());
             outboundVO.setFlgAutoHandle(orderVO.getFlgAutoHandle());
             outboundVO.setFlgHandleSetting(orderVO.getFlgHandleSetting());
+            outboundVO.setOutDate(orderVO.getDeliveryDate());
+            outboundVO.setFactAmt(orderVO.getFactAmt());
+            outboundVO.setDiscount(orderVO.getDiscount());
+            outboundVO.setDiscAmt(orderVO.getDiscAmt());
+            outboundVO.setSumAmount(orderVO.getSumAmount());
             outboundSaleOrderService.inventoryOUtBond(outboundVO);
         }
 
@@ -504,6 +515,12 @@ public class OrderService extends BaseService<Order> {
         for (OrderItemVO orderItemVO : insertOrderItemVOList) {
             OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
             orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+            if( orderItem.getPriceStd()==null){
+                orderItem.setPriceStd(BigDecimal.ZERO);
+            }
+            if( orderItem.getAmtStd()==null){
+                orderItem.setAmtStd(BigDecimal.ZERO);
+            }
             orderItemMapper.insert(orderItem);
         }
         // 编辑的