feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位

shiyunteng

昨天 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java

@@ -58,6 +58,9 @@
   @Value("${dept.smjzt}")
   private String smjzt;

   @Value("${dept.smjhw}")
   private String smjhw;

   @Value("${dept.sgb}")
   private String sgb;

@@ -111,7 +114,8 @@
      addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
         OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
         if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
               StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
               StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
               StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
            outBound.setBatchNumber(generateSMJContractCKNo());
         }
         if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -465,8 +469,9 @@
         return r;
      }
      Contract contract = r.getData();
      String batchNumber = genBatchNumber();
      //出库
      handleOutBound(contract, addDTO);
      handleOutBound(batchNumber,contract, addDTO);

      //保存资金明细
      BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
@@ -474,7 +479,7 @@
      contract.setOutBoundAmout(outBoundAmount);
      updateContractSchedule(contract);

      return R.ok();
      return R.ok(batchNumber);
   }

   private void updateContractSchedule(Contract contract) {
@@ -543,7 +548,7 @@
      return outAmount;
   }

   private void handleOutBound(Contract contract, OutBoundAddDTO addDTO) {
   private void handleOutBound(String batchNumber,Contract contract, OutBoundAddDTO addDTO) {
      addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
         ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
               .eq(ContractSubjectMatter::getContractId, contract.getId())
@@ -571,7 +576,6 @@
         subjectMatter.setActualDeliveryDate(addDTO.getOutBoundTime());
         contractSubjectMatterMapper.updateById(subjectMatter);
         //保存erp出库
         String batchNumber = genBatchNumber();
         Long outBoundId = saveErpOutBound(contract, addDTO, outSubjectMatterAddDTO, batchNumber);
         //保存合同出库记录
         saveContractOutBound(contract, addDTO, subjectMatter, outBoundId);
@@ -580,7 +584,8 @@

   private String genBatchNumber() {
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
            StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
         return generateSMJContractCKNo();
      }
      if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {