采购付款生成的打款数据增加多公司、归属部门字段值

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/Pay.java

@@ -127,7 +127,12 @@ public class Pay extends BasePo {
     /**
      * 预付款单号
      */
-    private String advance_code;
+    private String advanceCode;
+
+    /**
+     * 归属公司
+     */
+    private Long corporationId;
     /**
      * 付款明细
      */

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -19,6 +19,7 @@ import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.pay.PayService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -99,16 +100,17 @@ public class PayFlow extends FlowDelegate {
         pay.setStatus(PayStatusEnum.PASS.getKey());
         pay.setApprovedDate(new Date());
         payService.updateById(pay);
-
         // 添加一条付款流水
         AccountPayment payment = new AccountPayment();
         payment.setAccountManagementId(pay.getAccountManagementId());
         payment.setBusinessId(pay.getId());
+        payment.setDepartmentId(SecurityUtils.getDeptId());
         // todo 暂时写死人民币
-        payment.setCurrency("CNY");
+        payment.setCurrency(pay.getCurrency());
         payment.setPaymentRemark(pay.getRemark());
         payment.setType(PaymentTypeEnum.REJECT.getKey());
         payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
+        payment.setCorporationId(pay.getCorporationId());
         payment.setAmount(pay.getAmount());
         payment.setIncomeAmount(pay.getAmount());
         payment.setName(pay.getName());

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/SalePurchaseServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -108,7 +109,7 @@ public class SalePurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchas
             if(ObjectUtils.isNotEmpty(purchase)){
                 List<PurchaseDetail> purchaseDetailList = purchaseDetailService.list(Wrappers.<PurchaseDetail>query().lambda().eq(PurchaseDetail::getPurchaseId,purchase.getId()));
                 for(PurchaseDetail p:purchaseDetailList){
-                    if(p.getDataResource()==1){//业务来源 0自建  1外销合同采购 2:样品单
+                    if(ObjectUtil.isNotEmpty(p.getDataResource())&&p.getDataResource()==1){//业务来源 0自建  1外销合同采购 2:样品单
                         //查询出外销合同产品
                         ContractProduct contractProduct = contractProductService.getById(p.getDataResourceId());
                         if(ObjectUtils.isEmpty(contractProduct)){
@@ -118,7 +119,7 @@ public class SalePurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchas
                         contractProduct.setExpendQuantity(sumExpendQuantity);
                         upContractProductList.add(contractProduct);
                     }
-                    if(p.getDataResource()==2){
+                    if(ObjectUtil.isNotEmpty(p.getDataResource())&&p.getDataResource()==2){
                         //查询出样品单产品
                         SampleProduct sampleProduct = sampleProductService.getById(p.getDataResourceId());
                         if(ObjectUtils.isEmpty(sampleProduct)){
@@ -137,6 +138,6 @@ public class SalePurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchas
                 sampleProductService.updateBatchById(upSampleProductList);
             }
         }
-        this.updateById(purchaseDto);
+        purchaseService.updateById(purchaseDto);
     }
 }