移动端选择车架号、初始化车架号列表

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

@@ -2,12 +2,13 @@ package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -404,4 +405,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/getPCInspectionVinList")
     @ResponseBody
     public ResultBean<List<Map<String,String>>> getPCInspectionVinList(@RequestBody InspectionVinQuery query);
+
+    @ApiOperation("销售订单补录选择车架号")
+    @PostMapping("/saleOrderVin")
+    @ResponseBody
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(@RequestBody PagerQuery<InputVinListQuery> query);
 }

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

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -316,4 +318,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        return null;
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 16:48
+ * @Description
+ */
+@Data
+public class InputVinListQuery implements Query {
+    private static final long serialVersionUID = 8552949553126528497L;
+
+    private String saleOrderSid;
+    private List<String> list;
+    private String names;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 16:48
+ * @Description
+ */
+@Data
+public class InputVinListVo implements Vo {
+    private static final long serialVersionUID = -9168643121079621489L;
+
+    private String vinNo;
+    private String vinSid;
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -191,4 +191,8 @@ public interface CommonContractFeign {
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody CommonContractTaskQuery query);
 
+    @ApiOperation(value = "根据销售订单查询合同")
+    @GetMapping(value = "/getContractByBusSid/{sid}")
+    ResultBean<CommonContract> getContractByBusSid(@PathVariable("sid") String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -203,4 +203,9 @@ public class CommonContractFeignFallback implements CommonContractFeign {
     public ResultBean breakProcess(CommonContractTaskQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        return null;
+    }
 }

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

@@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -461,4 +458,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     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);
 }

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

@@ -1173,4 +1173,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="saleOrderVin" resultType="com.yxt.anrui.base.api.basevehicle.app.InputVinListVo">
+        select bv.vinNo,bv.sid vinSid,
+        if(bv.vehicleStateValue='出库',1,0) as state
+        from base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -201,6 +203,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     /**
      * 推送金蝶采购入库单
+     *
      * @param dto
      */
     private void kingdeeStkInStock(List<BaseVehicleDto> dto) {
@@ -898,5 +901,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         List<Map<String, String>> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query);
         return rb.success().setData(pcInspectionVinList);
     }
+    @Override
+    public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        ResultBean<PagerVo<InputVinListVo>> rb = ResultBean.fireFail();
+        PagerVo<InputVinListVo> pv = baseVehicleService.saleOrderVin(query);
+        return rb.success().setData(pv);
+    }
 
 }

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

@@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
@@ -26,6 +28,8 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -34,7 +38,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -102,6 +105,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BaseVehicleTempstateService baseVehicleTempstateService;
     @Autowired
     private ScmWarehouseFeign scmWarehouseFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     /**
      * 车辆信息分页列表
@@ -2551,4 +2556,21 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return pcInspectionVinList;
     }
+
+    public PagerVo<InputVinListVo> saleOrderVin(PagerQuery<InputVinListQuery> query) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(query);
+        InputVinListQuery params = query.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (params != null) {
+            //根据销售订单查询list
+            List<String> list = busSalesOrderFeign.getList(params.getSaleOrderSid()).getData();
+            if (params.getList().size() > 0) {
+                qw.notIn("bv.vinNo", params.getList());
+            }
+            qw.in("bv.orderingNo", list);
+        }
+        IPage<InputVinListVo> pagging = baseMapper.saleOrderVin(page, qw, params.getNames());
+        PagerVo<InputVinListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.commoncontract.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -85,4 +86,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
 
     @Update("update common_contract set `state`=#{state} where sid=#{businessSid}")
     void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state);
+
+    CommonContract getContractByBusSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -148,4 +148,10 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="getContractByBusSid" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
+        select *
+        from common_contract
+        where busSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@@ -566,4 +566,9 @@ public class CommonContractRest implements CommonContractFeign {
     public ResultBean breakProcess(CommonContractTaskQuery query) {
         return commonContractService.breakProcess(query);
     }
+
+    @Override
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        return commonContractService.getContractByBusSid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1652,4 +1652,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
+
+    public ResultBean<CommonContract> getContractByBusSid(String sid) {
+        ResultBean<CommonContract> rb = ResultBean.fireFail();
+        CommonContract commonContract = baseMapper.getContractByBusSid(sid);
+        if(commonContract == null){
+            return rb.setData(new CommonContract());
+        }
+        return rb.success().setData(commonContract);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -198,4 +199,13 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean submitOrder(@RequestBody SubmitSalesOrderDto dto);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/saleOrderInputVin")
+    @ResponseBody
+    ResultBean<VinVo> saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("采购订单编号list")
+    @GetMapping("/getList/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<List<String>> getList(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -174,4 +175,14 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean submitOrder(SubmitSalesOrderDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
@@ -142,4 +143,6 @@ public class AppBusSalesOrderVo implements Vo {
     @ApiModelProperty(value = "需补交订金")
     @JsonSerialize(using = ToStringSerializer.class)
     private String makeUpDeposit;
+    @JsonIgnore
+    private String type;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:47
+ * @Description
+ */
+@Data
+public class VinListVo implements Vo {
+    private static final long serialVersionUID = 7025918939372350073L;
+
+    private String linkNo;
+    private String linkSid;
+    private Boolean state;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:46
+ * @Description
+ */
+@Data
+public class VinVo implements Vo {
+    private static final long serialVersionUID = -5568525598192648926L;
+
+    private String saleOrderSid;
+
+    private List<VinListVo> vinList;
+}

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

@@ -40,6 +40,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -159,4 +160,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     int updateFlowFiled(Map<String, Object> map);
 
     int selectNum(String bill);
+
+
+    List<String> getList(String saleOrderSid);
 }

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

@@ -214,4 +214,10 @@
         from bus_sales_order
         where billNo LIKE concat(#{bill}, '%')
     </select>
+
+    <select id="getList" resultType="java.lang.String">
+        select linkNo
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

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

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -242,4 +243,14 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean submitOrder(SubmitSalesOrderDto dto) {
         return busSalesOrderService.submitOrder(dto);
     }
+
+    @Override
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputVin(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        return busSalesOrderService.getList(saleOrderSid);
+    }
 }

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

@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery;
 import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
@@ -44,9 +45,11 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
@@ -55,6 +58,8 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
@@ -1280,6 +1285,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (StringUtils.isBlank(record.getSaleOrderState())) {
                 record.setSaleOrderState("待提交");
             }
+            if ("1".equals(record.getType())) {//现车
+                record.setShowInputBtn(false);
+            } else {
+                //是否有录入车架号按钮
+                //根据sid查询合同是否已办结，若办结，根据选择的采购订单的编号.
+                ResultBean<CommonContract> commonContractResultBean = commonContractFeign.getContractByBusSid(record.getSaleOrderSid());
+                if (commonContractResultBean.getSuccess()) {
+                    CommonContract commonContract = commonContractResultBean.getData();
+                    if ("已办结".equals(commonContract.getNodeState())) {
+                        record.setShowInputBtn(true);
+                    } else {
+                        record.setShowInputBtn(false);
+                    }
+                }
+
+            }
+
 
         }
         PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -2590,4 +2612,53 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 //        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
         return variables;
     }
+
+    public ResultBean<VinVo> saleOrderInputVin(String saleOrderSid) {
+        ResultBean<VinVo> rb = ResultBean.fireFail();
+        VinVo vinVo = new VinVo();
+        //根据销售订单sid查询车辆台数
+        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(saleOrderSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        List<VinListVo> vinListVos = new ArrayList<>();
+        //根据销售订单查询现车
+        List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+        nowCarList.removeAll(Collections.singleton(null));
+        if (!nowCarList.isEmpty()) {
+            for (AppNowCarListVo vv : nowCarList) {
+                VinListVo vinListVo = new VinListVo();
+                vinListVo.setLinkNo(vv.getVin());
+                vinListVo.setLinkSid(vv.getCarSid());
+                //根据车架号查询是否已出库
+                ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
+                if (baseVehicleResultBean.getSuccess()) {
+                    BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
+                    if (vo != null) {
+                        if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
+                            vinListVo.setState(true);
+                        }
+                    }
+                }
+                vinListVos.add(vinListVo);
+            }
+        } else {
+            AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+            String num = appOrderDetailsVo.getPriceInfo().getNumber();
+            for (int i = 0; i < Integer.valueOf(num).intValue(); i++) {
+                VinListVo vinListVo = new VinListVo();
+                vinListVos.add(vinListVo);
+            }
+        }
+        vinVo.setSaleOrderSid(saleOrderSid);
+        vinVo.setVinList(vinListVos);
+        return rb.success().setData(vinVo);
+    }
+
+
+    public ResultBean<List<String>> getList(String saleOrderSid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.getList(saleOrderSid);
+        return rb.success().setData(stringList);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -264,5 +268,22 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<List<InsurancePrintVo>> contractInfo(@RequestBody InsuranceDto insuranceDto);
 
+    /*-------------------------------录入车架号---------------------------------------------*/
+
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/init/saleOrderInputVin")
+    @ResponseBody
+    ResultBean<VinNoVo> getVinList(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("补录车架号，选择列表")
+    @PostMapping("/init/saleOrderVin")
+    @ResponseBody
+    ResultBean<PagerVo<InputVinVo>> saleOrderVin(@RequestBody PagerQuery<InputVinQuery> query);
+
+    @ApiOperation("保存销售订单车架号")
+    @PostMapping("/save/saleOrderVin")
+    @ResponseBody
+    ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto);
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -45,6 +45,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -232,4 +236,19 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<List<InsurancePrintVo>> contractInfo(InsuranceDto insuranceDto) {
         return null;
     }
+
+    @Override
+    public ResultBean<VinNoVo> getVinList(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSaleOrderVin(InputVinDto dto) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:38
+ * @Description
+ */
+@Data
+public class BusVinNoVo implements Vo {
+    private static final long serialVersionUID = -5832863962678240592L;
+    
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+    @JsonProperty("vin")
+    private String linkNo;
+    @JsonProperty("carSid")
+    private String linkSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/28 9:18
+ * @Description
+ */
+@Data
+public class InputVinDto implements Dto {
+    private static final long serialVersionUID = -1105390623554097436L;
+    private String saleOrderSid;
+
+    private List<InputVinListDto> vinList;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/28 9:20
+ * @Description
+ */
+@Data
+public class InputVinListDto implements Dto {
+    private static final long serialVersionUID = -6013714991280967471L;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 15:39
+ * @Description
+ */
+@Data
+public class InputVinQuery implements Query {
+    private static final long serialVersionUID = 8689735317478969417L;
+
+    private String saleOrderSid;
+    private List<String> list;
+    private String names;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 15:28
+ * @Description
+ */
+@Data
+public class InputVinVo implements Vo {
+    private static final long serialVersionUID = -3495013067534199733L;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/27 14:35
+ * @Description
+ */
+@Data
+public class VinNoVo implements Vo {
+    private static final long serialVersionUID = -8321321070396276564L;
+
+    private String saleOrderSid;
+    private List<BusVinNoVo> vinList;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -320,4 +324,19 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.contractInfo(insuranceDto);
     }
 
+    @Override
+    public ResultBean<VinNoVo> getVinList(String saleOrderSid) {
+        return appBusSalesOrderService.getVinList(saleOrderSid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
+        return appBusSalesOrderService.saleOrderVin(query);
+    }
+
+    @Override
+    public ResultBean saveSaleOrderVin(InputVinDto dto) {
+        return appBusSalesOrderService.saveSaleOrderVin(dto);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
+import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.PrintConfirmDto;
 import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
@@ -38,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto;
@@ -86,6 +90,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -142,6 +150,8 @@ public class AppBusSalesOrderService {
     private SysUserFeign sysUserFeign;
     @Autowired
     private CommonContractFeign commonContractFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -556,4 +566,28 @@ public class AppBusSalesOrderService {
         List<InsurancePrintVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
+
+    public ResultBean<VinNoVo> getVinList(String saleOrderSid) {
+        ResultBean<VinNoVo> rb = ResultBean.fireFail();
+        VinNoVo vinNoVo = new VinNoVo();
+        ResultBean<VinVo> resultBean = busSalesOrderFeign.saleOrderInputVin(saleOrderSid);
+        VinVo vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, vinNoVo);
+        return rb.success().setData(vinNoVo);
+    }
+
+    public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
+        ResultBean<PagerVo<InputVinVo>> rb = ResultBean.fireFail();
+        PagerQuery<InputVinListQuery> pq = CoverUtils.getPagerQuery(query);
+        ResultBean<PagerVo<InputVinListVo>> resultBean = baseVehicleFeign.saleOrderVin(pq);
+        List<InputVinVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InputVinVo.class)).collect(Collectors.toList());
+        PagerVo<InputVinVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+    }
+
+    public ResultBean saveSaleOrderVin(InputVinDto dto) {
+        return null;
+    }
 }