Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -126,6 +126,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")
     private List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos; // 外采车辆列表
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
 
     private String createBySid;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@@ -8,6 +8,7 @@
   },
   "FRealQty": 1.0,
   "FPrice": @KD_FPrice,
+  "FTaxPrice": @KD_FPrice,
   "FAmount": @KD_FPrice,
   "FIsFree": false,
   "FOwnerTypeID": "BD_OwnerOrg",

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -29,6 +29,9 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -115,6 +118,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
 
+    @Autowired
+    BaseManufacturerFeign baseManufacturerFeign;
+
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -629,6 +635,10 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         Integer num = outsourcingApplicationDetailsVo.getNum();
                         finPaymentrecordDto.setCost(price * num - Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit()));
                         finPaymentrecordDto.setBusSid("");
+                        BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getSupplierSid()).getData();
+                        if (baseManufacturerAllVo != null) {
+                            finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());
+                        }
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }
                     //车辆台账推送数据