公司间调车收车时库存地点查询修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -60,7 +60,6 @@ import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -501,8 +500,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setUseOrgName(scmVehicleEnterlibrary.getUseOrgName());
                     baseVehicleDto.setLocation(scmVehicleEnterlibrary.getLocationSid());
                     baseVehicleDto.setLocationName(scmVehicleEnterlibrary.getLocation());
-                    ScmWarehouseVo scmWarehouseVo = scmWarehouseService.selectByGressionCode(scmVehicleEnterlibrary.getLocationSid());
-                    baseVehicleDto.setLocationCode(scmWarehouseVo.getGressionCode());//库存地点编码
+                    ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
+                    if(scmWarehouse != null){
+                        baseVehicleDto.setLocationCode(scmWarehouse.getGressionCode());//库存地点编码
+                    }
                     baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
                     baseVehicleDto.setPriceDate(scmVehicleEnterlibrary.getInboundFactoryDate());
                     baseVehicleDto.setWarrantyCardNo(scmVehicleEnterlibrary.getWarrantyCardNo());// 保修卡号 验车