配送明细同步wms

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java

@@ -404,5 +404,8 @@ public class StockOutOrder extends BaseVOEntity {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+    @ApiModelProperty("退货数量")
+    @Excel(name = "退货数量")
+    private BigDecimal returnQuantity;
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -430,6 +430,8 @@ public class StockOutOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("配送顺序")
     private String deliveryOrder;
-
+    @ApiModelProperty("退货数量")
+    @Excel(name = "退货数量")
+    private BigDecimal returnQuantity;
     private List<DeliveryDetailsLink> deliveryDetailsLinkList;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -452,4 +452,7 @@ public class StockOutOrderDO extends BaseVOEntity {
     private String salesmanName;
     @ApiModelProperty("费用")
     List<ReceiptOrderAccount> receiptOrderAccountList;
+    @ApiModelProperty("退货数量")
+    @Excel(name = "退货数量")
+    private BigDecimal returnQuantity;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -441,7 +441,9 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     private String salesmanName;
     @ApiModelProperty("费用")
     List<ReceiptOrderAccount> receiptOrderAccountList;
-
+    @ApiModelProperty("退货数量")
+    @Excel(name = "退货数量")
+    private BigDecimal returnQuantity;
     /**
      * 提货单打印所选模版（与图5单选项文案一致即可）。可传副标题如「谷丰--营销部」，或整段「提货单--谷丰--营销部」；不传则标题为「提货单」
      */

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -94,6 +94,7 @@
         <result property="salesmanName" column="SALESMAN_NAME"/>
         <result property="settlementCurrency" column="SETTLEMENT_CURRENCY"/>
         <result property="businessOrderNo" column="business_order_no"/>
+        <result property="returnQuantity" column="RETURN_QUANTITY"/>
     </resultMap>
 
 
@@ -114,7 +115,7 @@
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY,
-        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no
+        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY
     </sql>