问题修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -534,8 +534,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 ScmApplyInbound scmApplyInbound = scmApplyInboundService.fetchBySid(businessSid);
                 List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
-                ResultBean<List<String>> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(scmApplyInbound.getPriceDate(),
-                        bv.getUserSid(), booad, businessSid, scmApplyInboundVehicleDtos);
+                ResultBean<List<String>> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(booad, scmApplyInboundVehicleDtos);
                 saveItem(sids);
                 FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData();
                 List<FlowTask> flowList = flowRecordVo.getFlowList();

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

@@ -483,16 +483,14 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      * 入账申请 保存验车单
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean<List<String>> saveEntryCarInspectedInfoBatch(String priceDate, String userSid, ScmApplyInbound booad,
-                                                                   String businessSid,
-                                                                   List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
+    public ResultBean<List<String>> saveEntryCarInspectedInfoBatch(ScmApplyInbound booad, List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
         ResultBean<List<String>> rb = ResultBean.fireFail();
         List<ScmVehicleExamine> list = new ArrayList<>();
         List<String> sids = new ArrayList<>();
         for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
             //验车数据推送
             ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
-            scmEntryVehicleExamineDto.setBusinessSid(businessSid);
+            scmEntryVehicleExamineDto.setBusinessSid(booad.getSid());
             //发动机号
             scmEntryVehicleExamineDto.setEngineNo(scmApplyInboundVehicleDto.getEngineNo());
             //配置的名称
@@ -503,7 +501,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             //订单类型
             scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
             scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
-            scmEntryVehicleExamineDto.setUserSid(userSid);
+            scmEntryVehicleExamineDto.setUserSid(booad.getApplicationSid());
             scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
             scmEntryVehicleExamineDto.setInspectionResult("1");
             scmEntryVehicleExamineDto.setPrice("");
@@ -511,15 +509,13 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             scmEntryVehicleExamineDto.setPurchaseTypeKey(booad.getManPurOrderTypeKey());
             scmEntryVehicleExamineDto.setPurchaseType(booad.getManPurOrderTypeValue());
             //厂家入库日期
-            scmEntryVehicleExamineDto.setInboundDate(priceDate);
+            scmEntryVehicleExamineDto.setInboundDate(booad.getPriceDate());
             ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine();
             BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
             if (StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgSid()) && StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgName())) {
-                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmEntryVehicleExamineDto.getUserSid()).getData();
-                SysOrganizationVo data = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
                 scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
-                scmVehicleExamine.setUseOrgSid(useOrgSid);
-                scmVehicleExamine.setUseOrgName(data.getName());
+                scmVehicleExamine.setUseOrgSid(booad.getUseOrgSid());
+                scmVehicleExamine.setUseOrgName(booad.getUseOrgName());
             }
             sids.add(scmVehicleExamine.getSid());
             list.add(scmVehicleExamine);