问题修改

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

@@ -114,6 +114,16 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<BaseManufacturerAllVo> details(@PathVariable("sid") String sid);
 
+    /**
+     * 车辆台账新增查询供应商
+     *
+     * @return
+     */
+    @ApiOperation("车辆台账新增查询供应商")
+    @GetMapping("/selectSupplier")
+    @ResponseBody
+    public ResultBean<List<Map<String,String>>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey,@RequestParam(value = "carBrandSid",required = false) String carBrandSid,@RequestParam("orgSid") String orgSid);
+
     /**
      * 外采供应商名称下拉选
      *

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

@@ -61,6 +61,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return new ResultBean<BaseManufacturerAllVo>().fail().setMsg("接口anrui-base/basemanufacturer/details无法访问");
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -123,4 +123,30 @@ public class BaseOutsourcingApplication extends BaseEntity {
     private String insideCode; // 内部编码
     @ApiModelProperty("是否先付款")
     private String isBeforePayment; // 是否先付款
+
+    @ApiModelProperty("品牌sid")
+    private String carBrandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String carBrandName; // 品牌名称
+    @ApiModelProperty("品牌code")
+    private String carBrandCode; // 品牌code
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("采购系统code")
+    private String purchaseSystemCode; // 采购系统code
+    @ApiModelProperty("采购类型key")
+    private String manPurOrderTypeKey; // 采购类型key
+    @ApiModelProperty("供应商code")
+    private String supplierCode; // 供应商code
+    @ApiModelProperty("采购组织code")
+    private String orgCode; // 采购组织code
+    @ApiModelProperty("外采车辆类型key")
+    private String vehicleTypeKey; // 外采车辆类型key
+    @ApiModelProperty("订金使用规则key")
+    private String depositUseRuleKey; // 订金使用规则key
+    @ApiModelProperty("订金使用规则value")
+    private String depositUseRuleValue; // 订金使用规则value
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -120,6 +120,32 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private String insideCode; // 内部编码
     @ApiModelProperty("是否先付款")
     private String isBeforePayment; // 是否先付款
+
+    @ApiModelProperty("品牌sid")
+    private String carBrandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String carBrandName; // 品牌名称
+    @ApiModelProperty("品牌code")
+    private String carBrandCode; // 品牌code
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("采购系统code")
+    private String purchaseSystemCode; // 采购系统code
+    @ApiModelProperty("采购类型key")
+    private String manPurOrderTypeKey; // 采购类型key
+    @ApiModelProperty("供应商code")
+    private String supplierCode; // 供应商code
+    @ApiModelProperty("采购组织code")
+    private String orgCode; // 采购组织code
+    @ApiModelProperty("外采车辆类型key")
+    private String vehicleTypeKey; // 外采车辆类型key
+    @ApiModelProperty("订金使用规则key")
+    private String depositUseRuleKey; // 订金使用规则key
+    @ApiModelProperty("订金使用规则value")
+    private String depositUseRuleValue; // 订金使用规则value
+
     @ApiModelProperty("合同附件")
     private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -143,6 +143,32 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private String insideCode; // 内部编码
 	@ApiModelProperty("是否先付款")
 	private String isBeforePayment; // 是否先付款
+
+	@ApiModelProperty("品牌sid")
+	private String carBrandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+	private String carBrandName; // 品牌名称
+	@ApiModelProperty("品牌code")
+	private String carBrandCode; // 品牌code
+	@ApiModelProperty("采购系统sid")
+	private String purchaseSystemSid; // 采购系统sid
+	@ApiModelProperty("采购系统名称")
+	private String purchaseSystemName; // 采购系统名称
+	@ApiModelProperty("采购系统code")
+	private String purchaseSystemCode; // 采购系统code
+	@ApiModelProperty("采购类型key")
+	private String manPurOrderTypeKey; // 采购类型key
+	@ApiModelProperty("供应商code")
+	private String supplierCode; // 供应商code
+	@ApiModelProperty("采购组织code")
+	private String orgCode; // 采购组织code
+	@ApiModelProperty("外采车辆类型key")
+	private String vehicleTypeKey; // 外采车辆类型key
+	@ApiModelProperty("订金使用规则key")
+	private String depositUseRuleKey; // 订金使用规则key
+	@ApiModelProperty("订金使用规则value")
+	private String depositUseRuleValue; // 订金使用规则value
+
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 	@ApiModelProperty("合同附件信息")

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

@@ -159,6 +159,9 @@ public class BaseVehicle extends BaseEntity {
     private String manufacturerSid;
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
 
     @ApiModelProperty(value = "存放地点code")
     private String locationCode;

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

@@ -128,6 +128,8 @@ public class BaseVehicleDto implements Dto {
     private String manufacturerSid;
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
 
     @ApiModelProperty(value = "存放地点code")
     private String locationCode;

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

@@ -133,6 +133,8 @@ public class BaseVehicleSelectVo implements Vo {
     private String manufacturerSid;
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
 
     @ApiModelProperty(value = "存放地点code")
     private String locationCode;

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

@@ -146,6 +146,8 @@ public class BaseVehicleVo implements Vo {
     private String supplierCode;
     @ApiModelProperty(value = "分公司code")
     private String orgCode;
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
     //车型配置
     @ApiModelProperty("车身颜色(陕汽必须的字段)")
     private String carColor;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java

@@ -31,4 +31,10 @@ public class BaseVehicleOutQuery implements Query {
     private String concatNo;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("销售部门")
+    private String orgDeptSid;
+
+    @ApiModelProperty("销售专员")
+    private String staffSid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java

@@ -62,5 +62,8 @@ public class BaseVehmodelConfigQuerys implements Query {
     private String buyerOrgSid;
     @ApiModelProperty(value = "品牌sid")
     private String carBrandSid;
-
+    @ApiModelProperty(value = "内部编码")
+    private String insideCode;
+    @ApiModelProperty(value = "编码")
+    private String code;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java

@@ -38,4 +38,6 @@ public class BaseVehmodelConfigVos implements Vo {
     private String brandSid;
     @ApiModelProperty("品牌名称")
     private String brandName;
+    @ApiModelProperty("车辆类型key")
+    private String vehicleTypeKey;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@@ -29,8 +29,10 @@
         bip.`sellerOrgSid`
         FROM
         base_internal_purchase_vehicle bipv
-        LEFT JOIN base_internal_purchase bip
+        INNER JOIN base_internal_purchase bip
         ON bipv.`mainSid` = bip.`sid`
+        INNER JOIN base_vehicle bv
+        ON bip.`buyerOrgSid` = bv.`createOrgSid` AND bipv.`vinNo` = bv.`vinNo`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -436,7 +436,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "1");
                     BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(purchaseSid);
                     baseVehicleService.updateVehicleState(VehicleState.StockEnum.NX_STOCK.getCode(), VehicleState.StockEnum.NX_STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
+                    baseVehicleService.updateSalePrice(baseInternalPurchaseVehicle.getWitPinMoney(),baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
                     baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
+                    baseVehicleService.updateConAndCostPrice(baseInternalPurchaseVehicle.getWitPinMoney(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
                 }
                 try {
                     //关联查询调车车辆列表中的采购部门sid

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

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

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

@@ -314,4 +314,12 @@
           AND (useOrg = ""
                 OR useOrg IS NULL)
     </select>
+
+    <select id="selectOrgSidAndSupplierType" resultType="java.util.Map">
+        SELECT manufacturerName,
+               sid
+        FROM base_manufacturer
+        WHERE supplierType = #{s}
+          AND createOrg = #{orgSid}
+    </select>
 </mapper>

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

@@ -124,6 +124,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return baseManufacturerService.details(sid);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid,String orgSid) {
+        return baseManufacturerService.selectSupplier(manPurOrderTypeKey,carBrandSid,orgSid);
+    }
+
     @Override
     public ResultBean<List<Map<String, String>>> wcgysNamesDown(String orgSid) {
         return baseManufacturerService.wcgysNamesDown(orgSid);

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

@@ -642,7 +642,28 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         String sid = baseMapper.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
         return rb.success().setData(sid);
     }
+
     public List<Map<String, Object>> selectByZjcAndUseOrgIsNull() {
         return baseMapper.selectByZjcAndUseOrgIsNull();
     }
+
+    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = new ArrayList<>();
+        if (manPurOrderTypeKey.equals("001") || manPurOrderTypeKey.equals("004")) {
+            Map<String, String> map = new HashMap<>();
+            String manufacturerSid = baseVehicleBrandService.fetchBySid(carBrandSid).getManufacturerSid();
+            BaseManufacturer baseManufacturer = fetchBySid(manufacturerSid);
+            map.put("sid", manufacturerSid);
+            map.put("manufacturerName", baseManufacturer.getManufacturerName());
+            maps.add(map);
+        } else if (manPurOrderTypeKey.equals("002")) {
+            maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0004");
+        } else if (manPurOrderTypeKey.equals("005")) {
+            maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0002");
+        } else if (manPurOrderTypeKey.equals("003")) {
+            maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0005");
+        }
+        return rb.success().setData(maps);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -143,6 +144,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     private AppSubsetVersionFeign appSubsetVersionFeign;
     @Autowired
     private BaseManufacturerService baseManufacturerService;
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
 
     private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -236,6 +239,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             entity.setUseOrgSid(orgSidPath);
             entity.setCreateBySid(dto.getUserSid());
             entity.setNodeState("待提交");
+            String carBrandSid = dto.getCarBrandSid();
+            String brandCode = baseVehicleBrandService.fetchBySid(carBrandSid).getBrandCode();
+            entity.setCarBrandCode(brandCode);
+            String purchaseSystemSid = dto.getPurchaseSystemSid();
+            String purchaseSystemCode = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData().getOrgCode();
+            entity.setPurchaseSystemCode(purchaseSystemCode);
+            entity.setManPurOrderTypeKey("002");
+            String purchasingUnitSid = dto.getPurchasingUnitSid();
+            String manufacturerCode = baseManufacturerService.fetchBySid(purchasingUnitSid).getManufacturerCode();
+            entity.setSupplierCode(manufacturerCode);
+            String useOrgSid = dto.getUseOrgSid();
+            String orgCode = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getOrgCode();
+            entity.setOrgCode(orgCode);
             save(entity);
             for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
                 BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();

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

@@ -445,7 +445,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice} where vinNo = #{vinNo}")
+    @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo}")
     void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo);
 
     @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}")
@@ -466,4 +466,10 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     void updateVehRemarks(@Param("remarks") String remarks, @Param("sid") String sid);
 
     IPage<PayBaseVehicleVo> selectPayVehicleList(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    @Update("update base_vehicle set salePrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callOutOrgSid}")
+    void updateSalePrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid);
+
+    @Update("update base_vehicle set contractPrice = #{witPinMoney},costPrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callInOrgSid}")
+    void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid);
 }

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

@@ -3110,4 +3110,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
 
+    public void updateSalePrice(String witPinMoney, String vinNo, String callOutOrgSid) {
+        baseMapper.updateSalePrice(witPinMoney,vinNo,callOutOrgSid);
+    }
+
+    public void updateConAndCostPrice(String witPinMoney, String vinNo, String callInOrgSid) {
+        baseMapper.updateConAndCostPrice(witPinMoney,vinNo,callInOrgSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -56,6 +56,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             String vinNo = String.join(",", count);
             return rb.setMsg(vinNo + "车辆不满足出库条件");
         }*/
+
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -287,6 +288,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getCustomerName())) {
                 qw.like("bvo.customerName", params.getCustomerName());
             }
+            //销售部门
+            if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
+                qw.eq("bvo.orgSid", params.getOrgDeptSid());
+            }
+            //销售人员
+            if (StringUtils.isNotBlank(params.getStaffSid())) {
+                qw.eq("bvo.staffSid", params.getStaffSid());
+            }
             qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -312,7 +312,8 @@
         bvc.manufactorSettlementPrice,
         bvc.insideCode,
         bvm.brandName,
-        bvm.carBrand brandSid
+        bvm.carBrand brandSid,
+        bvm.vehicleType as vehicleTypeKey
         FROM
         base_vehmodel_config bvc
         LEFT JOIN base_vehicle_model bvm

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -646,6 +646,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         if (StringUtils.isNotBlank(query.getCarBrandSid())){
             qw.eq("bvm.carBrand", query.getCarBrandSid());
         }
+        if (StringUtils.isNotBlank(query.getInsideCode())){
+            qw.like("bvc.insideCode",query.getInsideCode());
+        }
+        if (StringUtils.isNotBlank(query.getCode())){
+            qw.and(wrapper -> wrapper.like("bvm.vehicleTypeCode", query.getCode()).or().like("bmc.configCode", query.getCode()));
+        }
         qw.eq("bvm.isDelete", 0);
         qw.eq("bmc.isDelete", 0);
         IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -45,6 +45,16 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<CrmCustomerTempVo>> listPage(@RequestBody PagerQuery<CrmCustomerTempQuery> pq);
 
+    /**
+     * 潜在客户管理区分组织层级查询
+     *
+     * @param pq
+     * @return
+     */
+    @ApiOperation("潜在客户管理区分组织层级查询")
+    @PostMapping("/listPageByOrgPathSid")
+    public ResultBean<PagerVo<CrmCustomerTempVo>> listPageByOrgPathSid(@RequestBody PagerQuery<CrmCustomerTempQuery> pq);
+
     @ApiOperation("根据条件查询所有数据列表")
     @PostMapping("/listAll")
     public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -31,6 +31,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return rb.setMsg("接口anrui-crm/crmcustomertemp/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<CrmCustomerTempVo>> listPageByOrgPathSid(PagerQuery<CrmCustomerTempQuery> pq) {
+		return null;
+	}
+
 	@Override
     public ResultBean<List<CrmCustomerTempVo>> listAll(CrmCustomerTempQuery query){
 		ResultBean rb = ResultBean.fireFail();

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java

@@ -24,6 +24,9 @@ import lombok.Data;
 @Data
 public class CrmCustomerTempQuery implements Query {
 
+    @ApiModelProperty(value = "组织全路径")
+    private String orgSidPath;
+
 	@ApiModelProperty("客户类型key（自然人/法人）")
     private String customerTypeKey;
     

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
-        SELECT *,
+        SELECT cct.*,
                (SELECT COUNT(*)
                 FROM crm_vehicledemand cv
                 WHERE cct.sid = cv.customerSid
@@ -13,6 +13,7 @@
                 FROM crm_visit cvi
                 WHERE cct.sid = cvi.customerSid) gjcounts
         FROM crm_customer_temp cct
+        LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -61,6 +61,17 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<CrmCustomerTempVo>> listPageByOrgPathSid(@RequestBody PagerQuery<CrmCustomerTempQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+            String staffSid = sysUserFeign.selectBySid(pq.getParams().getUserSid()).getData().getStaffSid();
+            pq.getParams().setStaffSid(staffSid);
+        }
+        PagerVo<CrmCustomerTempVo> pv = crmCustomerTempService.listPageByOrgPathSid(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query) {
         ResultBean rb = ResultBean.fireFail();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -23,6 +23,8 @@ import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService;
 import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
@@ -89,6 +91,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     private CommonAppendixFeign commonAppendixFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
 
     public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
@@ -111,28 +115,28 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
-            qw.eq("customerTypeKey", query.getCustomerTypeKey());
+            qw.eq("cct.customerTypeKey", query.getCustomerTypeKey());
         }
 
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("name", query.getName());
+            qw.like("cct.name", query.getName());
         }
 
         if (StringUtils.isNotBlank(query.getLevelKey())) {
-            qw.eq("levelKey", query.getLevelKey());
+            qw.eq("cct.levelKey", query.getLevelKey());
         }
 
         if (StringUtils.isNotBlank(query.getMobile())) {
-            qw.like("mobile", query.getMobile());
+            qw.like("cct.mobile", query.getMobile());
         }
 
         if (StringUtils.isNotBlank(query.getStaffSid())) {
-            qw.eq("staffSid", query.getStaffSid());
+            qw.eq("cct.staffSid", query.getStaffSid());
         }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
-        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(remindEndDay), "date_format (remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+                apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
                 );
         return qw;
     }
@@ -146,6 +150,50 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         return p;
     }
 
+    public PagerVo<CrmCustomerTempVo> listPageByOrgPathSid(PagerQuery<CrmCustomerTempQuery> pq) {
+        CrmCustomerTempQuery query = pq.getParams();
+        QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
+        String userSid = query.getUserSid();
+        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        String orgSidPath = query.getOrgSidPath();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            qw.eq("cct.createOrgSid", sid);
+        }
+        if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
+            qw.eq("cct.customerTypeKey", query.getCustomerTypeKey());
+        }
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("cct.name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getLevelKey())) {
+            qw.eq("cct.levelKey", query.getLevelKey());
+        }
+
+        if (StringUtils.isNotBlank(query.getMobile())) {
+            qw.like("cct.mobile", query.getMobile());
+        }
+
+        if (StringUtils.isNotBlank(query.getStaffSid())) {
+            qw.eq("cct.staffSid", query.getStaffSid());
+        }
+        String remindStartDay = query.getRemindStartDay();
+        String remindEndDay = query.getRemindEndDay();
+        qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+                );
+        IPage<CrmCustomerTemp> page = PagerUtil.queryToPage(pq);
+        IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<CrmCustomerTempVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public List<CrmCustomerTempVo> listAllVo(CrmCustomerTempQuery query) {
         QueryWrapper<CrmCustomerTemp> qw = createQueryWrapper(query);
         return baseMapper.selectListAllVo(qw);
@@ -921,4 +969,5 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
 }

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

@@ -488,6 +488,11 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     //分公司code
                     SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(scmVehicleEnterlibrary.getUseOrgSid()).getData();
                     baseVehicleDto.setOrgCode(sysOrganizationVo1.getOrgCode());
+                    //发动机编号、排产订单编号、物流发车日期
+                    BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vehicleDetailsVo.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid()).getData();
+                    baseVehicleDto.setEngineNo(baseVehicle.getEngineNo());
+                    baseVehicleDto.setOrderingNo(baseVehicle.getOrderingNo());
+                    baseVehicleDto.setDepartureDate(SimpleDateFormat.getDateInstance().format(baseVehicle.getDepartureDate()));
                     baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     baseVehicleDto.setVinNo(scmVehicleEnterlibrary.getVinNo());
                     baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid