入库若多台车，需要分批入库的，后续入库申请的日期不能默认为上一次入库日期，直接默认为空。

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

@@ -171,4 +171,6 @@ public class ScmApplyInboundDto implements Dto {
     private List<ScmApplyInboundVehicleDto> vehicleList;
     @ApiModelProperty("附件信息表")
     private List<ScmFileDto> scmFiles;
+
+    private String logo;
 }

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

@@ -216,7 +216,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
             inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
-            inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
+
+            if (StringUtils.isNotBlank(dto.getLogo())) {
+                if (dto.getLogo().equals("1")) {
+                    inboundVehicle.setOrgPriceDate("");
+                }
+            } else {
+                inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
+            }
             save(inboundVehicle);
             String num = dto.getNum();
             if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@@ -326,7 +333,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String configSid = scmApplyInbound.getConfigSid();
         String useOrgSid = scmApplyInbound.getUseOrgSid();
         BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigFeign.selectOne(modelSid, configSid, useOrgSid).getData();
-        if (baseVehmodelVo != null){
+        if (baseVehmodelVo != null) {
             String guidedPrice = baseVehmodelVo.getGuidedPrice();
             String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice();
             vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice);
@@ -337,7 +344,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             } else {
                 vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
             }
-            if (StringUtils.isNotBlank(updateDate)){
+            if (StringUtils.isNotBlank(updateDate)) {
                 String[] updateDates = updateDate.split("-");
                 String[] nowDates = nowDate.split("-");
                 if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])) {
@@ -976,7 +983,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         return baseMapper.selectNum(bill);
     }
 
-    public ResultBean cancal(String sid,String cancalRemarks) {
+    public ResultBean cancal(String sid, String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         ScmApplyInbound scmApplyInbound = fetchBySid(sid);
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
@@ -1019,6 +1026,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
+        int vinCount = 0;
+        if (!vehicleList.isEmpty()) {
+            for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
+                if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo()) && StringUtils.isNotBlank(scmApplyInboundVehicleDto.getEngineNo())) {
+                    vinCount++;
+                }
+            }
+        }
+        if (vinCount < Integer.parseInt(num)) {
+            dto.setOrgPriceDate("");
+            dto.setLogo("1");
+        }
         if (StringUtils.isBlank(busSid)) {
             ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
             if (!resultBean.getSuccess()) {