移动端-完善销售订单车型中现车添加当前分公司限制

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -215,7 +215,7 @@ public interface BaseVehicleFeign {
 
     @ApiOperation("app销售订单-根据车型和配置sid查询现车列表")
     @GetMapping("/selectAppList")
-    ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid);
+    ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid);
 
     /***************************************************** App接口 **********************************************************/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -137,7 +137,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid,String orgSid) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -205,7 +205,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid
      * @return
      */
-    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("state")String state,@Param("orgSid")String orgSid);
+    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid);
 
     /**
      * 现车分页列表（新）
@@ -370,7 +370,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid 配置sid
      * @return
      */
-    List<AppBaseVehicleOrderVo> selectAppList(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    List<AppBaseVehicleOrderVo> selectAppList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state);
 
     String selectImage(String vehicleSid);
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -754,6 +754,8 @@
         from base_vehicle bv
         where bv.modelSid = #{modelSid}
           and bv.modelConfigSid = #{configSid}
+          and bv.useOrg = #{orgSid}
+          and bv.vehicleState = #{state}
         order by isFictitious desc
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -355,8 +355,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
-        return baseVehicleService.selectAppList(modelSid, configSid);
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid, String orgSid) {
+        return baseVehicleService.selectAppList(modelSid, configSid, orgSid);
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -627,9 +627,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid,String userSid) {
+    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid) {
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid,VehicleState.LockEnum.UN_LOCK.getCode(),orgSid);
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
         if (vins.size() <= 0) {
             for (AppVinsDetailsVo vin : vins) {
                 vins.add(vin);
@@ -1335,10 +1335,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
     }
 
-    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid) {
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid, String orgSid) {
         ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
         List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
-        orderVoList = baseMapper.selectAppList(modelSid, configSid);
+        orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid,VehicleState.StockEnum.STOCK.getCode());
         if (orderVoList.isEmpty()) {
             return rb.setData(orderVoList);
         }
@@ -1363,7 +1363,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(path);
     }
 
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid , String userSid) {
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppScmWarehouseVinVo> list = baseMapper.getVinByWarehouseSid(warehouseSid);
         if (list.size() <= 0) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1326,7 +1326,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String saleOrderSid = appInitModelQuery.getSalesOrderSid();
         String customerSid = appInitModelQuery.getCustomerSid();
         String userSid = appInitModelQuery.getUserSid();
-
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         if (busSalesOrder == null) {
             return rb.setMsg("销售订单单据信息不存在");
@@ -1353,7 +1353,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //所有该车型的采购订单列表
             List<AppReadyCarVo> appReadyCar = new ArrayList<>();
             //根据车型sid及配置sid查询现车列表
-            ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
+            ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid, orgSid);
             if (orderVoResultBean.getSuccess()) {
                 List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
@@ -1497,6 +1497,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String configSid = appBusSaleOrderInitModelInfoQuery.getConfigSid();
         String customerSid = appBusSaleOrderInitModelInfoQuery.getCustomerSid();
         String userSid = appBusSaleOrderInitModelInfoQuery.getUserSid();
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         //选择的车型信息的数据
@@ -1536,7 +1537,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
         vo.setOrderInfo(orderInfo);
         //查询该车型下的现车列表
-        ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
+        ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid, orgSid);
         if (orderVoResultBean.getSuccess()) {
             List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
             voList.removeAll(Collections.singleton(null));
@@ -1916,6 +1917,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @return
      */
     public Boolean isVehicle(String sid) {
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
         Boolean isVehicle = true;
         //根据销售订单查询是否有车型信息
         AppOrderInfoVo orderInfo = busSalesOrderModelService.selectAppDetailsVoBySaleOrderSid(sid);
@@ -1924,8 +1926,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             List<String> vinNoList = new ArrayList<>();
             String modelSid = orderInfo.getModelSid();
             String configSid = orderInfo.getConfigSid();
+            String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(busSalesOrder.getStaffSid()).getData();
             //根据车型sid及配置sid查询现车列表
-            ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
+            ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid, orgSid);
             if (orderVoResultBean.getSuccess()) {
                 List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {