Merge remote-tracking branch 'origin/master'

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

@@ -380,8 +380,14 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
                     BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                     baseVehicleDto.setVinNo(dto.getVin());
-                    baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
-                    baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+                    //若库存状态为在途，则更新为库存，否则不修改
+                    if(VehicleState.StockEnum.ING_STOCK.getCode().equals(data1.getVehicleState())){
+                        baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+                        baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+                    }else{
+                        baseVehicleDto.setVehicleState(data1.getVehicleState());
+                        baseVehicleDto.setVehicleStateValue(data1.getVehicleStateValue());
+                    }
                     baseVehicleDto.setArrivalDate(dto.getDate());
                     baseVehicleDto.setPriceDate(scmVehicleEnterlibrary.getInboundFactoryDate());
                     baseVehicleDto.setLocation(dto.getWarehouseKey()); //库存地点sid