问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -57,6 +57,16 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);
 
+    /**
+     * 获取分公司下所有供应商
+     *
+     * @return
+     */
+    @ApiOperation("获取分公司下所有供应商")
+    @PostMapping("/getGysByOrgSid")
+    @ResponseBody
+    public ResultBean<List<BaseManufacturerVo>> getGysByOrgSid(@RequestParam("orgSid") String orgSid);
+
     /**
      * 生成厂商开户行信息到供应商
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -35,6 +35,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseManufacturerVo>> getGysByOrgSid(String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java

@@ -64,8 +64,10 @@ public class BaseVehinstallmodel extends BaseEntity {
     private String refitMethodKey; // 委改方式key
 	@ApiModelProperty("委改方式value")
     private String refitMethodValue; // 委改方式value
-	@ApiModelProperty("委改厂")
-    private String refitFactory; // 委改厂
+    @ApiModelProperty("供应商sid")
+    private String refitFactorySid; // 供应商sid
+	@ApiModelProperty("供应商名称")
+    private String refitFactory; // 供应商名称
 	@ApiModelProperty("颜色key")
     private String colorKey; // 颜色key
 	@ApiModelProperty("颜色value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java

@@ -65,8 +65,10 @@ public class BaseVehinstallmodelDetailsVo implements Vo {
     private String refitMethodKey; // 委改方式key
 	@ApiModelProperty("委改方式value")
     private String refitMethodValue; // 委改方式value
-	@ApiModelProperty("委改厂")
-    private String refitFactory; // 委改厂
+    @ApiModelProperty("供应商sid")
+    private String refitFactorySid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String refitFactory; // 供应商名称
 	@ApiModelProperty("颜色key")
     private String colorKey; // 颜色key
 	@ApiModelProperty("颜色value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java

@@ -67,8 +67,10 @@ public class BaseVehinstallmodelDto implements Dto {
     private String refitMethodKey; // 委改方式key
 	@ApiModelProperty("委改方式value")
     private String refitMethodValue; // 委改方式value
-	@ApiModelProperty("委改厂")
-    private String refitFactory; // 委改厂
+    @ApiModelProperty("供应商sid")
+    private String refitFactorySid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String refitFactory; // 供应商名称
 	@ApiModelProperty("颜色key")
     private String colorKey; // 颜色key
 	@ApiModelProperty("颜色value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelQuery.java

@@ -57,8 +57,8 @@ public class BaseVehinstallmodelQuery implements Query {
     private String installNameKey; // 上装名称key
 	@ApiModelProperty("委改方式key")
     private String refitMethodKey; // 委改方式key
-	@ApiModelProperty("委改厂")
-    private String refitFactory; // 委改厂
+    @ApiModelProperty("供应商sid")
+    private String refitFactorySid; // 供应商sid
 	@ApiModelProperty("颜色key")
     private String colorKey; // 颜色key
     @ApiModelProperty("板材材质key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java

@@ -59,8 +59,10 @@ public class BaseVehinstallmodelVo implements Vo {
     private String installNameValue; // 上装名称value
 	@ApiModelProperty("委改方式value")
     private String refitMethodValue; // 委改方式value
-	@ApiModelProperty("委改厂")
-    private String refitFactory; // 委改厂
+    @ApiModelProperty("供应商sid")
+    private String refitFactorySid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String refitFactory; // 供应商名称
 	@ApiModelProperty("颜色value")
     private String colorValue; // 颜色value
 	@ApiModelProperty("外廓尺寸_长")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -145,4 +145,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<Map<String, Object>> selectByZjcAndUseOrgIsNull();
 
     List<Map<String, String>> selectOrgSidAndSupplierType(@Param("orgSid") String orgSid,@Param("s") String s);
+
+    List<BaseManufacturerVo> getGysByOrgSid(String orgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -322,4 +322,11 @@
         WHERE supplierType = #{s}
           AND createOrg = #{orgSid}
     </select>
+
+    <select id="getGysByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo">
+        SELECT bm.sid,
+               bm.manufacturerName
+        FROM base_manufacturer bm
+        WHERE createOrg = #{orgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -85,6 +85,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<List<BaseManufacturerVo>> getGysByOrgSid(String orgSid) {
+        return baseManufacturerService.getGysByOrgSid(orgSid);
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return baseManufacturerService.copyManBankToGys(orgSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -316,7 +316,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     }
                 }
             });*/
-            Future future2 = pool.submit(() -> {
+            /*Future future2 = pool.submit(() -> {
                 //金蝶推送
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(dto.getBaseManufacturerDto().getManufacturerName());
@@ -325,7 +325,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
 //        bdSupplier.setTOrgIds("101");
                 bdSupplier.setFNumber(dto.getBaseManufacturerDto().getManufacturerCode());
                 ResultBean<String> stringResultBean = finKingDeeFeign.draftBdSupplier(bdSupplier);
-            });
+            });*/
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -666,4 +666,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         return rb.success().setData(maps);
     }
+
+    public ResultBean<List<BaseManufacturerVo>> getGysByOrgSid(String orgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysByOrgSid(orgSid);
+        return rb.success().setData(baseManufacturerVos);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java

@@ -72,8 +72,8 @@ public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstal
 		if (StringUtils.isNotBlank(query.getRefitMethodKey())){
 			qw.eq("refitMethodKey",query.getRefitMethodKey());
 		}
-		if (StringUtils.isNotBlank(query.getRefitFactory())){
-			qw.like("refitFactory",query.getRefitFactory());
+		if (StringUtils.isNotBlank(query.getRefitFactorySid())){
+			qw.eq("refitFactorySid",query.getRefitFactorySid());
 		}
 		if (StringUtils.isNotBlank(query.getInstallNameKey())){
 			qw.eq("installNameKey",query.getInstallNameKey());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -139,9 +140,9 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
                 record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
                 record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
             }
-            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
-            if (vehicleVo != null) {
-                record.setModel(vehicleVo.getModelName());
+            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, query.getCreateOrgSid()).getData();
+            if (baseVehicle != null) {
+                record.setModel(baseVehicle.getModelName());
             }
             String locationSid = record.getLocationSid();
             ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);