问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApply.java

@@ -91,4 +91,8 @@ public class BaseVehicleOutApply extends BaseEntity {
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
 
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName; // 内部引荐人姓名
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid; // 内部引荐人用户sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDetailsVo.java

@@ -91,5 +91,8 @@ public class BaseVehicleOutApplyDetailsVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName; // 内部引荐人姓名
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid; // 内部引荐人用户sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyDto.java

@@ -92,4 +92,8 @@ public class BaseVehicleOutApplyDto implements Dto {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName; // 内部引荐人姓名
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid; // 内部引荐人用户sid
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -504,10 +504,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             String sid1 = entity.getSid();
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
+            StringBuilder modelName = new StringBuilder();
+            if (StringUtils.isNotBlank(dto.getBrandName()) ){
+
+            }
             entity.setModelName(entity.getVehicleTypeValue() + entity.getProductLineValue() + entity.getDriveFormValue() + entity.getGearboxTypeValue() + entity.getVehicleVersionValue() + entity.getPowerValue() + entity.getFuelTypeValue() + entity.getEngineTypeValue() + entity.getEmissionStandardValue() + entity.getMarketSegmentsValue() + entity.getSpecifications() + entity.getDepartmentValue());
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
-            String modelName = entity.getModelName();
-            int i = baseMapper.checkSaveByModelName(modelName);
+            int i = baseMapper.checkSaveByModelName(modelName.toString());
             if (i > 0) {
                 return rb.setMsg("该车型信息已存在");
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -275,10 +275,11 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
                 scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
                 scmApplyInbound.setUseOrgSid(vehicleOrder.getCreateOrgSid());
+                BusVehicleApply busVehicleApply = busVehicleApplyService.fetchBySid(vehicleOrder.getPurchaseRequisitionSid());
                 if ("001".equals(vehicleOrder.getOrderTypeKey())){
-                    BusVehicleApply busVehicleApply = busVehicleApplyService.fetchBySid(vehicleOrder.getPurchaseRequisitionSid());
                     scmApplyInbound.setPcApplicationCode(busVehicleApply.getApplicationCode());
                 }
+                scmApplyInbound.setOrgSid(busVehicleApply.getOrgDeptSid());
                 scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
             }
             return rb.success();

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -114,7 +114,7 @@ public class ScmApplyInbound extends BaseEntity {
     private String nodeState;
     @ApiModelProperty("环节定义的ID")
     private String taskDefKey;
-    @ApiModelProperty("'部门sid'")
+    @ApiModelProperty("部门sid")
     private String orgSid;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -157,6 +157,8 @@ public class ScmApplyInboundDto implements Dto {
     private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("排产申请编号")
     private String pcApplicationCode;
+    @ApiModelProperty("部门sid")
+    private String orgSid;
 
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;