增加图片、附件、关联审批单字段

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1219,7 +1219,7 @@
     <select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT *
         FROM base_vehicle bv
-        WHERE vinNo = #{vinNo}
+        WHERE vinNo like concat('%', #{vinNo}, '%')
           AND isDelete = 0
           AND vehicleState != "0004"
     </select>

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

@@ -11,10 +11,7 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -294,7 +291,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             // 验证数据库是否重复
             for (int i = 0; i < vinNoList.size(); i++) {
                 //int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getUseOrgSid(), dto.getSid());
-                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
+               // BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
+                //检索集团内是否存在非删除、非退车的车架号
+                BaseVehicleVo data= baseVehicleFeign.selVehicleByVinNo(vinNoList.get(i)).getData();
                /* if (count > 0) {
                     baseMapper.updateNodeStatedtj(dto.getSid());
                     return new ResultBean().setMsg("入库车辆信息中" + vinNoList.get(i) + "车架号已经存在");

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java

@@ -24,7 +24,7 @@ public class OaForm extends BaseEntity {
     private String billNo;
     @ApiModelProperty("创建人")
     private String createByName;
-    @ApiModelProperty("公司sid")
+    @ApiModelProperty("sid")
     private String useOrgSid;
     @ApiModelProperty("公司名称")
     private String useOrgName;