验车问题修改

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

@@ -29,6 +29,8 @@ 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.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 +117,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
 
+    @Autowired
+    BaseManufacturerFeign baseManufacturerFeign;
+
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -172,7 +177,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public IPage<ScmVehicleExaminePageVo> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
         IPage<ScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<ScmVehicleExaminePageVo> qw = carInspectedQueryWrapper(pagerQuery.getParams());
         IPage<ScmVehicleExaminePageVo> iPage = baseMapper.selectCarInspectedList(page, qw);
@@ -635,10 +640,15 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称
                         finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号
                         finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());
-                        Integer price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());
+                        int price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());//采购价格
-                        Integer num = outsourcingApplicationDetailsVo.getNum();
+                        Integer num = outsourcingApplicationDetailsVo.getNum();//采购数量
-                        finPaymentrecordDto.setCost(price * num - Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit()));
+                        int deposit = Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit());//订金
-                        finPaymentrecordDto.setBusSid("");
+                        finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                        finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid
+                        BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getSupplierSid()).getData();
+                        if (baseManufacturerAllVo != null) {
+                            finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//供应商编码
+                        }
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }
                     //车辆台账推送数据