Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -19,6 +19,12 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
     @ApiModelProperty("配置")
     private String config;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -23,6 +23,12 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     @ApiModelProperty("配置")
     private String config;
 
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
     @ApiModelProperty("车型")
     private String model;
 

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

@@ -434,7 +434,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
                     scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
                     scmEntryVehicleExamineDto.setModelName(booad.getModelName());
-                    //订单类型                    scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
+                    scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
+                    //订单类型
                     scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
                     scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
                     scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());

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

@@ -58,7 +58,9 @@
                price,
                modelDifferenceExplain,
                guaranteeCardNo,
-               inboundDate
+               inboundDate,
+               modelSid,
+               configSid
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
           AND sve.useOrgSid = #{useOrgSid}
@@ -80,7 +82,9 @@
                sve.price,
                sve.modelDifferenceExplain,
                sve.guaranteeCardNo,
-               sve.inboundDate
+               sve.inboundDate,
+               sve.modelSid,
+               sve.configSid
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
     </select>

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

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+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.common.enums.ManPurOrderType;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -315,17 +315,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 
         scmFileService.deleteByLinkSidAndType(scmVehicleInventory.getSid(), type);
         List<String> images = dto.getImages();
-        if (images.size() > 0) {
-            for (String image : images) {
-                if (image.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                    s = image.replace(fileUploadComponent.getUrlPrefix(), "");
+        if (dto.getImages() != null) {
+            if (images.size() > 0) {
+                for (String image : images) {
+                    if (image.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s = image.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    ScmFile scmFile = new ScmFile();
+                    scmFile.setAttachType(type);
+                    scmFile.setFileName("盘库见证材料");
+                    scmFile.setFilePath(s);
+                    scmFile.setLinkSid(scmVehicleInventory.getSid());
+                    scmFileService.save(scmFile);
                 }
-                ScmFile scmFile = new ScmFile();
-                scmFile.setAttachType(type);
-                scmFile.setFileName("盘库见证材料");
-                scmFile.setFilePath(s);
-                scmFile.setLinkSid(scmVehicleInventory.getSid());
-                scmFileService.save(scmFile);
             }
         }
         save(scmVehicleInventory);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml

@@ -20,9 +20,9 @@
         FROM
         scm_vehicle_stay_inventory svsi
         LEFT JOIN scm_vehicle_inventory svi
-        ON svsi.`mainSid` = svi.`mainSid` AND svsi.createOrgSid = svi.createOrgSid
+        ON svsi.`mainSid` = svi.`mainSid`
         LEFT JOIN anrui_base.`base_vehicle` bv
-        ON bv.`vinNo` = svsi.mainSid AND svsi.createOrgSid = bv.createOrgSid
+        ON bv.`vinNo` = svsi.mainSid
         <where>${ew.sqlSegment}</where>
         GROUP BY svsi.`mainSid`
     </select>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
@@ -94,7 +95,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         if (StringUtils.isNotBlank(query.getLocationSid())) {
             qw.eq("svsi.locationSid", query.getLocationSid());
         }
-        qw.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0003");
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0003"));
         IPage<ScmVehicleStayInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleStayInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehicleStayInventoryVo> p = PagerUtil.pageToVo(pagging, null);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java

@@ -20,6 +20,12 @@ public class AppExamineDetailsVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
     @ApiModelProperty("配置")
     private String config;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java

@@ -19,6 +19,12 @@ public class AppExamineDto implements Dto {
     @ApiModelProperty("车型")
     private String model;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
     @ApiModelProperty("配置")
     private String config;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java

@@ -15,6 +15,12 @@ public class AppExaminePageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
     @ApiModelProperty("发车日期")
     private String dispatchedDate;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppSubmitDto.java

@@ -17,6 +17,10 @@ public class AppSubmitDto implements Dto {
     private String purchaseKey;
     @ApiModelProperty("配置")
     private String config;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
     @ApiModelProperty("车型")
     private String model;
     @ApiModelProperty("厂商验车照片")