Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -62,11 +62,11 @@ public class BaseDistributorVo implements Vo {
     @ApiModelProperty("创建组织（陕汽必须字段）")
     private String createOrg;
 
-//    @ApiModelProperty(value = "使用组织sid：string类型")
-//    private String useOrgSid;
+    @ApiModelProperty(value = "使用组织sid：string类型")
+    private String useOrgSid;
 
-    @ApiModelProperty(value = "使用组织sid:List类型")
-    private String[][] useOrg;
+    /*@ApiModelProperty(value = "使用组织sid:List类型")
+    private String[][] useOrg;*/
 
     @ApiModelProperty(value = "使用组织名称")
     private String useOrgName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java

@@ -141,6 +141,9 @@ public class BaseVehicleCertificate extends BaseEntity {
     @ApiModelProperty("合格证照片（陕汽必须字段）")
     private String certificatePhoto;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java

@@ -134,6 +134,9 @@ public class BaseVehicleCertificateDetailsVo implements Vo {
     @ApiModelProperty("底盘型号（陕汽必须字段）")
     private String chassisModel;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java

@@ -144,6 +144,9 @@ public class BaseVehicleCertificateDto implements Dto {
     @ApiModelProperty("底盘型号（陕汽必须字段）")
     private String chassisModel;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -104,8 +104,8 @@ public interface BaseVehicleModelFeign {
      * @return
      */
     @ApiOperation("修改回显")
-    @GetMapping("/getAll/{sid}")
-    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid);
+    @GetMapping("/getAll/{sid}/{userSid}")
+    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
 
 
     /**

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -59,7 +59,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
 
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -94,7 +94,7 @@
         bd.address,
         bd.zipCode,
         bd.createOrg,
-        <!--bd.useOrg useOrgSid,-->
+        bd.useOrg useOrgSid,
         bd.useOrgName
         from base_distributor bd
         where sid = #{sid};

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -206,21 +206,6 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     public BaseDistributorVo selBySid(String sid) {
         BaseDistributor baseDistributor = fetchBySid(sid);
         BaseDistributorVo baseDistributorVo = baseMapper.selBySid(sid);
-        if (StringUtils.isNotBlank(baseDistributor.getUseOrg())) {//使用组织sid
-            //将string类型转换为List类型
-            List<String> list = Arrays.asList(baseDistributor.getUseOrg().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            baseDistributorVo.setUseOrg(s);
-        }
         return baseDistributorVo;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -134,6 +134,8 @@
         bvc.power,
         <!--底盘型号-->
         bvc.chassisModel,
+        <!--公告型号-->
+        bvc.noticeModel,
         <!--  备注-->
         bvc.remarks
         from base_vehicle_certificate bvc

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -163,12 +163,22 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        int i3 = baseVehmodelConfigService.checkByModelSid(sid);
+        if (i3 > 0){
+            return rb.setMsg("该车型已有关联配置，无法修改");
+        }
+        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
+        String sid1 = useOrgByUserSid.getData().getSid();
+        int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
+        if (i4 == 0){
+            return rb.setMsg("该车型不属于当前分公司，无法修改");
+        }
         return rb.success().setData(vo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -544,17 +544,6 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
-        int i3 = baseVehmodelConfigService.checkByModelSid(sid);
-        if (i3 > 0){
-            return rb.setMsg("该车型已有关联配置，无法修改");
-        }
-        String userSid = dto.getUserSid();
-        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
-        String sid1 = useOrgByUserSid.getData().getSid();
-        int i4 = this.checkByCreateOrgAndModelSid(sid1, sid);
-        if (i4 == 0){
-            return rb.setMsg("该车型不属于当前分公司，无法修改");
-        }
         dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue());
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         String modelName = dto.getModelName();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java

@@ -25,8 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -49,5 +54,9 @@ import org.springframework.cloud.openfeign.FeignClient;
         fallback = BusSalesOrderDepositFeignFallback.class)
 public interface BusSalesOrderDepositFeign {
 
-   
+    @ApiOperation("初始化订金信息")
+    @GetMapping(value = "/getDepositInfo/{sid}")
+    ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(@PathVariable(value = "sid") String sid);
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -48,4 +49,8 @@ import java.util.List;
 @Component
 public class BusSalesOrderDepositFeignFallback implements BusSalesOrderDepositFeign {
 
+    @Override
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 13:38
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderDepositListVo implements Vo {
+    private static final long serialVersionUID = -9212964561264321091L;
+
+    @ApiModelProperty(value = "虚拟订单sid")
+    private String virtualOrderSid;
+    @ApiModelProperty(value = "虚拟订单编号")
+    private String virtualOrderId;
+    @ApiModelProperty(value = "剩余金额")
+    private String remainderMoney;
+    @ApiModelProperty(value = "结转金额")
+    private String payMoney;
+    @ApiModelProperty(value = "款项支付委托书:销售订单与客户为同一人时，list为空")
+    private List<String> entrustImage = new ArrayList<>();
+    @ApiModelProperty(value = "款项支付委托书")
+    private String payPath;
+
+    private Boolean showImage;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 13:37
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderDepositVo implements Vo {
+    private static final long serialVersionUID = 1890442022147551234L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty(value = "车辆数量")
+    private String carNumber;
+    @ApiModelProperty(value = "订金合计")
+    private String depositTotal;
+    @ApiModelProperty(value = "订金缴纳方式")
+    private String payType;
+    @ApiModelProperty(value = "订金缴纳方式key")
+    private String payTypeKey;
+    @ApiModelProperty(value = "订金信息sid")
+    private String sid;
+
+    private List<AppBusSalesOrderDepositListVo> virtualOrderList = new ArrayList<>();
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java

@@ -25,15 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -56,5 +57,13 @@ import java.util.List;
         fallback = BusSalesOrderInsuranceFeignFallback.class)
 public interface BusSalesOrderInsuranceFeign {
 
+    @ApiOperation("保存保险信息")
+    @PostMapping("/save")
+    ResultBean save(@RequestBody AppBusSalesOrderInsuranceDto dto);
+
+    @ApiOperation("初始化保险信息")
+    @GetMapping("/getInsurance/{sid}")
+    ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(@PathVariable(value = "sid") String sid);
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java

@@ -25,13 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderInsuranceFeignFallback.java <br/>
@@ -47,5 +45,14 @@ import java.util.List;
  */
 @Component
 public class BusSalesOrderInsuranceFeignFallback implements BusSalesOrderInsuranceFeign {
-	
+
+    @Override
+    public ResultBean save(AppBusSalesOrderInsuranceDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.buscenter.api.bussalesorderinsurance.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/6 17:35
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderInsuranceDto implements Dto {
+    private static final long serialVersionUID = 1342650142192192917L;
+
+    @ApiModelProperty(value = "是否在公司投保：1是，0否")
+    private String isInsureType;
+    @ApiModelProperty(value = "保险公司名称")
+    private String insuranceName;
+    @ApiModelProperty(value = "单台车保费预估金额")
+    private String insuranceCarMoney;
+    @ApiModelProperty(value = "公司入保期数")
+    private String insuranceNum;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "销售订单sid")
+    private String salesOrderSid;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.buscenter.api.bussalesorderinsurance.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/6 17:43
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderInsuranceVo implements Vo {
+    private static final long serialVersionUID = 3954141367510797986L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty(value = "是否在公司投保")
+    private String isInsureType;
+    @ApiModelProperty(value = "是否投保")
+    private String isInsureValue;
+    @ApiModelProperty(value = "保险公司名称")
+    private String name;
+    @ApiModelProperty(value = "单台保费")
+    private String price;
+    @ApiModelProperty(value = "入保期数")
+    private String number;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -25,17 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busdepositfictitious;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
-import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo;
 
 import java.util.List;
 
@@ -79,4 +75,12 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
      * @return
      */
     List<BusDepositRecordsVo> getDepositRecords(@Param("depositBillNo") String depositBillNo);
+
+    /**
+     * 根据订金信息sid查询虚拟订单和订金信息的关联
+     *
+     * @param sid 订金信息sid
+     * @return
+     */
+    List<AppBusSalesOrderDepositListVo> getList(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -31,4 +31,16 @@
                  LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
         WHERE bdf.depositBillNo = #{depositBillNo}
     </select>
+
+    <select id="getList"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo">
+        select bf.depositBillNo as virtualOrderId,
+               bd.sid           as virtualOrderSid,
+               bf.depositPrice  as remainderMoney,
+               bf.price         as payMoney,
+               bf.payPath
+        from bus_deposit_fictitious bf
+                 left join bus_main_deposit bd on bd.billNo = bf.depositBillNo
+        where bf.depositSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -26,18 +26,14 @@
 package com.yxt.anrui.buscenter.biz.busdepositfictitious;
 
 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.buscenter.api.busdepositfictitious.*;
-import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -99,4 +95,8 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
         List<BusDepositRecordsVo> list = baseMapper.getDepositRecords(depositBillNo);
         return list;
     }
+
+    public List<AppBusSalesOrderDepositListVo> getList(String sid) {
+        return baseMapper.getList(sid);
+    }
 }

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

@@ -106,7 +106,30 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      */
     int updateCompanySidBySid(String sid);
 
+    /**
+     * 根据销售订单sid更新销售订单的车辆类型字段
+     *
+     * @param type          类型
+     * @param salesOrderSid 销售订单sid
+     * @return
+     */
     int updateTypeBySid(@Param("type") String type, @Param("sid") String salesOrderSid);
 
+    /**
+     * 根据销售订单sid更新是否上装的状态
+     *
+     * @param salesOrderSid 销售订单sid
+     * @param state         是否包含上装
+     * @return
+     */
     int updateIsTop(@Param("salesOrderSid") String salesOrderSid, @Param("state") String state);
+
+    /**
+     * 根据销售订单sid更新是否在公司入保字段
+     *
+     * @param isInsureType 是否在公司入保
+     * @param saleOrderSid 销售订单sid
+     * @return
+     */
+    int updateIsInsurance(@Param("isInsureType") String isInsureType, @Param("saleOrderSid") String saleOrderSid);
 }

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

@@ -27,7 +27,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
+    <!--根据销售订单sid更新销售订单的流程相关字段-->
     <update id="modifyFlowState">
         update bus_sales_order
         set procDefId=#{procDefId},
@@ -105,22 +105,28 @@
           AND orgSid = #{orgSid}
           AND billNo LIKE concat(#{billsType}, '%')
     </select>
-
+    <!--根据销售订单sid更新销售订单的挂靠公司sid字段-->
     <update id="updateCompanySidBySid">
         update bus_sales_order
         set affiliatedCompanySid = NULL
         where sid = #{sid}
     </update>
-
+    <!--根据销售订单sid更新销售订单的车辆类型-->
     <update id="updateTypeBySid">
         update bus_sales_order
         set type = #{type}
         where sid = #{sid}
     </update>
-
+    <!--根据销售订单sid更新销售订单是否上装状态-->
     <update id="updateIsTop">
         update bus_sales_order
         set isTop = #{state}
         where sid = #{salesOrderSid}
     </update>
+    <!--根据销售订单sid更新销售订单的是否在公司入保的状态-->
+    <update id="updateIsInsurance">
+        update bus_sales_order
+        set isInsurance = #{isInsureType}
+        where sid = #{saleOrderSid}
+    </update>
 </mapper>

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

@@ -1628,11 +1628,36 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
     }
 
+    /**
+     * 根据销售订单sid更新销售订单的类型
+     *
+     * @param type          类型
+     * @param salesOrderSid 销售订单sid
+     * @return
+     */
     public int updateTypeBySid(String type, String salesOrderSid) {
         return baseMapper.updateTypeBySid(type, salesOrderSid);
     }
 
+    /**
+     * 根据销售订单sid更新销售订单是否包含上装字段状态
+     *
+     * @param salesOrderSid 销售订单sid
+     * @param state         是否包含上装
+     * @return
+     */
     public int updateIsTop(String salesOrderSid, String state) {
         return baseMapper.updateIsTop(salesOrderSid, state);
     }
+
+    /**
+     * 根据销售订单sid更新销售订单是否在公司入保字段状态
+     *
+     * @param isInsureType 是否在公司入保
+     * @param saleOrderSid 销售订单sid
+     * @return
+     */
+    public int updateIsInsurance(String isInsureType, String saleOrderSid) {
+        return baseMapper.updateIsInsurance(isInsureType, saleOrderSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java

@@ -25,18 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -72,4 +65,12 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    AppBusSalesOrderDepositVo getDepositInfo(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -9,7 +9,7 @@
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
-    
+
     <!--根据销售订单sid查询订金信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
         select sid,
@@ -27,4 +27,15 @@
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="getDepositInfo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo">
+        select bd.salesOrderSid  as saleOrderSid,
+               bd.depositAll     as depositTotal,
+               bd.depositType    as payType,
+               bd.depositTypeKey as payTypeKey,
+               bd.sid
+        from bus_sales_order_deposit bd
+        where bd.salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java

@@ -25,14 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -51,5 +50,12 @@ import org.springframework.web.bind.annotation.*;
 @RestController("com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositRest")
 @RequestMapping("v1/bussalesorderdeposit")
 public class BusSalesOrderDepositRest implements BusSalesOrderDepositFeign {
-	
+
+    @Autowired
+    private BusSalesOrderDepositService busSalesOrderDepositService;
+
+    @Override
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        return busSalesOrderDepositService.getDepositInfo(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -26,15 +26,26 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
 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.buscenter.api.bussalesorderdeposit.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositService.java <br/>
@@ -51,6 +62,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrderDepositMapper, BusSalesOrderDeposit> {
 
+
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusDepositFictitiousService busDepositFictitiousService;
+    @Autowired
+    private BusSalesOrderPriceService busSalesOrderPriceService;
+
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
@@ -88,5 +107,37 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public int deleteByOrderSid(String sid) {
         return baseMapper.deleteByOrderSid(sid);
     }
-    
+
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        ResultBean<AppBusSalesOrderDepositVo> rb = ResultBean.fireFail();
+        //查询销售订单是否存在
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        //查询该订金信息是否存在
+        AppBusSalesOrderDepositVo vo = baseMapper.getDepositInfo(sid);
+        //根据销售订单sid查询价格信息
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
+        if (vo == null) {
+            vo = new AppBusSalesOrderDepositVo();
+            vo.setSaleOrderSid(sid);
+        } else {
+            //根据订金sid查询虚拟订单和订金的关联
+            List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(vo.getSid());
+            listVos.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+            if (!listVos.isEmpty()) {
+                for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                    String payPath = listVo.getPayPath();
+                    List<String> stringList = Arrays.asList(payPath.split(","));
+                    listVo.setEntrustImage(stringList);
+                }
+            }
+            vo.setVirtualOrderList(listVos);
+        }
+        if (busSalesOrderPrice != null) {
+            vo.setCarNumber(busSalesOrderPrice.getQuantity().toString());
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -61,4 +62,20 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
     BusSalesOrderInsuranceDetailsVo details(String sid);
 
     int updateByOrderSid(@Param("sid") String sid, @Param("remarks") String remarks);
+
+    /**
+     * 根据销售订单sid查询保险信息
+     *
+     * @param saleOrderSid 销售订单
+     * @return
+     */
+    BusSalesOrderInsurance selectByOrderSid(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid查询保险信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    AppBusSalesOrderInsuranceVo getInsurance(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-   
+
     <select id="selectOrderInsuranceStateBySid"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo">
         SELECT *
@@ -35,4 +35,22 @@
             remarks          = #{remarks}
         where salesOrderSid = #{sid}
     </update>
+
+    <select id="selectByOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance">
+        select *
+        from bus_sales_order_insurance
+        where salesOrderSid = #{saleOrderSid}
+    </select>
+
+    <select id="getInsurance"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo">
+        select salesOrderSid     as saleOrderSid,
+               insuranceName     as name,
+               insuranceCarMoney as price,
+               insuranceNum      as number,
+               remarks
+        from bus_sales_order_insurance
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java

@@ -25,14 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 
-import com.yxt.anrui.buscenter.api.bussalesorderinsurance.*;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -52,5 +52,16 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesorderinsurance")
 public class BusSalesOrderInsuranceRest implements BusSalesOrderInsuranceFeign {
 
-	
+    @Autowired
+    private BusSalesOrderInsuranceService busSalesOrderInsuranceService;
+
+    @Override
+    public ResultBean save(AppBusSalesOrderInsuranceDto dto) {
+        return busSalesOrderInsuranceService.saveAppInsurance(dto);
+    }
+
+    @Override
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        return busSalesOrderInsuranceService.getInsurance(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@@ -26,10 +26,17 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -48,6 +55,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOrderInsuranceMapper, BusSalesOrderInsurance> {
 
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+
     public void saveInsurance(BusSalesOrderInsuranceDto busSalesOrderInsuranceDto, String sid) {
         BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance();
         BeanUtil.copyProperties(busSalesOrderInsuranceDto, busSalesOrderInsurance, "sid");
@@ -82,4 +92,66 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
     public int updateByOrderSid(String sid, String remarks) {
         return baseMapper.updateByOrderSid(sid, remarks);
     }
+
+    public ResultBean saveAppInsurance(AppBusSalesOrderInsuranceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(dto.getSalesOrderSid());
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        if ("1".equals(dto.getIsInsureType())) {
+            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = baseMapper.details(dto.getSalesOrderSid());
+            if (busSalesOrderInsuranceDetailsVo != null) {
+                BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
+                BeanUtil.copyProperties(dto, busSalesOrderInsurance, "sid");
+                updateById(busSalesOrderInsurance);
+            } else {
+                BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance();
+                BeanUtil.copyProperties(dto, busSalesOrderInsurance, "sid");
+                baseMapper.insert(busSalesOrderInsurance);
+            }
+
+        } else if ("0".equals(dto.getIsInsureType())) {
+            //查询保险信息是否有数据
+            BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
+            if (busSalesOrderInsurance != null) {
+                String remarks = dto.getRemarks();
+                updateByOrderSid(dto.getSalesOrderSid(), remarks);
+            } else {
+                if (StringUtils.isNotBlank(dto.getRemarks())) {
+                    BusSalesOrderInsurance busSalesOrderInsurance1 = new BusSalesOrderInsurance();
+                    busSalesOrderInsurance1.setSalesOrderSid(dto.getSalesOrderSid());
+                    busSalesOrderInsurance1.setRemarks(dto.getRemarks());
+                    baseMapper.insert(busSalesOrderInsurance1);
+                }
+            }
+        }
+        //更新销售订单的是否包含保险的字段
+        busSalesOrderService.updateIsInsurance(dto.getIsInsureType(), dto.getSalesOrderSid());
+        return rb.success().setMsg("保存成功");
+
+    }
+
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        ResultBean<AppBusSalesOrderInsuranceVo> rb = ResultBean.fireFail();
+        //根据销售订单sid查询销售订单是否存在
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppBusSalesOrderInsuranceVo vo = baseMapper.getInsurance(sid);
+        if (vo == null) {
+            vo = new AppBusSalesOrderInsuranceVo();
+            vo.setSaleOrderSid(sid);
+        }
+        if (StringUtils.isNotBlank(busSalesOrder.getIsInsurance())) {
+            vo.setIsInsureType(busSalesOrder.getIsInsurance());
+            if ("1".equals(busSalesOrder.getIsInsurance())) {
+                vo.setIsInsureValue("是");
+            } else {
+                vo.setIsInsureValue("否");
+            }
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -105,6 +105,11 @@ public interface SysOrganizationFeign {
     @GetMapping("/selectBySid")
     ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("根据组织架构sid查询组织下所有分公司")
+    @ResponseBody
+    @GetMapping("/selectUseOrgSidBySid")
+    ResultBean<List<Map<String,String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid);
+
     /**
      * 查询公司所有的部门
      *

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -112,6 +113,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<SysOrgListVo>> selectListOne() {
         return null;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -83,6 +84,26 @@ public interface SysStaffinfoFeign {
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid);
 
+    /**
+     * 获取集团内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffName")
+    public ResultBean<List<Map<String,String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName);
+
+    /**
+     * 获取部门内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffNameByDeptSid")
+    public ResultBean<List<Map<String,String>>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
+
 
     @ApiOperation("获取App通讯录")
     @ResponseBody
@@ -104,4 +125,5 @@ public interface SysStaffinfoFeign {
     @GetMapping("/selectStaffList")
     ResultBean<List<PcSysStaffVo>> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery);
 
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -50,6 +51,16 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        return null;
+    }
+
     @Override
     public ResultBean selectAppContactsList(String names) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfoselectAppContactsList无法访问");

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -99,4 +100,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     @Select("select * from sys_organization WHERE staffSid=#{sid}")
     SysOrganizationVo getUseOrgByStaffSid(String sid);
+
+    List<Map<String, String>> selectUseOrgSidBySid(String psid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -153,4 +153,15 @@
         WHERE so.sid = #{sid}
         ORDER BY so.sort ASC
     </select>
+
+    <select id="selectUseOrgSidBySid" resultType="java.util.Map">
+        SELECT
+                sid,
+                name
+        FROM
+                sys_organization
+        WHERE psid = #{psid}
+          AND isDelete = 0
+          AND isDept = 0
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -216,6 +216,13 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return new ResultBean<SysOrganization>().success().setData(sysOrganization);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = sysOrganizationService.selectUseOrgSidBySid(sid);
+        return rb.success().setData(maps);
+    }
+
     /**
      * 查询公司所有的部门
      *

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -377,4 +377,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return baseMapper.getQrCodeVo(sid);
     }
 
+    public List<Map<String,String>> selectUseOrgSidBySid(String sid) {
+        SysOrganization sysOrganization = fetchBySid(sid);
+        String psid = sysOrganization.getPsid();
+        return baseMapper.selectUseOrgSidBySid(psid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -110,4 +111,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      * @return
      */
     List<PcSysStaffVo> selectStaffList(String orgSid);
+
+    List<Map<String, String>> getStaffName(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
+
+    List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -8,22 +8,23 @@
             resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsVo">
         SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
         FROM sys_staffinfo staff
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
     <select id="searchAppContactsPageList"
             resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
         SELECT staff.sid,
-               staff.name,
-               staff.mobile,
-               staff.position,
-               user.headImage,
-               GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
+        staff.name,
+        staff.mobile,
+        staff.position,
+        user.headImage,
+        GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
         FROM sys_staffinfo staff
-                     LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
-                WHERE 1 = 1
+        LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
+        LEFT JOIN sys_user user ON staff.sid = user.staffSid
+        WHERE 1 = 1
         <if test="mobileStr != null and mobileStr != ''">
             AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
         </if>
@@ -47,8 +48,9 @@
                staff.position,
                GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
         FROM sys_staffinfo staff
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
-                     LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
+                LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
         WHERE staff.sid = #{staffSid}
         GROUP BY staff.sid
     </select>
@@ -65,15 +67,15 @@
                IFNULL(NULL, 0)   AS staffNum
         FROM sys_staff_org org
                      INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
         WHERE org.orgSid = #{sid}
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
     <select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
         select *
         from sys_staffinfo
-        order by jobNumber desc
-        limit 1
+        order by jobNumber desc limit 1
     </select>
     <!--根据手机号查询员工是否重复-->
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@@ -294,8 +296,18 @@
     </update>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
-        select sso.staffSid,si.name staffName from sys_staff_org sso
-        left join sys_staffinfo si on sso.staffSid = si.sid
-        where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',','))
+        select sso.staffSid, si.name staffName
+        from sys_staff_org sso
+                     left join sys_staffinfo si on sso.staffSid = si.sid
+        where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+    </select>
+
+    <select id="getStaffName" resultType="java.util.Map">
+        SELECT sid, name
+        FROM sys_staffinfo ${ew.customSqlSegment}
+    </select>
+
+    <select id="getStaffNameByDeptSid" resultType="java.util.Map">
+
     </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -131,6 +132,20 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setData(sysStaffinfo);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffName(staffName);
+        return rb.success().setData(staffNameList);
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName,deptSid);
+        return rb.success().setData(staffNameList);
+    }
+
 
     @Override
     public ResultBean<List<SysStaffinfoAppContactsVo>> selectAppContactsList(String names) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -192,6 +193,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (sysStaffinfo2 != null) {
             return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
         }
+        //判断身份证号出生日期和填写的出生日期是否相同
+        String idNo = dto.getIdNo();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyddMM");
+        String birthday = simpleDateFormat.format(dto.getBirthday());
+        String substring = idNo.substring(6, 15);
+        if (!birthday.equals(substring)){
+            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
+        }
         //查询部门和岗位是否为空
         if (dto.getSysStaffOrg() == null) {
             return rb.setMsg("员工部门信息不能为空");
@@ -514,4 +523,23 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return rb.success().setData(list);
     }
+
+    public List<Map<String, String>> getStaffName(String staffName) {
+        QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(staffName)) {
+            qw.like("name", staffName);
+        }
+        qw.eq("isDelete",0);
+        return baseMapper.getStaffName(qw);
+    }
+
+    public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(staffName)) {
+            qw.like("name", staffName);
+        }
+        //qw.eq("")
+        qw.eq("isDelete",0);
+        return baseMapper.getStaffNameByDeptSid(qw);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFile.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFile.java <br/>
+ * Class: scm.api.scmfile.ScmFile <br/>
+ * Description: 供应链附件表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应链附件表", description = "供应链附件表")
+@TableName("scm_file")
+public class ScmFile extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("文件名")
+    private String fileName; // 文件名
+	@ApiModelProperty("文件类型")
+    private String fileType; // 文件类型
+	@ApiModelProperty("上传人姓名")
+    private String name; // 上传人姓名
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid; // 关联业务对象sid
+	@ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
+	@ApiModelProperty("文件大小")
+    private String fileSize; // 文件大小
+	@ApiModelProperty("文件相对路径")
+    private String filePath; // 文件相对路径
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDetailsVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileVo.java <br/>
+ * Class: scm.api.scmfile.ScmFileVo <br/>
+ * Description: 供应链附件表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应链附件表 视图数据详情", description = "供应链附件表 视图数据详情")
+public class ScmFileDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("文件名")
+    private String fileName; // 文件名
+	@ApiModelProperty("文件类型")
+    private String fileType; // 文件类型
+	@ApiModelProperty("上传人姓名")
+    private String name; // 上传人姓名
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid; // 关联业务对象sid
+	@ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
+	@ApiModelProperty("文件大小")
+    private String fileSize; // 文件大小
+	@ApiModelProperty("文件相对路径")
+    private String filePath; // 文件相对路径
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileDto.java <br/>
+ * Class: scm.api.scmfile.ScmFileDto <br/>
+ * Description: 供应链附件表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应链附件表 数据传输对象", description = "供应链附件表 数据传输对象")
+public class ScmFileDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("文件名")
+    private String fileName; // 文件名
+	@ApiModelProperty("文件类型")
+    private String fileType; // 文件类型
+	@ApiModelProperty("上传人姓名")
+    private String name; // 上传人姓名
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid; // 关联业务对象sid
+	@ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
+	@ApiModelProperty("文件大小")
+    private String fileSize; // 文件大小
+	@ApiModelProperty("文件相对路径")
+    private String filePath; // 文件相对路径
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileFeign.java <br/>
+ * Class: scm.api.scmfile.ScmFileFeign <br/>
+ * Description: 供应链附件表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供应链附件表")
+@FeignClient(
+        contextId = "scm-ScmFile",
+        name = "scm",
+        path = "v1/scmfile",
+        fallback = ScmFileFeignFallback.class)
+public interface ScmFileFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmFileVo>> listPage(@RequestBody PagerQuery<ScmFileQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmFileDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileFeignFallback.java <br/>
+ * Class: scm.api.scmfile.ScmFileFeignFallback <br/>
+ * Description: 供应链附件表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmFileFeignFallback implements ScmFileFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmFileVo>> listPage(PagerQuery<ScmFileQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmfile/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmFileDto dto){
+		return ResultBean.fireFail().setMsg("接口scm/scmfile/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口scm/scmfile/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmFileDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmfile/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileQuery.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileQuery.java <br/>
+ * Class: scm.api.scmfile.ScmFileQuery <br/>
+ * Description: 供应链附件表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应链附件表 查询条件", description = "供应链附件表 查询条件")
+public class ScmFileQuery implements Query {
+
+	@ApiModelProperty("文件名")
+    private String fileName; // 文件名
+	@ApiModelProperty("文件类型")
+    private String fileType; // 文件类型
+	@ApiModelProperty("上传人姓名")
+    private String name; // 上传人姓名
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid; // 关联业务对象sid
+	@ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
+	@ApiModelProperty("文件大小")
+    private String fileSize; // 文件大小
+	@ApiModelProperty("文件相对路径")
+    private String filePath; // 文件相对路径
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfile/ScmFileVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmfile;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileVo.java <br/>
+ * Class: scm.api.scmfile.ScmFileVo <br/>
+ * Description: 供应链附件表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应链附件表 视图数据对象", description = "供应链附件表 视图数据对象")
+public class ScmFileVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("文件名")
+    private String fileName; // 文件名
+	@ApiModelProperty("文件类型")
+    private String fileType; // 文件类型
+	@ApiModelProperty("上传人姓名")
+    private String name; // 上传人姓名
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid; // 关联业务对象sid
+	@ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
+	@ApiModelProperty("文件大小")
+    private String fileSize; // 文件大小
+	@ApiModelProperty("文件相对路径")
+    private String filePath; // 文件相对路径
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibrary.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibrary <br/>
+ * Description: 入库单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单", description = "入库单")
+@TableName("scm_vehicle_enterlibrary")
+public class ScmVehicleEnterlibrary extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置")
+    private String configName; // 常用配置
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("入库日期")
+    private String inboundDate; // 入库日期
+	@ApiModelProperty("入库人")
+    private String inbound; // 入库人
+	@ApiModelProperty("存放地点")
+    private String location; // 存放地点
+	@ApiModelProperty("仓库管理员")
+    private String storekeeper; // 仓库管理员
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("入库状态（已入库，未入库）")
+    private String inboundState; // 入库状态（已入库，未入库）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDetailsVo.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryVo.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo <br/>
+ * Description: 入库单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 视图数据详情", description = "入库单 视图数据详情")
+public class ScmVehicleEnterlibraryDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置")
+    private String configName; // 常用配置
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("入库日期")
+    private String inboundDate; // 入库日期
+	@ApiModelProperty("入库人")
+    private String inbound; // 入库人
+	@ApiModelProperty("存放地点")
+    private String location; // 存放地点
+	@ApiModelProperty("仓库管理员")
+    private String storekeeper; // 仓库管理员
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("入库状态（已入库，未入库）")
+    private String inboundState; // 入库状态（已入库，未入库）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryDto.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryDto.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryDto <br/>
+ * Description: 入库单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 数据传输对象", description = "入库单 数据传输对象")
+public class ScmVehicleEnterlibraryDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置")
+    private String configName; // 常用配置
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("入库日期")
+    private String inboundDate; // 入库日期
+	@ApiModelProperty("入库人")
+    private String inbound; // 入库人
+	@ApiModelProperty("存放地点")
+    private String location; // 存放地点
+	@ApiModelProperty("仓库管理员")
+    private String storekeeper; // 仓库管理员
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("入库状态（已入库，未入库）")
+    private String inboundState; // 入库状态（已入库，未入库）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryFeign.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign <br/>
+ * Description: 入库单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "入库单")
+@FeignClient(
+        contextId = "scm-ScmVehicleEnterlibrary",
+        name = "scm",
+        path = "v1/scmvehicleenterlibrary",
+        fallback = ScmVehicleEnterlibraryFeignFallback.class)
+public interface ScmVehicleEnterlibraryFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleEnterlibraryVo>> listPage(@RequestBody PagerQuery<ScmVehicleEnterlibraryQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehicleEnterlibraryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryFeignFallback.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeignFallback <br/>
+ * Description: 入库单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibraryFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehicleEnterlibraryVo>> listPage(PagerQuery<ScmVehicleEnterlibraryQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehicleenterlibrary/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehicleEnterlibraryDto dto){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehicleenterlibrary/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehicleenterlibrary/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehicleEnterlibraryDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehicleenterlibrary/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryQuery.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryQuery.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryQuery <br/>
+ * Description: 入库单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 查询条件", description = "入库单 查询条件")
+public class ScmVehicleEnterlibraryQuery implements Query {
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置")
+    private String configName; // 常用配置
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("入库日期")
+    private String inboundDate; // 入库日期
+	@ApiModelProperty("入库人")
+    private String inbound; // 入库人
+	@ApiModelProperty("存放地点")
+    private String location; // 存放地点
+	@ApiModelProperty("仓库管理员")
+    private String storekeeper; // 仓库管理员
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("入库状态（已入库，未入库）")
+    private String inboundState; // 入库状态（已入库，未入库）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryVo.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryVo.java <br/>
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo <br/>
+ * Description: 入库单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 视图数据对象", description = "入库单 视图数据对象")
+public class ScmVehicleEnterlibraryVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("常用配置")
+    private String configName; // 常用配置
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("入库日期")
+    private String inboundDate; // 入库日期
+	@ApiModelProperty("入库人")
+    private String inbound; // 入库人
+	@ApiModelProperty("存放地点")
+    private String location; // 存放地点
+	@ApiModelProperty("仓库管理员")
+    private String storekeeper; // 仓库管理员
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("入库状态（已入库，未入库）")
+    private String inboundState; // 入库状态（已入库，未入库）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehicleExamineDetailsVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("订单类型")
+    private String type;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("配置")
+    private String config;
+
+    @ApiModelProperty("发车日期")
+    private String dispatchedDate;
+
+    @ApiModelProperty("验车人")
+    private String inspectedName;
+
+    @ApiModelProperty("验车日期")
+    private String inspectedDate;
+
+    @ApiModelProperty(" 1 已验车  2 未验车 验车状态")
+    private String state;
+
+    @ApiModelProperty("验车相关图片")
+    private List<String> carInspectedImage;
+
+    @ApiModelProperty("厂家验车单图片")
+    private List<String> factoryImage;
+
+    @ApiModelProperty("验车情况说明 为空时默认 -")
+    private String remarks;
+
+    @ApiModelProperty("定位")
+    private String location;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehicleExamineDto implements Dto {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("订单类型")
+    private String purchaseKey;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("配置")
+    private String config;
+
+    @ApiModelProperty("厂家验车照片")
+    private List<String> factoryImage;
+
+    @ApiModelProperty("验车相关照片")
+    private List<String> carInspectedImage;
+
+    @ApiModelProperty("验车情况说明")
+    private String remarks;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("sid")
+    private String inspectedSid;
+
+    @ApiModelProperty("经纬度")
+    private String location;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("洗车费")
+    private String price;
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehicleExamineInfoVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("采购类型")
+    private String purchaseKey;
+
+    @ApiModelProperty("配置")
+    private String config;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("厂家验车照片")
+    private List<String> factoryImage;
+
+    @ApiModelProperty("验车相关照片")
+    private List<String> carInspectedImage;
+
+    @ApiModelProperty("检验情况说明")
+    private String remarks;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("sid")
+    private String inspectedSid;
+
+    @ApiModelProperty("经纬度")
+    private String location;
+
+    @ApiModelProperty("定位地址")
+    private String address;
+
+    @ApiModelProperty("洗车费")
+    private String price;
+
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleExaminePageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("类型 “ ” 或 null 全部 1待验车 2已验车")
+    private String type;
+
+    @ApiModelProperty("车架号、车型 、订单类型")
+    private String names;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象")
+public class AppScmVehicleExaminePageVo implements Vo {
+
+
+    private String inspectedSid;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("发车日期")
+    private String dispatchedDate;
+
+    @ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType;
+
+    @ApiModelProperty("验车人")
+    private String inspectedName;
+
+    @ApiModelProperty("验车日期")
+    private String inspectedDate;
+
+    @ApiModelProperty("验车按钮 显示 只要通过了就不显示")
+    private boolean showInspectedBtn;
+
+    @ApiModelProperty("是否验车 key 未验车 1 以验车2")
+    private String inspectedType;
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehicleExamineSubmitDto implements Dto {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("订单类型")
+    private String purchaseKey;
+    @ApiModelProperty("配置")
+    private String config;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("厂商验车照片")
+    private List<String> factoryImage;
+    @ApiModelProperty("验车相关照片")
+    private List<String> carInspectedImage;
+    @ApiModelProperty("验车情况说明")
+    private String remarks;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("sid")
+    private String inspectedSid;
+    @ApiModelProperty("经纬度")
+    private String location;
+    @ApiModelProperty("定位位置")
+    private String address;
+    @ApiModelProperty("洗车费")
+    private String price;
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamine.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamine <br/>
+ * Description: 验车单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单", description = "验车单")
+@TableName("scm_vehicle_examine")
+public class ScmVehicleExamine extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("配置（常用配置）")
+    private String configName; // 配置（常用配置）
+	@ApiModelProperty("验车情况说明")
+    private String inspectionSituation; // 验车情况说明
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("验车状态（已验车，未验车）")
+    private String inspectionResult; // 验车状态（已验车，未验车）
+    @ApiModelProperty("洗车费")
+    private String price;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDetailsVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineVo.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo <br/>
+ * Description: 验车单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 视图数据详情", description = "验车单 视图数据详情")
+public class ScmVehicleExamineDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("配置（常用配置）")
+    private String configName; // 配置（常用配置）
+	@ApiModelProperty("验车情况说明")
+    private String inspectionSituation; // 验车情况说明
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("验车状态（已验车，未验车）")
+    private String inspectionResult; // 验车状态（已验车，未验车）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineDto.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineDto.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineDto <br/>
+ * Description: 验车单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 数据传输对象", description = "验车单 数据传输对象")
+public class ScmVehicleExamineDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("配置（常用配置）")
+    private String configName; // 配置（常用配置）
+	@ApiModelProperty("验车情况说明")
+    private String inspectionSituation; // 验车情况说明
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("验车状态（已验车，未验车）")
+    private String inspectionResult; // 验车状态（已验车，未验车）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineFeign.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineFeign <br/>
+ * Description: 验车单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "验车单")
+@FeignClient(
+        contextId = "scm-ScmVehicleExamine",
+        name = "scm",
+        path = "v1/scmvehicleexamine",
+        fallback = ScmVehicleExamineFeignFallback.class)
+public interface ScmVehicleExamineFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleExamineVo>> listPage(@RequestBody PagerQuery<ScmVehicleExamineQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehicleExamineDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("手机端-获取验车管理列表")
+    @PostMapping("/getCarInspectedList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleExaminePageVo>> getCarInspectedList(@RequestBody PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化验车单信息")
+    @GetMapping("/getCarInspectedInfo/{inspectedSid}/{userSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleExamineInfoVo> getCarInspectedInfo(@PathVariable("inspectedSid") String inspectedSid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-验车管理详情")
+    @GetMapping("/getCarInspected/{inspectedSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleExamineDetailsVo> getCarInspected(@PathVariable("inspectedSid") String inspectedSid);
+
+    @ApiOperation("手机端-保存验车单")
+    @PostMapping("/saveCarInspectedInfo")
+    @ResponseBody
+    public ResultBean saveCarInspectedInfo(@RequestBody AppScmVehicleExamineDto dto);
+
+    @ApiOperation("手机端-通过验车单")
+    @PostMapping("/submitCarInspectedInfo")
+    @ResponseBody
+    public ResultBean submitCarInspectedInfo(@RequestBody AppScmVehicleExamineSubmitDto dto);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineFeignFallback.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineFeignFallback <br/>
+ * Description: 验车单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehicleExamineVo>> listPage(PagerQuery<ScmVehicleExamineQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehicleexamine/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehicleExamineDto dto){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehicleexamine/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehicleexamine/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleExaminePageVo>> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleExamineInfoVo> getCarInspectedInfo(String inspectedSid, String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleExamineDetailsVo> getCarInspected(String inspectedSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
+		return null;
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineQuery.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineQuery.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineQuery <br/>
+ * Description: 验车单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 查询条件", description = "验车单 查询条件")
+public class ScmVehicleExamineQuery implements Query {
+
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("配置（常用配置）")
+    private String configName; // 配置（常用配置）
+	@ApiModelProperty("验车情况说明")
+    private String inspectionSituation; // 验车情况说明
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("验车状态（已验车，未验车）")
+    private String inspectionResult; // 验车状态（已验车，未验车）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineVo.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo <br/>
+ * Description: 验车单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象")
+public class ScmVehicleExamineVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType; // 采购订单类型（外采，内购，排产）
+	@ApiModelProperty("采购订单类型（ 01 外采，02 内购，03 排产）")
+    private String purchaseTypeKey; // 采购订单类型（ 01 外采，02 内购，03 排产）
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("发车日期")
+    private String departureDate; // 发车日期
+	@ApiModelProperty("验车日期")
+    private String inspectionDate; // 验车日期
+	@ApiModelProperty("验车人")
+    private String inspection; // 验车人
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型别名")
+    private String modelName; // 车型别名
+	@ApiModelProperty("常用配置sid")
+    private String configSid; // 常用配置sid
+	@ApiModelProperty("配置（常用配置）")
+    private String configName; // 配置（常用配置）
+	@ApiModelProperty("验车情况说明")
+    private String inspectionSituation; // 验车情况说明
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("地址经纬度")
+    private String addressCode; // 地址经纬度
+	@ApiModelProperty("验车状态（已验车，未验车）")
+    private String inspectionResult; // 验车状态（已验车，未验车）
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGression.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGression <br/>
+ * Description: 移位单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单", description = "移位单")
+@TableName("scm_vehicle_gression")
+public class ScmVehicleGression extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("申请编号")
+    private String applicantNo; // 申请编号
+	@ApiModelProperty("现存地点")
+    private String location; // 现存地点
+	@ApiModelProperty("目标地点")
+    private String targetLocation; // 目标地点
+	@ApiModelProperty("变更原因")
+    private String changeReason; // 变更原因
+	@ApiModelProperty("申请经费")
+    private String applicantFunds; // 申请经费
+	@ApiModelProperty("经办人")
+    private String operator; // 经办人
+	@ApiModelProperty("保险状态")
+    private String InsuranceState; // 保险状态
+	@ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDetailsVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionVo.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo <br/>
+ * Description: 移位单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 视图数据详情", description = "移位单 视图数据详情")
+public class ScmVehicleGressionDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("申请编号")
+    private String applicantNo; // 申请编号
+	@ApiModelProperty("现存地点")
+    private String location; // 现存地点
+	@ApiModelProperty("目标地点")
+    private String targetLocation; // 目标地点
+	@ApiModelProperty("变更原因")
+    private String changeReason; // 变更原因
+	@ApiModelProperty("申请经费")
+    private String applicantFunds; // 申请经费
+	@ApiModelProperty("经办人")
+    private String operator; // 经办人
+	@ApiModelProperty("保险状态")
+    private String InsuranceState; // 保险状态
+	@ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionDto.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionDto.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionDto <br/>
+ * Description: 移位单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 数据传输对象", description = "移位单 数据传输对象")
+public class ScmVehicleGressionDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("申请编号")
+    private String applicantNo; // 申请编号
+	@ApiModelProperty("现存地点")
+    private String location; // 现存地点
+	@ApiModelProperty("目标地点")
+    private String targetLocation; // 目标地点
+	@ApiModelProperty("变更原因")
+    private String changeReason; // 变更原因
+	@ApiModelProperty("申请经费")
+    private String applicantFunds; // 申请经费
+	@ApiModelProperty("经办人")
+    private String operator; // 经办人
+	@ApiModelProperty("保险状态")
+    private String InsuranceState; // 保险状态
+	@ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionFeign.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionFeign <br/>
+ * Description: 移位单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "移位单")
+@FeignClient(
+        contextId = "scm-ScmVehicleGression",
+        name = "scm",
+        path = "v1/scmvehiclegression",
+        fallback = ScmVehicleGressionFeignFallback.class)
+public interface ScmVehicleGressionFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleGressionVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehicleGressionDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionFeignFallback.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionFeignFallback <br/>
+ * Description: 移位单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehicleGressionVo>> listPage(PagerQuery<ScmVehicleGressionQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehicleGressionDto dto){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionQuery.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionQuery.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionQuery <br/>
+ * Description: 移位单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 查询条件", description = "移位单 查询条件")
+public class ScmVehicleGressionQuery implements Query {
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("申请编号")
+    private String applicantNo; // 申请编号
+	@ApiModelProperty("现存地点")
+    private String location; // 现存地点
+	@ApiModelProperty("目标地点")
+    private String targetLocation; // 目标地点
+	@ApiModelProperty("变更原因")
+    private String changeReason; // 变更原因
+	@ApiModelProperty("申请经费")
+    private String applicantFunds; // 申请经费
+	@ApiModelProperty("经办人")
+    private String operator; // 经办人
+	@ApiModelProperty("保险状态")
+    private String InsuranceState; // 保险状态
+	@ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionVo.java <br/>
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo <br/>
+ * Description: 移位单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象")
+public class ScmVehicleGressionVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("申请编号")
+    private String applicantNo; // 申请编号
+	@ApiModelProperty("现存地点")
+    private String location; // 现存地点
+	@ApiModelProperty("目标地点")
+    private String targetLocation; // 目标地点
+	@ApiModelProperty("变更原因")
+    private String changeReason; // 变更原因
+	@ApiModelProperty("申请经费")
+    private String applicantFunds; // 申请经费
+	@ApiModelProperty("经办人")
+    private String operator; // 经办人
+	@ApiModelProperty("保险状态")
+    private String InsuranceState; // 保险状态
+	@ApiModelProperty("临牌")
+    private String temporaryCard; // 临牌
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java

@@ -60,8 +60,8 @@ public class ScmWarehouseQuery implements Query {
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
     
-	@ApiModelProperty("仓库属性")
-    private String warehouseAttribute; // 仓库属性
+	@ApiModelProperty("详细地址")
+    private String warehouseAttribute; // 详细地址
     
 	@ApiModelProperty("仓库负责人")
     private String warehouseContract; // 仓库负责人

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmfile;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileMapper.java <br/>
+ * Class: scm.biz.scmfile.ScmFileMapper <br/>
+ * Description: 供应链附件表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmFileMapper extends BaseMapper<ScmFile> {
+
+    //@Update("update scm_file set name=#{msg} where id=#{id}")
+    //IPage<ScmFileVo> voPage(IPage<ScmFile> page, @Param(Constants.WRAPPER) QueryWrapper<ScmFile> qw);
+
+    IPage<ScmFileVo> selectPageVo(IPage<ScmFile> page, @Param(Constants.WRAPPER) Wrapper<ScmFile> qw);
+
+    List<ScmFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmFile> qw);
+
+    @Select("select * from scm_file")
+    List<ScmFileVo> selectListVo();
+
+    @Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}")
+    List<ScmFile> selectByLinkSid(@Param("sid") String sid, @Param("type") String type);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmfile.ScmFileMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmfile.ScmFileVo">
+        SELECT * FROM scm_file
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmfile.ScmFileVo">
+        SELECT * FROM scm_file
+        <where>${ew.sqlSegment}</where>
+    </select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmfile;
+
+import com.yxt.anrui.scm.api.scmfile.*;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileFeignFallback.java <br/>
+ * Class: scm.biz.scmfile.ScmFileRest <br/>
+ * Description: 供应链附件表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供应链附件表")
+@RestController("scm.biz.scmfile.ScmFileRest")
+@RequestMapping("v1/scmfile")
+public class ScmFileRest implements ScmFileFeign {
+
+	@Autowired
+	private ScmFileService scmFileService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmFileVo>> listPage(@RequestBody PagerQuery<ScmFileQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmFileVo> pv = scmFileService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmFileDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmFileService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmFileService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmFileDetailsVo vo = scmFileService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmfile;
+
+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.scm.api.scmfile.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmFileService.java <br/>
+ * Class: scm.biz.scmfile.ScmFileService <br/>
+ * Description: 供应链附件表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmFileService extends MybatisBaseService<ScmFileMapper, ScmFile> {
+    private QueryWrapper<ScmFile> createQueryWrapper(ScmFileQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmFile> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmFileVo> listPageVo(PagerQuery<ScmFileQuery> pq) {
+        ScmFileQuery query = pq.getParams();
+        QueryWrapper<ScmFile> qw = createQueryWrapper(query);
+        IPage<ScmFile> page = PagerUtil.queryToPage(pq);
+        IPage<ScmFileVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmFileVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmFileDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmFileDto dto) {
+        ScmFile entity = new ScmFile();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmFileDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmFile entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmFileDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmFile entity = fetchBySid(sid);
+        ScmFileDetailsVo vo = new ScmFileDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 根据业务sid和附件类型查询附件
+     *
+     * @param sid
+     * @param type
+     * @return
+     */
+    public List<ScmFile> selectByLinkSid(String sid, String type) {
+        List<ScmFile> list = baseMapper.selectByLinkSid(sid, type);
+        return list;
+    }
+}

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

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibrary;
+import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryMapper.java <br/>
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryMapper <br/>
+ * Description: 入库单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehicleEnterlibraryMapper extends BaseMapper<ScmVehicleEnterlibrary> {
+
+	//@Update("update scm_vehicle_enterlibrary set name=#{msg} where id=#{id}")
+	//IPage<ScmVehicleEnterlibraryVo> voPage(IPage<ScmVehicleEnterlibrary> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleEnterlibrary> qw);
+	
+	IPage<ScmVehicleEnterlibraryVo> selectPageVo(IPage<ScmVehicleEnterlibrary> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleEnterlibrary> qw);
+	
+	List<ScmVehicleEnterlibraryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleEnterlibrary> qw);
+	
+	@Select("select * from scm_vehicle_enterlibrary")
+	List<ScmVehicleEnterlibraryVo> selectListVo();
+}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo">
+        SELECT * FROM scm_vehicle_enterlibrary
+        <where>${ew.sqlSegment}</where>
+    </select>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo">
+        SELECT * FROM scm_vehicle_enterlibrary
+        <where>${ew.sqlSegment}</where>
+    </select>
+</mapper>

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

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
+
+import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryFeignFallback.java <br/>
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryRest <br/>
+ * Description: 入库单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "入库单")
+@RestController("scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryRest")
+@RequestMapping("v1/scmvehicleenterlibrary")
+public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
+
+	@Autowired
+	private ScmVehicleEnterlibraryService scmVehicleEnterlibraryService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehicleEnterlibraryVo>> listPage(@RequestBody PagerQuery<ScmVehicleEnterlibraryQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehicleEnterlibraryVo> pv = scmVehicleEnterlibraryService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleEnterlibraryService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleEnterlibraryService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehicleEnterlibraryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

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

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
+
+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.scm.api.scmvehicleenterlibrary.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleEnterlibraryService.java <br/>
+ * Class: scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryService <br/>
+ * Description: 入库单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicleEnterlibraryMapper, ScmVehicleEnterlibrary> {
+	private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmVehicleEnterlibrary> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmVehicleEnterlibraryVo> listPageVo(PagerQuery<ScmVehicleEnterlibraryQuery> pq) {
+		ScmVehicleEnterlibraryQuery query = pq.getParams();
+		QueryWrapper<ScmVehicleEnterlibrary> qw = createQueryWrapper(query);
+		IPage<ScmVehicleEnterlibrary> page = PagerUtil.queryToPage(pq);
+		IPage<ScmVehicleEnterlibraryVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmVehicleEnterlibraryVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmVehicleEnterlibraryDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmVehicleEnterlibraryDto dto){
+		ScmVehicleEnterlibrary entity = new ScmVehicleEnterlibrary();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmVehicleEnterlibraryDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmVehicleEnterlibrary entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmVehicleEnterlibraryDetailsVo fetchDetailsVoBySid(String sid){
+		ScmVehicleEnterlibrary entity = fetchBySid(sid);
+		ScmVehicleEnterlibraryDetailsVo vo = new ScmVehicleEnterlibraryDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleexamine;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehicleexamine.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineMapper.java <br/>
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineMapper <br/>
+ * Description: 验车单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
+
+    //@Update("update scm_vehicle_examine set name=#{msg} where id=#{id}")
+    //IPage<ScmVehicleExamineVo> voPage(IPage<ScmVehicleExamine> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleExamine> qw);
+
+    IPage<ScmVehicleExamineVo> selectPageVo(IPage<ScmVehicleExamine> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleExamine> qw);
+
+    List<ScmVehicleExamineVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleExamine> qw);
+
+    @Select("select * from scm_vehicle_examine")
+    List<ScmVehicleExamineVo> selectListVo();
+
+
+    /**
+     * 手机端-获取验车管理列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleExaminePageVo> getCarInspectedList(IPage<AppScmVehicleExaminePageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleExaminePageVo> qw, @Param("names") String names);
+
+
+    /**
+     * 手机端-初始化验车单信息
+     *
+     * @param inspectedSid
+     * @param useOrgSid
+     * @return
+     */
+    AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid, @Param("useOrgSid") String useOrgSid);
+
+    /**
+     * 手机端-验车管理详情
+     *
+     * @param inspectedSid
+     * @return
+     */
+    AppScmVehicleExamineDetailsVo getCarInspected(@Param("inspectedSid") String inspectedSid);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineVo">
+        SELECT * FROM scm_vehicle_examine
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineVo">
+        SELECT * FROM scm_vehicle_examine
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="getCarInspectedList"
+            resultType="com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo">
+        SELECT
+        sve.sid as inspectedSid,
+        sve.modelName as model,
+        sve.vinNo as vin,
+        sve.departureDate as dispatchedDate,
+        sve.purchaseType,
+        sve.inspection as inspectedName,
+        sve.inspectionDate as inspectedDate
+        FROM scm_vehicle_examine sve
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="getCarInspectedInfo"
+            resultType="com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo">
+        SELECT vinNo           as vin,
+               purchaseTypeKey as purchaseKey,
+               configName      as config,
+               modelName       as model,
+               remarks,
+               sid             as inspectedSid,
+               addressCode     as location,
+               address         as address,
+               price
+        FROM scm_vehicle_examine sve
+        WHERE sve.sid = #{inspectedSid}
+          AND sve.useOrgSid = #{useOrgSid}
+    </select>
+
+    <select id="getCarInspected"
+            resultType="com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDetailsVo">
+        SELECT vinNo            as vin,
+               purchaseType     as type,
+               modelName        as model,
+               configName       as config,
+               departureDate    as dispatchedDate,
+               inspection       as inspectedName,
+               inspectionDate   as inspectedDate,
+               inspectionResult as `state`,
+               remarks,
+               address          as location
+        FROM scm_vehicle_examine sve
+        WHERE sve.sid = #{inspectedSid}
+    </select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java

@@ -0,0 +1,147 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleexamine;
+
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleexamine.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineFeignFallback.java <br/>
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineRest <br/>
+ * Description: 验车单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "验车单")
+@RestController("scm.biz.scmvehicleexamine.ScmVehicleExamineRest")
+@RequestMapping("v1/scmvehicleexamine")
+public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
+
+    @Autowired
+    private ScmVehicleExamineService scmVehicleExamineService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmVehicleExamineVo>> listPage(@RequestBody PagerQuery<ScmVehicleExamineQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleExamineVo> pv = scmVehicleExamineService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ScmVehicleExamineDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleExamineService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleExamineService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehicleExamineDetailsVo vo = scmVehicleExamineService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+
+    @Override
+    @ApiOperation("手机端-获取验车管理列表")
+    @PostMapping("/getCarInspectedList")
+    public ResultBean<PagerVo<AppScmVehicleExaminePageVo>> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehicleExaminePageVo> page = new PagerVo<>();
+        IPage<AppScmVehicleExaminePageVo> iPage = scmVehicleExamineService.getCarInspectedList(pagerQuery);
+        PagerVo<AppScmVehicleExaminePageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehicleExaminePageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    @ApiOperation("手机端-初始化验车单信息")
+    @GetMapping("/getCarInspectedInfo/{inspectedSid}/{userSid}")
+    public ResultBean<AppScmVehicleExamineInfoVo> getCarInspectedInfo(String inspectedSid, String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppScmVehicleExamineInfoVo vo = scmVehicleExamineService.getCarInspectedInfo(inspectedSid, userSid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    @ApiOperation("手机端-验车管理详情")
+    @GetMapping("/getCarInspected/{inspectedSid}")
+    public ResultBean<AppScmVehicleExamineDetailsVo> getCarInspected(String inspectedSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppScmVehicleExamineDetailsVo vo = scmVehicleExamineService.getCarInspected(inspectedSid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    @ApiOperation("手机端-保存验车单")
+    @PostMapping("/saveCarInspectedInfo")
+    public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleExamineService.saveCarInspectedInfo(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("手机端-通过验车单")
+    @PostMapping("/submitCarInspectedInfo")
+    public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleExamineService.submitCarInspectedInfo(dto);
+        return rb.success();
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -0,0 +1,319 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehicleexamine;
+
+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.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehicleexamine.*;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineService.java <br/>
+ * Class: scm.biz.scmvehicleexamine.ScmVehicleExamineService <br/>
+ * Description: 验车单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExamineMapper, ScmVehicleExamine> {
+
+    @Autowired
+    SysUserFeign sysUserFeign;
+
+    @Autowired
+    SysOrganizationFeign sysOrganizationFeign;
+
+    @Autowired
+    ScmFileService scmFileService;
+
+    @Autowired
+    FileUploadComponent fileUploadComponent;
+
+    private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehicleExamine> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehicleExamineVo> listPageVo(PagerQuery<ScmVehicleExamineQuery> pq) {
+        ScmVehicleExamineQuery query = pq.getParams();
+        QueryWrapper<ScmVehicleExamine> qw = createQueryWrapper(query);
+        IPage<ScmVehicleExamine> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehicleExamineVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehicleExamineVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmVehicleExamineDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmVehicleExamineDto dto) {
+        ScmVehicleExamine entity = new ScmVehicleExamine();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmVehicleExamineDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmVehicleExamine entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehicleExamineDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehicleExamine entity = fetchBySid(sid);
+        ScmVehicleExamineDetailsVo vo = new ScmVehicleExamineDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 手机端-获取验车管理列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehicleExaminePageVo> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
+        IPage<AppScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehicleExaminePageVo> qw = appQueryWrapper(pagerQuery.getParams());
+        AppScmVehicleExaminePageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehicleExaminePageVo> iPage = baseMapper.getCarInspectedList(page, qw, params.getNames());
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取验车管理列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppScmVehicleExaminePageVo> appQueryWrapper(AppScmVehicleExaminePageQuery query) {
+        QueryWrapper<AppScmVehicleExaminePageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("sve.useOrgSid", query.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("sve.inspectionResult", query.getType());
+        }
+        return qw;
+    }
+
+    /**
+     * 手机端-初始化验车单信息
+     *
+     * @param inspectedSid
+     * @param userSid
+     * @return
+     */
+    public AppScmVehicleExamineInfoVo getCarInspectedInfo(String inspectedSid, String userSid) {
+        String type1 = "01"; // 厂家验车照片 01
+        String type2 = "02"; // 验车相关照片 02
+        List<String> factoryImages = new ArrayList<>();
+        List<String> carInspectedImages = new ArrayList<>();
+
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+
+        AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
+
+        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type1);
+        for (ScmFile scmFile : scmFiles1) {
+            factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setFactoryImage(factoryImages);
+
+        List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type2);
+        for (ScmFile scmFile : scmFiles2) {
+            carInspectedImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setCarInspectedImage(carInspectedImages);
+        return vo;
+    }
+
+    /**
+     * 手机端-验车管理详情
+     *
+     * @param inspectedSid
+     * @return
+     */
+    public AppScmVehicleExamineDetailsVo getCarInspected(String inspectedSid) {
+        String type1 = "01"; // 厂家验车照片 01
+        String type2 = "02"; // 验车相关照片 02
+        List<String> factoryImages = new ArrayList<>();
+        List<String> carInspectedImages = new ArrayList<>();
+
+        AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
+
+        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(inspectedSid, type1);
+        for (ScmFile scmFile : scmFiles1) {
+            factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setFactoryImage(factoryImages);
+
+        List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(inspectedSid, type2);
+        for (ScmFile scmFile : scmFiles2) {
+            carInspectedImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setCarInspectedImage(carInspectedImages);
+        return vo;
+    }
+
+    /**
+     * 手机端-保存验车单
+     *
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String s1 = "";
+        String s2 = "";
+        if (StringUtils.isNotBlank(dto.getInspectedSid())) {
+            ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
+            if ("1".equals(scmVehicleExamine.getInspectionResult())) {
+                scmVehicleExamine.setVinNo(dto.getVinNo());
+                scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
+                scmVehicleExamine.setModelName(dto.getModel());
+                scmVehicleExamine.setConfigName(dto.getConfig());
+                scmVehicleExamine.setRemarks(dto.getRemarks());
+                scmVehicleExamine.setAddress(dto.getAddress());
+                scmVehicleExamine.setAddressCode(dto.getLocation());
+                scmVehicleExamine.setPrice(dto.getPrice());
+                baseMapper.updateById(scmVehicleExamine);
+                List<String> factoryImage = dto.getFactoryImage();
+                for (String s : factoryImage) {
+                    s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile1 = new ScmFile();
+                scmFile1.setAttachType("01");
+                scmFile1.setFileName("厂家验车照片");
+                scmFile1.setFilePath(s1);
+                scmFile1.setLinkSid(dto.getInspectedSid());
+                scmFileService.save(scmFile1);
+
+                List<String> carInspectedImage = dto.getCarInspectedImage();
+                for (String s : carInspectedImage) {
+                    s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile2 = new ScmFile();
+                scmFile2.setAttachType("02");
+                scmFile1.setFileName("验车相关照片");
+                scmFile2.setFilePath(s2);
+                scmFile2.setLinkSid(dto.getInspectedSid());
+                scmFileService.save(scmFile2);
+            } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
+                return rb.fail().setMsg("当前车辆已验车完成，请勿重复保存");
+            }
+        }
+        return rb.fail().setMsg("保存失败");
+    }
+
+    /**
+     * 手机端-通过验车单
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String s1 = "";
+        String s2 = "";
+        if (StringUtils.isNotBlank(dto.getInspectedSid())) {
+            ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
+            if ("1".equals(scmVehicleExamine.getInspectionResult())) {
+                scmVehicleExamine.setVinNo(dto.getVin());
+                scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
+                scmVehicleExamine.setModelName(dto.getModel());
+                scmVehicleExamine.setConfigName(dto.getConfig());
+                scmVehicleExamine.setRemarks(dto.getRemarks());
+                scmVehicleExamine.setAddress(dto.getAddress());
+                scmVehicleExamine.setAddressCode(dto.getLocation());
+                scmVehicleExamine.setPrice(dto.getPrice());
+                baseMapper.updateById(scmVehicleExamine);
+                List<String> factoryImage = dto.getFactoryImage();
+                for (String s : factoryImage) {
+                    s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile1 = new ScmFile();
+                scmFile1.setAttachType("01");
+                scmFile1.setFileName("厂家验车照片");
+                scmFile1.setFilePath(s1);
+                scmFile1.setLinkSid(dto.getInspectedSid());
+                scmFileService.save(scmFile1);
+
+                List<String> carInspectedImage = dto.getCarInspectedImage();
+                for (String s : carInspectedImage) {
+                    s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile2 = new ScmFile();
+                scmFile2.setAttachType("02");
+                scmFile1.setFileName("验车相关照片");
+                scmFile2.setFilePath(s2);
+                scmFile2.setLinkSid(dto.getInspectedSid());
+                scmFileService.save(scmFile2);
+            } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
+                return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交");
+            }
+        }
+        return rb.fail().setMsg("提交失败");
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegression;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionMapper.java <br/>
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionMapper <br/>
+ * Description: 移位单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression> {
+
+	//@Update("update scm_vehicle_gression set name=#{msg} where id=#{id}")
+	//IPage<ScmVehicleGressionVo> voPage(IPage<ScmVehicleGression> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleGression> qw);
+	
+	IPage<ScmVehicleGressionVo> selectPageVo(IPage<ScmVehicleGression> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleGression> qw);
+	
+	List<ScmVehicleGressionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleGression> qw);
+	
+	@Select("select * from scm_vehicle_gression")
+	List<ScmVehicleGressionVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehiclegression.ScmVehicleGressionMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
+        SELECT * FROM scm_vehicle_gression
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
+        SELECT * FROM scm_vehicle_gression
+        <where>${ew.sqlSegment}</where>
+    </select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegression;
+
+import com.yxt.anrui.scm.api.scmvehiclegression.*;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionFeignFallback.java <br/>
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionRest <br/>
+ * Description: 移位单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "移位单")
+@RestController("scm.biz.scmvehiclegression.ScmVehicleGressionRest")
+@RequestMapping("v1/scmvehiclegression")
+public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
+
+	@Autowired
+	private ScmVehicleGressionService scmVehicleGressionService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehicleGressionVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehicleGressionVo> pv = scmVehicleGressionService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehicleGressionDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleGressionService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleGressionService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegression;
+
+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.scm.api.scmvehiclegression.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleGressionService.java <br/>
+ * Class: scm.biz.scmvehiclegression.ScmVehicleGressionService <br/>
+ * Description: 移位单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGressionMapper, ScmVehicleGression> {
+	private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmVehicleGression> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmVehicleGressionVo> listPageVo(PagerQuery<ScmVehicleGressionQuery> pq) {
+		ScmVehicleGressionQuery query = pq.getParams();
+		QueryWrapper<ScmVehicleGression> qw = createQueryWrapper(query);
+		IPage<ScmVehicleGression> page = PagerUtil.queryToPage(pq);
+		IPage<ScmVehicleGressionVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmVehicleGressionVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmVehicleGressionDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmVehicleGressionDto dto){
+		ScmVehicleGression entity = new ScmVehicleGression();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmVehicleGressionDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmVehicleGression entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmVehicleGressionDetailsVo fetchDetailsVoBySid(String sid){
+		ScmVehicleGression entity = fetchBySid(sid);
+		ScmVehicleGressionDetailsVo vo = new ScmVehicleGressionDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -71,11 +71,11 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseName())) {
-			qw.eq("warehouseName", query.getWarehouseName());
+			qw.like("warehouseName", query.getWarehouseName());
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseAttribute())) {
-			qw.eq("warehouseAttribute", query.getWarehouseAttribute());
+			qw.like("warehouseAttribute", query.getWarehouseAttribute());
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseContract())) {

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@@ -217,44 +217,51 @@ export default {
         })*/
     },
 		doDel(row) {
+
 			if (this.multipleSelection.length === 0) {
 				this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
 				return
 			}
 			const _this = this
 			const sids = []
-			this.multipleSelection.forEach(row => {
-				sids.push(row.sid)
-			})
-			const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
-			this.$confirm(tip, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					const loading = this.$loading({
-						lock: true,
-						text: 'Loading',
-						spinner: 'el-icon-loading',
-						background: 'rgba(0, 0, 0, 0.7)'
-					})
-					req
-						.delBySids(sids)
-						.then(resp => {
-							loading.close()
-							if (resp.success) {
-								_this.$message({ type: 'success', message: resp.msg, showClose: true })
-								_this.loadList()
-							} else {
-								// 根据resp.code进行异常情况处理
-							}
-						})
-						.catch(e => {
-							loading.close()
-						})
-				})
-				.catch(() => {})
+      this.multipleSelection.forEach(row => {
+        if(row.nodeState==''||(row.nodeState!=''&&row.nodeState=='外采申请')){
+          sids.push(row.sid)
+        }else{
+          alert('已经发起的审批业务数据不能进行删除。');
+          sids = [];
+        }
+      })
+       const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
+       this.$confirm(tip, '提示', {
+         confirmButtonText: '确定',
+         cancelButtonText: '取消',
+         type: 'warning'
+       })
+         .then(() => {
+           const loading = this.$loading({
+             lock: true,
+             text: 'Loading',
+             spinner: 'el-icon-loading',
+             background: 'rgba(0, 0, 0, 0.7)'
+           })
+           req
+             .delBySids(sids)
+             .then(resp => {
+               loading.close()
+               if (resp.success) {
+                 _this.$message({ type: 'success', message: resp.msg, showClose: true })
+                 this.queryParams.current = 1
+                 _this.loadList()
+               } else {
+                 // 根据resp.code进行异常情况处理
+               }
+             })
+             .catch(e => {
+               loading.close()
+             })
+         })
+         .catch(() => {})
 		},
 		doImport(row) {
 			// 导入的代码

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -362,8 +362,11 @@ export default {
         .doSubmit(this.formobj)
         .then(resp => {
           this.submitdisabled = false
+          console.log(resp);
           if (resp.success) {
             // 加提交后的逻辑
+            this.$message({ showClose: true, type: 'success', message: resp.msg })
+            this.handleReturn('true')
           } else {
             // 根据resp.code进行异常情况处理
           }

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -249,7 +249,9 @@ export default {
 		},
     /** 同意任务 */
     handleAgree() {
-      this.agreeList.comment = "同意"; this.comment
+      console.log(this)
+      console.log(parent.parent)
+    /*  this.agreeList.comment = "同意"; this.comment
       req.agreeTask(this.agreeList).then((response) => {
         if (response.code === '200') {
           this.$notify({
@@ -267,7 +269,7 @@ export default {
             duration: 2000
           })
         }
-      })
+      })*/
     },
     /** 驳回任务 */
     handleReject() {