Merge remote-tracking branch 'origin/master'

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/AppScmInventoryRecordsQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.bouncycastle.cms.PasswordRecipient;
+
+import java.util.List;
+
+@Data
+public class AppScmInventoryRecordsQuery implements Query {
+
+    private static final long serialVersionUID = 4579459336588197901L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("分公司路径")
+    private String orgPath;
+
+    @ApiModelProperty("车架号")
+    private List<String> vinNoList;
+
+}

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/BaseVehicleFeign.java

@@ -416,12 +416,12 @@ public interface BaseVehicleFeign {
     public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(@RequestBody PagerQuery<VinByWarehouseQuery> pagerQuery);
 
     @ApiOperation("盘库根据用户sid 获取库存车辆信息")
-    @GetMapping("/selectInventoryRecords/{userSid}")
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);
+    @PostMapping("/selectInventoryRecords")
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@RequestBody AppScmInventoryRecordsQuery appScmInventoryRecordsQuery);
 
     @ApiOperation("巡检根据用户sid 获取库存车辆信息")
-    @GetMapping("/selectPatrolinspections")
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(@RequestParam(value = "userSid") String userSid, @RequestParam(value = "vinNoList") List<String> vinNoList);
+    @PostMapping("/selectPatrolinspections")
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(@RequestBody AppScmInventoryRecordsQuery appScmInventoryRecordsQuery);
 
     @ApiOperation("根据车架号和分公司sid查询车辆信息")
     @PostMapping("/selectByVinNoAndOrgSid")

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

@@ -317,12 +317,12 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
         return null;
     }
 
     @Override
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
         return null;
     }
 

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: 这里根据具体业务调整查询条件
@@ -200,10 +203,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         String sid = dto.getSid();
         BigDecimal guidedPrice = dto.getGuidedPrice();
         BigDecimal purchasePrice = dto.getPurchasePrice();
-        if (guidedPrice == null){
+        if (guidedPrice == null) {
             return rb.setMsg("销售指导价不能为空");
         }
-        if (purchasePrice == null){
+        if (purchasePrice == null) {
             return rb.setMsg("采购价格不能为空");
         }
         if (StringUtils.isBlank(sid)) {//新增
@@ -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();
@@ -412,12 +428,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(uff,messageFlowVo);
+            BeanUtil.copyProperties(uff, messageFlowVo);
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("外采申请");
-            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             //极光推送
@@ -459,13 +475,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(uff,messageFlowVo);
+            BeanUtil.copyProperties(uff, messageFlowVo);
             uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("外采申请");
-            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 //            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
@@ -483,14 +499,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(uff,messageFlowVo);
+            BeanUtil.copyProperties(uff, messageFlowVo);
             uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
             uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("外采申请");
-            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("外采申请");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 //            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
@@ -528,12 +544,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         String businessTaskid = booad.getTaskId();
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
             //=================添加app相关参数
-            Map<String,Object> appMap = new HashMap<>();
-            appMap.put("sid",bv.getBusinessSid());
-            bv.getFormVariables().put("app",appMap);
+            Map<String, Object> appMap = new HashMap<>();
+            appMap.put("sid", bv.getBusinessSid());
+            bv.getFormVariables().put("app", appMap);
             //================添加app相关参数
-            BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid());
-            ResultBean<UpdateFlowFieldVo> rb = complete_handleProsess(bv,dto);
+            BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid());
+            ResultBean<UpdateFlowFieldVo> rb = complete_handleProsess(bv, dto);
             String taskDefKey = rb.getData().getTaskDefKey();
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
             updateFlowFiled(stringObjectMap);
@@ -562,19 +578,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                         return rb.setMsg("验车单业务模块的数据推送失败!");
                     }
                 }
-            }else{
+            } else {
                 //======================添加消息推送开始
                 UpdateFlowFieldVo uff = rb.getData();
                 BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(uff,messageFlowVo);
+                BeanUtil.copyProperties(uff, messageFlowVo);
                 uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
                 messageFlowableQuery.setModuleName("外采申请");
-                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("外采申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
                 //======================添加消息推送结束
@@ -586,11 +602,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         }
     }
 
-    public ResultBean<UpdateFlowFieldVo> complete_handleProsess(BusinessVariables bv,  BaseOutsourcingApplicationDto dto) {
-            ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
-            Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
-            updateFlowFiled(stringObjectMap);
-            //消息推送===========开始
+    public ResultBean<UpdateFlowFieldVo> complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) {
+        ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
+        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
+        updateFlowFiled(stringObjectMap);
+        //消息推送===========开始
            /* UpdateFlowFieldVo uff = rb.getData();
             if (!"Event_end".equals(uff.getTaskDefKey())) {
                 BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
@@ -607,8 +623,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             }*/
-            //消息推送结束=====
-            return rb;
+        //消息推送结束=====
+        return rb;
     }
 
     /**
@@ -747,9 +763,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
             BeanUtil.copyProperties(flowTaskVo, fl);
             //==========添加app相关参数
-            Map<String,Object> appMap = new HashMap<>();
-            appMap.put("sid",flowTaskVo.getBusinessSid());
-            flowTaskVo.getValues().put("app",appMap);
+            Map<String, Object> appMap = new HashMap<>();
+            appMap.put("sid", flowTaskVo.getBusinessSid());
+            flowTaskVo.getValues().put("app", appMap);
             //=========添加app相关参数
             BaseOutsourcingApplicationDto boad = baseMapper.getBySid(flowTaskVo.getBusinessSid());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl);
@@ -764,20 +780,20 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(flowTaskVo.getBusinessSid());
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(data,messageFlowVo);
+            BeanUtil.copyProperties(data, messageFlowVo);
             String procId = baseOutsourcingApplication.getProcInstSid();
             data.setProcInsId(procId);
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
             messageFlowableQuery.setModuleName("外采申请");
-            ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
             String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
             List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-            if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())){
-                messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
-            }else{
-                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) {
+                messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+            } else {
+                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             }
 
             messageFlowableQuery.setMsgTitle("外采申请");
@@ -875,7 +891,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
         List<String> stringList = new ArrayList<>();
         if (commonAppendixVos != null && commonAppendixVos.size() > 0) {
-            stringList.add(fileUploadComponent.getUrlPrefix()+commonAppendixVos.get(0).getFilePath());
+            stringList.add(fileUploadComponent.getUrlPrefix() + commonAppendixVos.get(0).getFilePath());
         }
         ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
         AppSubVersionVo appSubVersionVo = resultBean.getData();

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

@@ -445,8 +445,8 @@ 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}")
-    void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue,@Param("salePrice") Integer salePrice, @Param("vinNo") String 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}")
     void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid);
@@ -457,13 +457,19 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     List<BaseSpecialRebateDisGetVehVo> getVehBySpecialRebateSid(String specialRebateSid);
 
-    List<Map<String,String>> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
+    List<Map<String, String>> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
 
 
     IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
 
     @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
-    void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
+    void updateVehRemarks(@Param("remarks") String remarks, @Param("sid") String sid);
 
-    IPage<PayBaseVehicleVo> selectPayVehicleList(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    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/BaseVehicleRest.java

@@ -1124,13 +1124,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
-        return baseVehicleService.selectInventoryRecords(userSid);
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
+        return baseVehicleService.selectInventoryRecords(appScmInventoryRecordsQuery);
     }
 
     @Override
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
-        return baseVehicleService.selectPatrolinspections(userSid, vinNoList);
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
+        return baseVehicleService.selectPatrolinspections(appScmInventoryRecordsQuery);
     }
 
     @Override

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

@@ -2035,26 +2035,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(list);
     }
 
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
         ResultBean rb = ResultBean.fireFail();
-        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String orgPath = appScmInventoryRecordsQuery.getOrgPath();
         //条件：本分公司、非删除、库存或采购退库中或调入或调出中
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
-        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
+        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(orgPath, qw);
         return rb.success().setData(list);
     }
 
-    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
         ResultBean rb = ResultBean.fireFail();
-        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         //条件：本分公司、非删除、库存或采购退库中或调入或调出中
+        String orgPath = appScmInventoryRecordsQuery.getOrgPath();
+        List<String> vinNoList = appScmInventoryRecordsQuery.getVinNoList();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         if (vinNoList.size() > 0) {
             qw.notIn("bv.vinNo", vinNoList);
         }
-        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
+        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(orgPath, qw);
         return rb.success().setData(list);
     }
 
@@ -3110,4 +3113,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/BaseVehicleOutMapper.java

@@ -28,4 +28,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
 
     BaseVehicleOutDetailsVo details(String sid);
+
+    int selectCountBySidVin(String vinSid);
 }

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

@@ -80,4 +80,8 @@
         from base_vehicle_out
         where sid = #{sid}
     </select>
+
+    <select id="selectCountBySidVin" resultType="int">
+        select count(*) from base_vehicle_out where vinSid = #{vinSid}
+    </select>
 </mapper>

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

@@ -56,11 +56,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             String vinNo = String.join(",", count);
             return rb.setMsg(vinNo + "车辆不满足出库条件");
         }*/
+
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
             return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
         }
+        //查询是否已出库
+        int counts = baseMapper.selectCountBySidVin(dto.getVinSid());
+        if (counts > 0) {
+            return rb.setMsg("该车辆已出库，不允许重复出库");
+        }
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
         if (StringUtils.isNotBlank(dto.getPrice())) {
@@ -186,42 +192,46 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //返利金额
         fEntity.setF_PAEZ_Decimal("0");//dto.getRebateMoneyOne()
         String remarks = dto.getRemarks();
-        String note=remarks;
+        String note = "";
+        if(StringUtils.isNotBlank(remarks)){
+            note = note+remarks;
+        }
+//        String note = remarks;
         //备注
-        if(StringUtils.isNotBlank(dto.getMiddleOne())){
-            if(StringUtils.isNotBlank(dto.getMiddleTwo())){
-                if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
-                    if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
-                        note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"," +  dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。";
+        if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+            if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne()  + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo()  + dto.getRebateMoneyTwo() + "。";
                         fEntity.setFEntrynote(note);
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
-                    }else{
-                        fEntity.setFEntrynote(note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。");
+                    } else {
+                        fEntity.setFEntrynote(note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。");
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
                     }
 
-                }else{
+                } else {
                     if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
-                        fEntity.setFEntrynote( note+"。返利情况："+dto.getMiddleTwo()+":"+dto.getRebateMoneyTwo()+"。");
+                        fEntity.setFEntrynote(note + "  返利情况：" + dto.getMiddleTwo()  + dto.getRebateMoneyTwo() + "。");
                         //返利金额
                         fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
                     }
                 }
 
-            }else{
-                if(StringUtils.isNotBlank(dto.getRebateMoneyOne())){
-                    note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。";
+            } else {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                    note = note + "  返利情况：" + dto.getMiddleOne()  + dto.getRebateMoneyOne() + "。";
                     fEntity.setFEntrynote(note);
                     //返利金额
                     fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
                 }
             }
-        }else{
-            if(StringUtils.isNotBlank(dto.getMiddleTwo())){
-                if(StringUtils.isNotBlank(dto.getRebateMoneyTwo())){
-                    note=note+"。返利情况："+dto.getMiddleOne()+":"+dto.getRebateMoneyOne()+"。";
+        } else {
+            if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                    note = note + "  返利情况：" + dto.getMiddleOne()  + dto.getRebateMoneyOne() + "。";
                     fEntity.setFEntrynote(note);
                     //返利金额
                     fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
@@ -282,7 +292,15 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getCustomerName())) {
                 qw.like("bvo.customerName", params.getCustomerName());
             }
-            qw.eq("bvo.createOrgSid",params.getCreateOrgSid());
+            //销售部门
+            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);
         PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);

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

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')").
-                apply(StringUtils.isNotBlank(remindEndDay), "date_format (remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%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 (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-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java

@@ -91,36 +91,16 @@ public class SalOutStock {
         @JsonProperty("FMaterialID")
         @NotBlank
         public String FMaterialID;
-        /**
-         * 库存单位:FUnitID  (必填项)
-         */ /*@JsonProperty("FUnitID")
-        @NotBlank
-        public String FUnitID;*/
-        /**
-         * 实发数量:FRealQty
-         */ /*@JsonProperty("FRealQty")
-        @NotBlank
-        public double FRealQty;*/
         /**
          * 批号:FLot
          */ @JsonProperty("Flot")
         @NotBlank
         public String Flot;
-        /**
-         * 货主:FOwnerID  (必填项)
-         */ /*@JsonProperty("FOwnerID")
-        @NotBlank
-        public String FOwnerID;*/
         /**
          * 仓库:FStockID
          */ @JsonProperty("FStockID")
         @NotBlank
         public String FStockID;
-        /**
-         * 库存状态:FStockStatusID
-         *//* @JsonProperty("FStockStatusID")
-        @NotBlank
-        public String FStockStatusID;*/
         /**
          * 销售单位:FSalUnitID
          */ @JsonProperty("FSalUnitID")
@@ -145,6 +125,26 @@ public class SalOutStock {
         @JsonProperty("FEntrynote")
         @NotBlank
         public String FEntrynote="";
+        /**
+         * 库存单位:FUnitID  (必填项)
+         */ /*@JsonProperty("FUnitID")
+        @NotBlank
+        public String FUnitID;*/
+        /**
+         * 实发数量:FRealQty
+         */ /*@JsonProperty("FRealQty")
+        @NotBlank
+        public double FRealQty;*/
+        /**
+         * 货主:FOwnerID  (必填项)
+         */ /*@JsonProperty("FOwnerID")
+        @NotBlank
+        public String FOwnerID;*/
+        /**
+         * 库存状态:FStockStatusID
+         *//* @JsonProperty("FStockStatusID")
+        @NotBlank
+        public String FStockStatusID;*/
 
     }
     public final static SalOutStock salOutStock = new SalOutStock();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
+import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
@@ -49,8 +50,10 @@ public class SalOutStockService extends FinKingDeeService {
                 JSONArray materialStocks = (JSONArray)result2.get("MaterialStock");
                  JSONObject materialStock = (JSONObject)materialStocks.get(0);
                  boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage");
-                if(!IsBatchManage){
-                    f.setFlot("");
+                if(!IsBatchManage){//是否启用批号
+                    f.setFlot("");//没有启用批号
+                }else{
+                    f.setFlot(f.getFMaterialID());//没有启用批号
                 }
             }
 
@@ -78,7 +81,21 @@ public class SalOutStockService extends FinKingDeeService {
             List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
             List<Map<String, String>> vehicleListMap = createVehicleLists(fEntity);
             String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
-            return accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+           // ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
+            ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
+            String data = stringResultBean.getData();
+            JSONObject jsonObject = JSONObject.parseObject(data.toString());
+            JSONObject result = (JSONObject)jsonObject.get("Result");
+            JSONObject result2 = (JSONObject)result.get("Result");
+            log.info("StkTransferDirect:{}",data);
+            log.info("result:{}",result);
+            log.info("result2:{}",result2);
+            int  id = (int)result.get("Id");
+            ResultBean<String> submit = submit(id+"",KingDeeBillId.SAL_OUTSTOCK.getID());
+            if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
+            /*ResultBean<String> audit = audit(data,KingDeeBillId.SAL_OUTSTOCK.getID());
+            if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());*/
+            return stringResultBean;
         } catch (Exception e) {
             e.printStackTrace();
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json

@@ -13,16 +13,16 @@
   "FIsFree": false,
   "FOwnerTypeID": "BD_OwnerOrg",
   "Flot": {
-    "FNumber": "@KD_FMaterialID"
+    "FNumber": "@KD_Flot"
   },
   "FOwnerID": {
     "FNumber": "@KD_FSaleOrgId"
   },
   "FStockID": {
-    "FNumber": "@KD_FStockID"
+    "FNumber": ""
   },
   "FStockStatusID": {
-    "FNumber": "KCZT01_SYS"
+    "FNumber": ""
   },
   "FSalUnitID": {
     "FNumber": "liang"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java

@@ -34,7 +34,7 @@ public class StkTransferDirectService extends FinKingDeeService {
             Map<String,String> map_fEntityModel_= object2Map(stkTransferDirect);
             List<StkTransferDirect.FBillEntry> fBillEntry = stkTransferDirect.getFBillEntry();
             for (StkTransferDirect.FBillEntry f: fBillEntry){
-                f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每隔分公司都有这个编码的仓库。
+                f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每个分公司都有这个编码的仓库。
                 //单据查看的json模板
                 JSONObject result2 = getMaterial(f);
                 if(result2==null){
@@ -46,17 +46,17 @@ public class StkTransferDirectService extends FinKingDeeService {
             List<Map<String, String>>  vehicleListMap = createVehicleLists(fBillEntry);
             String kingDeeData = StkTransferDirectCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
             /*{"Result":{"ResponseStatus":{"IsSuccess":true,"Errors":[],"SuccessEntitys":[{"Id":102499,"Number":"","DIndex":0}],"SuccessMessages":[],"MsgCode":0},"Id":102499,"Number":"","NeedReturnData":[{}]}}*/
-            ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+            ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
             String data = stringResultBean.getData();
-            JSONObject jsonObject = JSONObject.parseObject(data.toString());
+            JSONObject jsonObject = JSONObject.parseObject(data);
             JSONObject result = (JSONObject)jsonObject.get("Result");
             JSONObject result2 = (JSONObject)result.get("Result");
             log.info("StkTransferDirect:{}",data);
             log.info("result2:{}",result2);
-            String  id = (String)result.get("id");
-            ResultBean<String> submit = submit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID());
+            int  id = (int)result.get("Id");
+            ResultBean<String> submit = submit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID());
             if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
-            ResultBean<String> audit = audit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID());
+            ResultBean<String> audit = audit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID());
             if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
             return stringResultBean;
         } catch (Exception e) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java

@@ -54,6 +54,9 @@ public class AppScmVehicleStayInventoryDto implements Dto {
     @ApiModelProperty(value = "盘库sid")
     private String sid;
 
+    @ApiModelProperty("新增状态值")
+    private Boolean newAdd;
+
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
 

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

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@@ -146,6 +146,7 @@
         WHERE svi.mainSid = #{sid}
           and svi.InventoryStateKey = #{inventoryStateKey}
     </select>
+
     <select id="selectByUseOrgSid" resultType="java.lang.String">
         SELECT mainSid
         FROM scm_vehicle_inventory svi

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -36,11 +36,11 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService;
+import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -86,6 +86,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     FileUploadComponent fileUploadComponent;
     @Autowired
     ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
+    @Autowired
+    ScmVehInventorymonthService scmVehInventorymonthService;
 
     private QueryWrapper<ScmVehicleInventory> createQueryWrapper(ScmVehicleInventoryQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -192,9 +194,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         IPage<AppScmVehicleCarInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
         String orgPath = params.getOrgPath();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         AppScmVehicleCarInventoryListPageQuery paramsQuery = pagerQuery.getParams();
@@ -222,12 +224,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         AppScmVehicleStayInventoryListPageQuery query = pagerQuery.getParams();
         String orgPath = query.getOrgPath();
         String userSid = query.getUserSid();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             qw.eq("createOrgSid", orgPath);
         }
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -367,27 +369,43 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String s = "";
         String type = "07"; //盘库见证材料
         String createOrgSid = dto.getOrgPath();
-        if(StringUtils.isBlank(createOrgSid)){
-            createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
-        }else{
+        String userSid = dto.getLoginSid();
+        if (StringUtils.isBlank(createOrgSid)) {
+            createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        } else {
             createOrgSid = sysStaffOrgFeign.getOrgSidByPath(createOrgSid).getData();
         }
         String inventorySid = dto.getInventorySid();
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
         String remarks = dto.getRemarks();
-        if (StringUtils.isBlank(inventoryStateKey)) {
-            return rb.setMsg("请选择盘库状态");
-        }
-        if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
-            return rb.setMsg("备注请填写盘损原因");
-        }
-        String sid = dto.getSid();
-        if (StringUtils.isBlank(sid)) {
+        Boolean newAdd = dto.getNewAdd();
+        if (newAdd) {
             BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
             if (data != null) {
                 return rb.setMsg("此车架号不允许盘盈");
             }
+            List<AppScmVehInventorymonthVo> monthVoList = scmVehInventorymonthService.selectListAll();
+            AppScmVehInventorymonthVo appScmVehInventorymonthVo = null;
+            if (monthVoList.size() > 0) {
+                if (monthVoList.get(0).getState() == 0) {
+                    appScmVehInventorymonthVo = monthVoList.get(0);
+                } else {
+                    InventoryRecordsQuery inventoryRecordsQuery = new InventoryRecordsQuery();
+                    inventoryRecordsQuery.setUserSid(userSid);
+                    inventoryRecordsQuery.setOrgPath(createOrgSid);
+                    scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery);
+                    monthVoList = scmVehInventorymonthService.selectListAll();
+                    appScmVehInventorymonthVo = monthVoList.get(0);
+                }
+            } else {
+                InventoryRecordsQuery inventoryRecordsQuery = new InventoryRecordsQuery();
+                inventoryRecordsQuery.setUserSid(userSid);
+                inventoryRecordsQuery.setOrgPath(createOrgSid);
+                scmVehInventorymonthService.getInventoryRecords(inventoryRecordsQuery);
+                monthVoList = scmVehInventorymonthService.selectListAll();
+                appScmVehInventorymonthVo = monthVoList.get(0);
+            }
             ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
             BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
             String loginName = dto.getLoginName();
@@ -409,12 +427,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             scmVehicleInventory.setCreateOrgSid(createOrgSid);
             scmVehicleInventory.setInventoryStateKey(dto.getInventoryStateKey());
             scmVehicleInventory.setInventoryState(dto.getInventoryState());
-            List<String> list = baseMapper.selectByUseOrgSid(createOrgSid);
-            if (list.size() == 0) {
-                return rb.setMsg("请先生成盘库记录");
-            }
-            String mainSid = list.get(0);
-            scmVehicleInventory.setMainSid(mainSid);
+            scmVehicleInventory.setMainSid(appScmVehInventorymonthVo.getSid());
             scmFileService.deleteByLinkSidAndType(scmVehicleInventory.getSid(), type);
             List<String> images = dto.getImages();
             if (dto.getImages() != null) {
@@ -433,8 +446,33 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
                 }
             }
             save(scmVehicleInventory);
-        } else {
-            ScmVehicleInventory scmVehicleInventory = fetchBySid(sid);
+            if (!"001".equals(dto.getInventoryStateKey())) {
+                ScmVehiclePatrolinspectionsheetDto patrolinspectionsheetDto = new ScmVehiclePatrolinspectionsheetDto();
+                patrolinspectionsheetDto.setVinNo(dto.getVinNo());
+                patrolinspectionsheetDto.setProblems(dto.getRemarks());
+                patrolinspectionsheetDto.setWarehouse(dto.getLocation());
+                patrolinspectionsheetDto.setWarehouseSid(dto.getLocationSid());
+                patrolinspectionsheetDto.setUserSid(createOrgSid);
+                patrolinspectionsheetDto.setUserName(dto.getLoginName());
+                patrolinspectionsheetDto.setLocation(dto.getAddressCode());
+                patrolinspectionsheetDto.setAddress(dto.getAddress());
+                patrolinspectionsheetDto.setPushState(1);
+                patrolinspectionsheetDto.setImages(dto.getImages());
+                if (StringUtils.isNotBlank(dto.getOrgPath())) {
+                    patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
+                }
+                scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
+            }
+            return rb.success().setMsg("保存成功");
+
+        } else if (StringUtils.isNotBlank(dto.getSid())) {
+            if (StringUtils.isBlank(inventoryStateKey)) {
+                return rb.setMsg("请选择盘库状态");
+            }
+            if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
+                return rb.setMsg("备注请填写盘损原因");
+            }
+            ScmVehicleInventory scmVehicleInventory = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
             String loginName = dto.getLoginName();
             String loginSid = dto.getLoginSid();
@@ -455,7 +493,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             scmVehicleInventory.setCreateOrgSid(createOrgSid);
             scmVehicleInventory.setInventoryStateKey(dto.getInventoryStateKey());
             scmVehicleInventory.setInventoryState(dto.getInventoryState());
-
             scmFileService.deleteByLinkSidAndType(scmVehicleInventory.getSid(), type);
             List<String> images = dto.getImages();
             if (dto.getImages() != null) {
@@ -487,7 +524,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             patrolinspectionsheetDto.setAddress(dto.getAddress());
             patrolinspectionsheetDto.setPushState(1);
             patrolinspectionsheetDto.setImages(dto.getImages());
-            if(StringUtils.isNotBlank(dto.getOrgPath())){
+            if (StringUtils.isNotBlank(dto.getOrgPath())) {
                 patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
             }
             scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
@@ -581,9 +618,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         ResultBean rb = ResultBean.fireFail();
         String orgPath = appToDoNumQuery.getOrgPath();
         String userSid = appToDoNumQuery.getUserSid();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         int count = baseMapper.getInventoryState(orgPath);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -239,9 +239,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
         String orgPath = dto.getOrgPath();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
 
@@ -270,7 +270,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             if (list.size() > 0) {
                 String id = list.get(0).getId();
                 String mainSid = list.get(0).getSid();
-                if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())){
+                if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())) {
                     scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
                     int count = baseMapper.selectByMainSidNum(mainSid);
                     if (count > 0) {
@@ -399,10 +399,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String oneValue = "问题未解决";
         String orgPath = dto.getOrgPath();
         String useOrgSid = "";
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        }else{
-            useOrgSid = orgPath;
+        } else {
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getUserSid()).getData();
+            ;
         }
         VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
         vehRecordsQuery.setOrgPath(orgPath);
@@ -424,15 +425,22 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 // 是 先生成月度巡检 和 巡检记录
                 scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
-                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+                if (monthVoList.size() > 0) {
+                    scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+                } else {
+                    rb.setMsg("暂无需要巡检车辆");
+                }
 
             }
         } else { // 否 先生成月度巡检 和 巡检记录
 
             scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
             monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
-            scmVehPatrolinspectionmonthVo = monthVoList.get(0);
-
+            if (monthVoList.size() > 0) {
+                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+            } else {
+                rb.setMsg("暂无需要巡检车辆");
+            }
         }
         List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
         if (list.size() > 0) {
@@ -604,9 +612,9 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String threeKey = "003";
         String threeValue = "正常";
         String orgPath = dto.getOrgPath();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java

@@ -73,4 +73,7 @@ public interface ScmVehInventorymonthMapper extends BaseMapper<ScmVehInventorymo
     void updateByMainSid(@Param("mainSid") String mainSid);
 
     AppScmVehInventorymonthInfoVo selByMainSid(@Param("sid") String sid);
+
+    @Select("select * from scm_veh_inventorymonth order by id desc")
+    List<AppScmVehInventorymonthVo> selectListAll();
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehinventorymonth;
 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.AppScmInventoryRecordsQuery;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -193,14 +194,13 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             return rb.setMsg("记录存在未确认数据，盘库记录生成失败！");
         }
         List<AppScmVehicleCarInventoryListPageVo> vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(orgPath);
-        if (vehicleCarInventoryListPageVos != null) {
-            if (vehicleCarInventoryListPageVos.size() > 0) {
-                for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) {
-                    ScmVehInventorymonth scmVehInventorymonth = fetchBySid(vehicleCarInventoryListPageVo.getMainSid());
-                    if (scmVehInventorymonth != null) {
-                        if (scmVehInventorymonth.getState() == 0) {
-                            return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！");
-                        }
+        if (vehicleCarInventoryListPageVos.size() > 0) {
+            for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) {
+                // 判断是否生成报告
+                ScmVehInventorymonth scmVehInventorymonth = fetchBySid(vehicleCarInventoryListPageVo.getMainSid());
+                if (scmVehInventorymonth != null) {
+                    if (scmVehInventorymonth.getState() == 0) {
+                        return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！");
                     }
                 }
             }
@@ -214,7 +214,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
 //                return rb.setMsg("未到盘库周期，盘库记录生成失败！");
 //            }
 //        }
-        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+        AppScmInventoryRecordsQuery appScmInventoryRecordsQuery = new AppScmInventoryRecordsQuery();
+        appScmInventoryRecordsQuery.setUserSid(userSid);
+        appScmInventoryRecordsQuery.setOrgPath(orgPath);
+        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(appScmInventoryRecordsQuery).getData();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             ScmVehInventorymonth scmVehInventorymonth = new ScmVehInventorymonth();
@@ -253,7 +256,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         String orgPath = paramsQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         paramsQuery.setUseOrgSid(orgPath);
@@ -304,9 +307,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         String sid = appScmVehInventorymonthInfoQuery.getSid();
         String userSid = appScmVehInventorymonthInfoQuery.getUserSid();
         String orgPath = appScmVehInventorymonthInfoQuery.getOrgPath();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
 //        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
@@ -400,4 +403,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     public void updateByMainSid(String mainSid) {
         baseMapper.updateByMainSid(mainSid);
     }
+
+    public List<AppScmVehInventorymonthVo> selectListAll() {
+        return baseMapper.selectListAll();
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth;
 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.AppScmInventoryRecordsQuery;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -201,6 +202,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             }
 
         }
+        AppScmInventoryRecordsQuery appScmInventoryRecordsQuery = new AppScmInventoryRecordsQuery();
+        appScmInventoryRecordsQuery.setUserSid(userSid);
+        appScmInventoryRecordsQuery.setOrgPath(orgPath);
         List<String> vinNoList = new ArrayList<>();
         List<String> mainList = new ArrayList<>();
         //所有巡检记录
@@ -226,9 +230,10 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
                 }
             }
-            list = baseVehicleFeign.selectPatrolinspections(userSid, vinNoList).getData();
+            appScmInventoryRecordsQuery.setVinNoList(vinNoList);
+            list = baseVehicleFeign.selectPatrolinspections(appScmInventoryRecordsQuery).getData();
         } else {
-            list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+            list = baseVehicleFeign.selectInventoryRecords(appScmInventoryRecordsQuery).getData();
         }
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -264,10 +269,15 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
                     scmVehiclePatrolinspection.setVinNo(inspection.getVin());
                     scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
-                    BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), orgPath).getData();
-                    scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid());
-                    scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
-                    scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
+                    ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), orgPath);
+                    if (baseVehicleResultBean.getSuccess()){
+                        BaseVehicle vehicle = baseVehicleResultBean.getData();
+                        if (vehicle != null){
+                            scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid());
+                            scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
+                            scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
+                        }
+                    }
                     scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");
                     scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
                     scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
@@ -344,7 +354,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         String orgPath = paramsQuery.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         paramsQuery.setUseOrgSid(orgPath);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java

@@ -15,6 +15,9 @@ public class StayInventoryDto implements Dto {
     @JsonProperty(value = "sid")
     private String sid;
 
+    @ApiModelProperty("新增状态值")
+    private Boolean newAdd;
+
     @ApiModelProperty("车架号")
     @JsonProperty(value = "vin")
     private String vinNo; // 车架号

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppSubmitDto.java

@@ -53,5 +53,7 @@ public class AppSubmitDto implements Dto {
 
     @ApiModelProperty("机构sid")
     private String orgPath;
+    @ApiModelProperty("是否填写车架号")
+    private boolean editVin;
 
 }