wms租赁推送到bms计费凭证

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java

@@ -74,4 +74,11 @@ public class BusinessDataPushDTO{
 
     @ApiModelProperty("数据来源（1-系统生成，2-手工录入）")
     private Integer dataSources;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -493,6 +493,9 @@ public class LeaseApplicationService {
             jsonObject.put("jiecun_cbm",0);//结存体积
             businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString());
             businessDataPushDTO.setDocumentTypeCode("TY_ZL");
+            businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
+            businessDataPushDTO.setSalesmanName(leasePO.getSalesmanName());
+            businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
             businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId());
             businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
             businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
@@ -539,6 +542,9 @@ public class LeaseApplicationService {
             jsonObject.put("jiecun_cbm",totalVolume);//结存体积
             businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString());
             businessDataPushDTO.setDocumentTypeCode("TY_ZL");
+            businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
+            businessDataPushDTO.setSalesmanName(leasePO.getSalesmanName());
+            businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
             businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId());
             businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
             businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java

@@ -93,4 +93,7 @@ public class Lease extends BaseVOEntity{
 
     @ApiModelProperty("推送时间")
     private String pushTime;
+
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java

@@ -94,4 +94,7 @@ public class LeasePO extends BaseVOEntity{
 
     @ApiModelProperty("推送时间")
     private String pushTime;
+
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java

@@ -110,4 +110,7 @@ public class LeaseDO extends BaseVOEntity{
 
     @ApiModelProperty("推送时间")
     private String pushTime;
+
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java

@@ -107,4 +107,7 @@ public class LeaseDTO extends BaseVOEntity{
 
     @ApiModelProperty("推送时间")
     private String pushTime;
+
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
 }

mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml

@@ -67,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.bill_days,
             a.bill_time,
             a.salesman_name,
-            a.settlement_currency
+            a.settlement_currency,
+            a.salesman_id
         from lease a
         LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1
     </sql>