问题修改

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

@@ -199,6 +199,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveOrUpdateApplyInBound(ScmApplyInboundDto dto) {
         List<ScmFileDto> scmFiles = dto.getScmFiles();
+        List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
+        if (vehicleList.size() == 0) {
+            return new ResultBean().fail().setMsg("车辆列表不能为空");
+        }
+        for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+            String vinNo = scmApplyInboundVehicleDto.getVinNo();
+            vinNo = vinNo.trim();
+            vinNo = vinNo.replace(" ","");
+            if (vinNo.length() != 17 || vinNo.length() != 8){
+                return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo()+"车架号输入不正确");
+            }
+        }
         String orgPath = "";
         if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
             orgPath = dto.getOrgSidPath();
@@ -241,10 +253,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
         } else { // 修改
-            List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-            if (vehicleList.size() == 0) {
-                return new ResultBean().fail().setMsg("车辆列表不能为空");
-            }
             if (StringUtils.isBlank(dto.getDepartureDate())) {
                 return new ResultBean().fail().setMsg("请填写厂家发车日期");
             }

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

@@ -57,6 +57,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryCarWarehousingDto;
 import com.yxt.anrui.scm.api.scmvehicleexamine.*;
 import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemVo;
@@ -196,11 +197,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     public IPage<ScmVehicleExaminePageVo> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
         IPage<ScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
         ScmVehicleExaminePageQuery params = pagerQuery.getParams();
-        if(StringUtils.isNotBlank(params.getOrgPath())){
+        if (StringUtils.isNotBlank(params.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
             params.setUseOrgSid(useOrgSid);
-            
-        }else{
+
+        } else {
             String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
             params.setUseOrgSid(useOrgSid);
         }
@@ -217,7 +218,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             } else {
                 //品牌
                 BaseVehicleModel data = baseVehicleModelFeign.selectDetails(record.getModelSid()).getData();
-                if (StringUtils.isNotBlank(data.getCarBrand())){
+                if (StringUtils.isNotBlank(data.getCarBrand())) {
                     BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
                     //厂商sid
                     BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
@@ -226,8 +227,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 }
             }
             //根据车型sid、配置sid、分公司sid查询车型与配置的sid
-            ResultBean<BaseVehmodelVo> resultBean = baseVehmodelConfigFeign.selectOne(record.getModelSid(),record.getConfigSid(), record.getUseOrgSid());
-            if(resultBean.getData() != null){
+            ResultBean<BaseVehmodelVo> resultBean = baseVehmodelConfigFeign.selectOne(record.getModelSid(), record.getConfigSid(), record.getUseOrgSid());
+            if (resultBean.getData() != null) {
                 record.setModelSidAndConfig(resultBean.getData().getModelConfigSid());
                 record.setGuidedPrice(resultBean.getData().getGuidedPrice());
             }
@@ -550,6 +551,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isBlank(dto.getInboundDate())) {
             return rb.setMsg("厂家入库日期不能为空");
         }
+        String vinNo = dto.getVin();
+        vinNo = vinNo.trim();
+        vinNo = vinNo.replace(" ", "");
+        if (vinNo.length() != 17 || vinNo.length() != 8) {
+            return new ResultBean().fail().setMsg(dto.getVin() + "车架号输入不正确");
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         String s1 = "";
@@ -715,7 +722,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) {
                         BaseOutsourcingApplicationDetailsVo outsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleExamine.getBusinessSid()).getData();
                         //判断外采申请中 是否先付款 0否 1是 先付款的不推送出纳待付款列表
-                        if ("0".equals(outsourcingApplicationDetailsVo.getIsBeforePayment())){
+                        if ("0".equals(outsourcingApplicationDetailsVo.getIsBeforePayment())) {
                             FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
                             finPaymentrecordDto.setPurchaseSystemSid(outsourcingApplicationDetailsVo.getPurchaseSystemSid());
                             finPaymentrecordDto.setPurchaseSystemName(outsourcingApplicationDetailsVo.getPurchaseSystemName());