bms2相关修改；

mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java

@@ -891,6 +891,11 @@ public class BusinessDocumentApplicationService {
         businessDocumentDO.setEstimatedCost(billingCostPo.getComputationalCost());
         businessDocumentDO.setBillAmount(billingCostPo.getComputationalCost());//计费金额与计算金额一致
         log.info("定时任务进入BMS业务单据保存--结束");
-        return businessDocumentDomainService.insert(businessDocumentDO);
+        BusinessDocument businessDocument = businessDocumentDomainService.insertRetrun(businessDocumentDO);
+        BusinessDocumentDTO businessDocumentDTO = new BusinessDocumentDTO();
+        businessDocumentDTO.setBusinessDocumentIds(String.valueOf(businessDocument.getBusinessDocumentId()));
+        this.takeEffectByIds(businessDocumentDTO);
+        this.auditByIds(businessDocumentDTO);
+        return true;
     }
 }

mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java

@@ -287,6 +287,7 @@ public class SettlementCustomersApplicationService {
                     saveEntity.setSettlementMethodCode("monthly_settle");
                     saveEntity.setMainRole(1);
                     saveEntity.setCustomerTypeCode("customer"); //从货主同步过来的 默认客户
+                    saveEntity.setNcCode(userShipperPo.getCustomerNcCode());
                     Long settlementEntityId = saveEntity.getSettlementEntityId();
                     List<SettlementCustomers> settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper<SettlementCustomers>().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId));
                     if(settlementCustomers != null && settlementCustomers.size() > 0){

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java

@@ -239,4 +239,8 @@ public class BillManage extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanName;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java

@@ -257,5 +257,9 @@ public class BillManagePO extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanName;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
     private List<BillDetail> billDetailList;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java

@@ -260,5 +260,8 @@ public class BillManageDO extends BaseVOEntity{
     private String receivablePushTimeStart;
     private String paymentPushTimeEnd;
     private String paymentPushTimeStart;
-
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java

@@ -149,6 +149,8 @@ public class BillManageDomainService {
         billManage.setSettlementCustomersCode(billingStatementPOS.get(0).getSettlementCustomersCode());
         billManage.setSalesmanId(billingStatementPOS.get(0).getSalesmanId());
         billManage.setSalesmanName(billingStatementPOS.get(0).getSalesmanName());
+        billManage.setPaymentAccountId(billingStatementPOS.get(0).getPaymentAccountId());
+        billManage.setPaymentAccountName(billingStatementPOS.get(0).getPaymentAccountName());
         billManage.setBillRemark(billingRemark);
         //查询结算对象信息
         SettlementCustomersPO settlementCustomersPO = settlementCustomersDomainService.getInfo(billingStatementPOS.get(0).getSettlementCustomersId());
@@ -239,6 +241,21 @@ public class BillManageDomainService {
         BillingStatementDO billingStatementDO  = new BillingStatementDO();
         billingStatementDO.setBillingStatementIdSet(billingSet);
         List<BillingStatementPO> billingStatementPOS = billingStatementDomainService.queryList(billingStatementDO);
+
+        //获取最新一条的业务员信息
+        String salesmanId = null;
+        String salesmanName = null;
+        if (billingStatementPOS != null && !billingStatementPOS.isEmpty()) {
+            billingStatementPOS.sort((a, b) -> {
+                if (a.getCreateTime() == null && b.getCreateTime() == null) return 0;
+                if (a.getCreateTime() == null) return 1;
+                if (b.getCreateTime() == null) return -1;
+                return b.getCreateTime().compareTo(a.getCreateTime());
+            });
+            salesmanId = billingStatementPOS.get(0).getSalesmanId();
+            salesmanName = billingStatementPOS.get(0).getSalesmanName();
+        }
+
         List<BillingStatementADDVO> billingStatementList = billingStatementDTO.getBillingStatementList();
         for (BillingStatementPO billingStatementPO : billingStatementPOS) {
             String billingStatementId = billingStatementPO.getBillingStatementId() == null ? "" : String.valueOf(billingStatementPO.getBillingStatementId());
@@ -252,6 +269,10 @@ public class BillManageDomainService {
             billingStatementPO.setInvoiceItemName(billingStatementADDVO.getInvoiceItemName());
             billingStatementPO.setBillingAmount(billingStatementADDVO.getBillingAmount());
             billingStatementPO.setBillingStatementIdStr(billingStatementADDVO.getBillingStatementId());
+            if (salesmanName != null && !salesmanName.isEmpty() && salesmanId != null && !salesmanId.isEmpty()) {
+                billingStatementPO.setSalesmanId(salesmanId);
+                billingStatementPO.setSalesmanName(salesmanName);
+            }
         }
         List<BillingStatementPO> distinctList = billingStatementPOS.stream()
                 .filter(Objects::nonNull)
@@ -262,7 +283,6 @@ public class BillManageDomainService {
                 ))
                 .values()
                 .stream().collect(Collectors.toList());
-
         if(billingStatementPOS==null || billingStatementPOS.size()==0){
             throw new ServiceException("所选流水信息未找到");
         }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/entity/BillingStatement.java

@@ -205,4 +205,9 @@ public class BillingStatement extends BaseVOEntity{
     private String salesmanName;
     @ApiModelProperty("账单管理id")
     private Long billManageId;
+
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementADDVO.java

@@ -53,5 +53,8 @@ public class BillingStatementADDVO extends BaseVOEntity {
     private String invoiceItemName;
     @ApiModelProperty(value = "费用类别")
     private String feeType;
-
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java

@@ -217,5 +217,8 @@ public class BillingStatementPO extends BaseVOEntity{
     private String billingStatementIdStr;
     @ApiModelProperty("账单管理id")
     private Long billManageId;
-
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java

@@ -235,4 +235,8 @@ public class BillingStatementDO extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanName;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java

@@ -414,6 +414,9 @@ public class BillingStatementDomainService {
         billingStatementDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
         billingStatementDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         billingStatementDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        //收款帐户信息
+        billingStatementDO.setPaymentAccountId(businessDocumentPO.getPaymentAccountId()); //收款帐户ID
+        billingStatementDO.setPaymentAccountName(businessDocumentPO.getPaymentAccountName()); //收款帐户名称
 
         BigDecimal billingAmount = billingStatementDO.getBillingAmount();
         Double taxRate = billingStatementDO.getTaxRate() != null ? billingStatementDO.getTaxRate() : 0.0;

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java

@@ -178,4 +178,8 @@ public class BusinessDocument extends BaseVOEntity{
     private String salesmanName;
     @ApiModelProperty("税率")
     private String taxRate;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/facade/IBusinessDocumentService.java

@@ -25,6 +25,11 @@ public interface IBusinessDocumentService extends IService<BusinessDocument>
      */
     public Boolean insert(BusinessDocumentDO businessDocumentDO);
 
+    /**
+     * 新增业务单据
+     */
+    public BusinessDocument insertReturn(BusinessDocumentDO businessDocumentDO);
+
     /**
      * 修改业务单据
      */
@@ -42,4 +47,4 @@ public interface IBusinessDocumentService extends IService<BusinessDocument>
     public BusinessDocumentPO getInfo(Long businessDocumentId);
 
     BusinessDocumentPO queryByOriginalBusinessNumAndSubjectCode(String originalBusinessNum, String secondSubjectCode);
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java

@@ -44,6 +44,20 @@ public class BusinessDocumentImpl extends ServiceImpl<BusinessDocumentMapper, Bu
         return this.save(businessDocument);
     }
 
+    /**
+     * 新增业务单据
+     */
+    @Override
+    public BusinessDocument insertReturn(BusinessDocumentDO businessDocumentDO) {
+        BusinessDocument businessDocument = new BusinessDocument();
+        BeanUtils.copyProperties(businessDocumentDO,businessDocument);
+        boolean save = this.save(businessDocument);
+        if (save){
+            return businessDocument;
+        }
+        return businessDocument;
+    }
+
     /**
      * 修改业务单据
      */
@@ -93,4 +107,4 @@ public class BusinessDocumentImpl extends ServiceImpl<BusinessDocumentMapper, Bu
         BeanUtils.copyProperties(businessDocument,businessDocumentPO);
         return businessDocumentPO;
     }
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java

@@ -183,4 +183,8 @@ public class BusinessDocumentPO extends BaseVOEntity{
     private String salesmanName;
     @ApiModelProperty("税率")
     private String taxRate;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java

@@ -203,4 +203,8 @@ public class BusinessDocumentDO extends BaseVOEntity{
     private String salesmanName;
     @ApiModelProperty("税率")
     private String taxRate;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/service/BusinessDocumentDomainService.java

@@ -50,6 +50,14 @@ public class BusinessDocumentDomainService {
         return businessDocumentService.insert(businessDocumentDO);
     }
 
+    /**
+     * 新增业务单据
+     */
+    public BusinessDocument insertRetrun(BusinessDocumentDO businessDocumentDO) {
+
+        return businessDocumentService.insertReturn(businessDocumentDO);
+    }
+
     /**
      * 修改业务单据
      */
@@ -193,4 +201,4 @@ public class BusinessDocumentDomainService {
     public Boolean saveOrUpdateBatch(List<BusinessDocument> businessDocumentList) {
         return businessDocumentService.saveOrUpdateBatch(businessDocumentList);
     }
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/entity/SettlementCustomers.java

@@ -89,7 +89,8 @@ public class SettlementCustomers extends BaseVOEntity{
 
     @ApiModelProperty("项目名称")
     private String projectName;
+    @ApiModelProperty(name = "nc编码")
+    private String ncCode;
 
 
-
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/po/SettlementCustomersPO.java

@@ -90,6 +90,7 @@ public class SettlementCustomersPO extends BaseVOEntity{
     private String projectName;
 
     private String settlementObject;
+    @ApiModelProperty(name = "nc编码")
+    private String ncCode;
 
-
-}
+}

mhd_bms/src/main/java/com/mhd/bms/domain/settlementCustomers/repository/todo/SettlementCustomersDO.java

@@ -102,6 +102,7 @@ public class SettlementCustomersDO extends BaseVOEntity{
 
     @ApiModelProperty("项目名称")
     private String projectName;
+    @ApiModelProperty(name = "nc编码")
+    private String ncCode;
 
-
-}
+}

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java

@@ -272,4 +272,8 @@ public class BillManageDTO extends BaseVOEntity{
     private String receivablePushTimeStart;
     private String paymentPushTimeEnd;
     private String paymentPushTimeStart;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java

@@ -244,6 +244,10 @@ public class BillingStatementDTO extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanName;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
     private List<BillingStatementADDVO> billingStatementList;
 
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java

@@ -209,4 +209,8 @@ public class BusinessDocumentDTO extends BaseVOEntity{
     private String salesmanName;
     @ApiModelProperty("税率")
     private String taxRate;
+    @ApiModelProperty("收款帐户")
+    private String paymentAccountId;
+    @ApiModelProperty("收款帐户名称")
+    private String paymentAccountName;
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/settlementCustomers/SettlementCustomersDTO.java

@@ -101,5 +101,6 @@ public class SettlementCustomersDTO extends BaseVOEntity{
 
     @ApiModelProperty("项目名称")
     private String projectName;
-
-}
+    @ApiModelProperty(name = "nc编码")
+    private String ncCode;
+}