调账接口开发、调车开票申请接口开发，修改调车、调价删除问题，完善根据日期为采购订单状态赋值

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyByVehQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseaccadjapply;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(调账管理) <br/>
+ * File: BaseAccadjApplyQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyQuery <br/>
+ * Description: 调账申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-07 16:57:24 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调账申请表 查询条件", description = "调账申请表 查询条件")
+public class BaseAccadjApplyByVehQuery implements Query {
+
+	@ApiModelProperty("调账类型key")
+    private String accadjTypeKey; // 调账类型key
+	@ApiModelProperty("调出分公司sid")
+    private String callOutOrgSid; // 调出分公司sid
+	@ApiModelProperty("调入分公司sid")
+    private String callInOrgSid; // 调入分公司sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java

@@ -26,12 +26,16 @@
 package com.yxt.anrui.base.api.baseaccadjapply;
 
 
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(调账管理) <br/>
  * File: BaseAccadjApplyVo.java <br/>
@@ -65,19 +69,6 @@ public class BaseAccadjApplyDetailsVo implements Vo {
     private String callInOrgSid; // 调入分公司sid
 	@ApiModelProperty("调入分公司名称")
     private String callInOrgName; // 调入分公司名称
-	@ApiModelProperty("使用组织sid")
-    private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
-    private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
-    private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
-    private String nodeState; // 流程状态
-	@ApiModelProperty("taskId")
-    private String taskId; // taskId
-
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(调账管理) <br/>
  * File: BaseAccadjApplyDto.java <br/>
@@ -69,15 +71,8 @@ public class BaseAccadjApplyDto implements Dto {
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
-    private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
-    private String procInstId; // 流程实例的sid
 	@ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("taskId")
-    private String taskId; // taskId
-
+    @ApiModelProperty("调账车辆类型sid")
+    private List<String> accSids; // 调账车辆类型sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseaccadjapply;
 
+import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -75,4 +77,9 @@ public interface BaseAccadjApplyFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("调账申请选择车辆列表")
+    @PostMapping("/fetchVeh")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(@RequestBody PagerQuery<BaseAccadjApplyByVehQuery> pq);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseaccadjapply;
 
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +70,9 @@ public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -64,5 +64,22 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String freight; // 运费
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
-
+    @ApiModelProperty("库存地点sid")
+    private String inventoryLocationSid; // 库存地点sid
+    @ApiModelProperty("库存地点名称")
+    private String inventoryLocationName; // 库存地点名称
+    @ApiModelProperty("内销价格")
+    private String witPinMoney; // 内销价格
+    @ApiModelProperty("发票类型key")
+    private String invoiceTypeKey; // 发票类型key
+    @ApiModelProperty("发票类型value")
+    private String invoiceTypeValue; // 发票类型value
+    @ApiModelProperty("运费承担方sid")
+    private String freightUndertakerSid; // 运费承担方sid
+    @ApiModelProperty("运费承担方名称")
+    private String freightUndertakerName; // 运费承担方名称
+    @ApiModelProperty("是否调账（0未调账，1已调账）")
+    private String isAccadj; // 是否调账（0未调账，1已调账）
+    @ApiModelProperty("是否开票（0未开票，1已开票）")
+    private String isInvoicing; // 是否开票（0未开票，1已开票）
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -65,5 +65,22 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String freight; // 运费
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
-
+    @ApiModelProperty("库存地点sid")
+    private String inventoryLocationSid; // 库存地点sid
+    @ApiModelProperty("库存地点名称")
+    private String inventoryLocationName; // 库存地点名称
+    @ApiModelProperty("内销价格")
+    private String witPinMoney; // 内销价格
+    @ApiModelProperty("发票类型key")
+    private String invoiceTypeKey; // 发票类型key
+    @ApiModelProperty("发票类型value")
+    private String invoiceTypeValue; // 发票类型value
+    @ApiModelProperty("运费承担方sid")
+    private String freightUndertakerSid; // 运费承担方sid
+    @ApiModelProperty("运费承担方名称")
+    private String freightUndertakerName; // 运费承担方名称
+    @ApiModelProperty("是否调账（0未调账，1已调账）")
+    private String isAccadj; // 是否调账（0未调账，1已调账）
+    @ApiModelProperty("是否开票（0未开票，1已开票）")
+    private String isInvoicing; // 是否开票（0未开票，1已开票）
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -67,4 +67,22 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String vinNo; // 车架号
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("库存地点sid")
+    private String inventoryLocationSid; // 库存地点sid
+    @ApiModelProperty("库存地点名称")
+    private String inventoryLocationName; // 库存地点名称
+    @ApiModelProperty("内销价格")
+    private String witPinMoney; // 内销价格
+    @ApiModelProperty("发票类型key")
+    private String invoiceTypeKey; // 发票类型key
+    @ApiModelProperty("发票类型value")
+    private String invoiceTypeValue; // 发票类型value
+    @ApiModelProperty("运费承担方sid")
+    private String freightUndertakerSid; // 运费承担方sid
+    @ApiModelProperty("运费承担方名称")
+    private String freightUndertakerName; // 运费承担方名称
+    @ApiModelProperty("是否调账（0未调账，1已调账）")
+    private String isAccadj; // 是否调账（0未调账，1已调账）
+    @ApiModelProperty("是否开票（0未开票，1已开票）")
+    private String isInvoicing; // 是否开票（0未开票，1已开票）
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVeh.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+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;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVeh.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh <br/>
+ * Description: 调车开票申请车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请车辆表", description = "调车开票申请车辆表")
+@TableName("base_shunting_invoicin_applye_veh")
+public class BaseShuntingInvoicinApplyeVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("调账sid")
+    private String accadjSid; // 调账sid
+	@ApiModelProperty("调车车辆表sid")
+    private String purchaseSid; // 调车车辆表sid
+	@ApiModelProperty("合格证")
+    private String certificate; // 合格证
+	@ApiModelProperty("开票金额")
+    private BigDecimal invoicinMoney; // 开票金额
+	@ApiModelProperty("开票单位sid")
+    private String invoicinCompanySid; // 开票单位sid
+	@ApiModelProperty("开票单位名称")
+    private String invoicinCompanyName; // 开票单位名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDetailsVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo <br/>
+ * Description: 调车开票申请车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请车辆表 视图数据详情", description = "调车开票申请车辆表 视图数据详情")
+public class BaseShuntingInvoicinApplyeVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("调账sid")
+    private String accadjSid; // 调账sid
+	@ApiModelProperty("调车车辆表sid")
+    private String purchaseSid; // 调车车辆表sid
+	@ApiModelProperty("合格证")
+    private String certificate; // 合格证
+	@ApiModelProperty("开票金额")
+    private BigDecimal invoicinMoney; // 开票金额
+	@ApiModelProperty("开票单位sid")
+    private String invoicinCompanySid; // 开票单位sid
+	@ApiModelProperty("开票单位名称")
+    private String invoicinCompanyName; // 开票单位名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto <br/>
+ * Description: 调车开票申请车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请车辆表 数据传输对象", description = "调车开票申请车辆表 数据传输对象")
+public class BaseShuntingInvoicinApplyeVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("调账sid")
+    private String accadjSid; // 调账sid
+	@ApiModelProperty("调车车辆表sid")
+    private String purchaseSid; // 调车车辆表sid
+	@ApiModelProperty("合格证")
+    private String certificate; // 合格证
+	@ApiModelProperty("开票金额")
+    private BigDecimal invoicinMoney; // 开票金额
+	@ApiModelProperty("开票单位sid")
+    private String invoicinCompanySid; // 开票单位sid
+	@ApiModelProperty("开票单位名称")
+    private String invoicinCompanyName; // 开票单位名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+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: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehFeign <br/>
+ * Description: 调车开票申请车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "调车开票申请车辆表")
+@FeignClient(
+        contextId = "anrui-base-BaseShuntingInvoicinApplyeVeh",
+        name = "anrui-base",
+        path = "v1/baseshuntinginvoicinapplyeveh",
+        fallback = BaseShuntingInvoicinApplyeVehFeignFallback.class)
+public interface BaseShuntingInvoicinApplyeVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseShuntingInvoicinApplyeVehVo>> listPage(@RequestBody PagerQuery<BaseShuntingInvoicinApplyeVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseShuntingInvoicinApplyeVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseShuntingInvoicinApplyeVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+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: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehFeignFallback <br/>
+ * Description: 调车开票申请车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseShuntingInvoicinApplyeVehFeignFallback implements BaseShuntingInvoicinApplyeVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseShuntingInvoicinApplyeVehVo>> listPage(PagerQuery<BaseShuntingInvoicinApplyeVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseshuntinginvoicinapplyeveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseShuntingInvoicinApplyeVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseshuntinginvoicinapplyeveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseshuntinginvoicinapplyeveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseShuntingInvoicinApplyeVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseshuntinginvoicinapplyeveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehQuery.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehQuery <br/>
+ * Description: 调车开票申请车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请车辆表 查询条件", description = "调车开票申请车辆表 查询条件")
+public class BaseShuntingInvoicinApplyeVehQuery implements Query {
+
+	@ApiModelProperty("调账sid")
+    private String accadjSid; // 调账sid
+	@ApiModelProperty("调车车辆表sid")
+    private String purchaseSid; // 调车车辆表sid
+	@ApiModelProperty("合格证")
+    private String certificate; // 合格证
+	@ApiModelProperty("开票金额")
+    private BigDecimal invoicinMoney; // 开票金额
+	@ApiModelProperty("开票单位sid")
+    private String invoicinCompanySid; // 开票单位sid
+	@ApiModelProperty("开票单位名称")
+    private String invoicinCompanyName; // 开票单位名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo <br/>
+ * Description: 调车开票申请车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请车辆表 视图数据对象", description = "调车开票申请车辆表 视图数据对象")
+public class BaseShuntingInvoicinApplyeVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("调账sid")
+    private String accadjSid; // 调账sid
+	@ApiModelProperty("调车车辆表sid")
+    private String purchaseSid; // 调车车辆表sid
+	@ApiModelProperty("合格证")
+    private String certificate; // 合格证
+	@ApiModelProperty("开票金额")
+    private BigDecimal invoicinMoney; // 开票金额
+	@ApiModelProperty("开票单位sid")
+    private String invoicinCompanySid; // 开票单位sid
+	@ApiModelProperty("开票单位名称")
+    private String invoicinCompanyName; // 开票单位名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApply.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+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: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApply.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply <br/>
+ * Description: 调车开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请表", description = "调车开票申请表")
+@TableName("base_shunting_invoicing_apply")
+public class BaseShuntingInvoicingApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("调账类型key")
+    private String accadjTypeKey; // 调账类型key
+	@ApiModelProperty("调账类型value")
+    private String accadjTypeValue; // 调账类型value
+	@ApiModelProperty("调出分公司sid")
+    private String callOutOrgSid; // 调出分公司sid
+	@ApiModelProperty("调出分公司名称")
+    private String callOutOrgName; // 调出分公司名称
+	@ApiModelProperty("调入分公司sid")
+    private String callInOrgSid; // 调入分公司sid
+	@ApiModelProperty("调入分公司名称")
+    private String callInOrgName; // 调入分公司名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo <br/>
+ * Description: 调车开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请表 视图数据详情", description = "调车开票申请表 视图数据详情")
+public class BaseShuntingInvoicingApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("调账类型key")
+    private String accadjTypeKey; // 调账类型key
+	@ApiModelProperty("调账类型value")
+    private String accadjTypeValue; // 调账类型value
+	@ApiModelProperty("调出分公司sid")
+    private String callOutOrgSid; // 调出分公司sid
+	@ApiModelProperty("调出分公司名称")
+    private String callOutOrgName; // 调出分公司名称
+	@ApiModelProperty("调入分公司sid")
+    private String callInOrgSid; // 调入分公司sid
+	@ApiModelProperty("调入分公司名称")
+    private String callInOrgName; // 调入分公司名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto <br/>
+ * Description: 调车开票申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请表 数据传输对象", description = "调车开票申请表 数据传输对象")
+public class BaseShuntingInvoicingApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("调账类型key")
+    private String accadjTypeKey; // 调账类型key
+	@ApiModelProperty("调账类型value")
+    private String accadjTypeValue; // 调账类型value
+	@ApiModelProperty("调出分公司sid")
+    private String callOutOrgSid; // 调出分公司sid
+	@ApiModelProperty("调出分公司名称")
+    private String callOutOrgName; // 调出分公司名称
+	@ApiModelProperty("调入分公司sid")
+    private String callInOrgSid; // 调入分公司sid
+	@ApiModelProperty("调入分公司名称")
+    private String callInOrgName; // 调入分公司名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+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: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign <br/>
+ * Description: 调车开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "调车开票申请表")
+@FeignClient(
+        contextId = "anrui-base-BaseShuntingInvoicingApply",
+        name = "anrui-base",
+        path = "v1/baseshuntinginvoicingapply",
+        fallback = BaseShuntingInvoicingApplyFeignFallback.class)
+public interface BaseShuntingInvoicingApplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseShuntingInvoicingApplyVo>> listPage(@RequestBody PagerQuery<BaseShuntingInvoicingApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseShuntingInvoicingApplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+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: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeignFallback <br/>
+ * Description: 调车开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseShuntingInvoicingApplyFeignFallback implements BaseShuntingInvoicingApplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseShuntingInvoicingApplyVo>> listPage(PagerQuery<BaseShuntingInvoicingApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseshuntinginvoicingapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseShuntingInvoicingApplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseshuntinginvoicingapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseshuntinginvoicingapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseshuntinginvoicingapply/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyQuery.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyQuery <br/>
+ * Description: 调车开票申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请表 查询条件", description = "调车开票申请表 查询条件")
+public class BaseShuntingInvoicingApplyQuery implements Query {
+
+	@ApiModelProperty("申请开始日期")
+    private String applyStartDate; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String applyEndDate; // 申请结束日期
+	@ApiModelProperty("调出分公司sid")
+    private String callOutOrgSid; // 调出分公司sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyVo.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo <br/>
+ * Description: 调车开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调车开票申请表 视图数据对象", description = "调车开票申请表 视图数据对象")
+public class BaseShuntingInvoicingApplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("调账类型value")
+    private String accadjTypeValue; // 调账类型value
+	@ApiModelProperty("调出分公司名称")
+    private String callOutOrgName; // 调出分公司名称
+	@ApiModelProperty("调入分公司名称")
+    private String callInOrgName; // 调入分公司名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListDto.java

@@ -32,4 +32,6 @@ public class BusVehicleOrderListDto implements Dto {
     private String orderTypeKey;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
+    @ApiModelProperty(value = "订单状态")
+    private String orderStatus;
 }

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

@@ -26,9 +26,13 @@
 package com.yxt.anrui.base.biz.baseaccadjapply;
 
 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.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +66,6 @@ public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
 	
 	@Select("select * from base_accadj_apply")
 	List<BaseAccadjApplyVo> selectListVo();
+
+	IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
 }

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

@@ -10,4 +10,20 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo">
 		SELECT * FROM base_accadj_apply <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="fetchVeh"
+			resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo">
+		SELECT
+		bipv.*,
+		bip.`shuntingType`,
+		bip.`buyerOrgName`,
+		bip.`buyerOrgSid`,
+		bip.`sellerOrgName`,
+		bip.`sellerOrgSid`
+		FROM
+		base_internal_purchase_vehicle bipv
+		LEFT JOIN base_internal_purchase bip
+		ON bipv.`mainSid` = bip.`sid`
+		<where> ${ew.sqlSegment} </where>
+	</select>
 </mapper>

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

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.baseaccadjapply;
 
+import com.yxt.anrui.base.api.baseaccadjapply.*;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,14 +35,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyQuery;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDetailsVo;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDto;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyFeign;
-
 /**
  * Project: anrui-base(调账管理) <br/>
  * File: BaseAccadjApplyFeignFallback.java <br/>
@@ -75,26 +69,25 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody BaseAccadjApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseAccadjApplyService.saveOrUpdateDto(dto);
-		return rb.success();
+		return baseAccadjApplyService.saveOrUpdateDto(dto);
 	}
 
 	@Override
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseAccadjApplyService.delBySids(sids);
-		return rb.success();
+		return baseAccadjApplyService.delAll(sids);
 	}
 
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BaseAccadjApplyDetailsVo vo = baseAccadjApplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+		return baseAccadjApplyService.fetchDetailsVoBySid(sid);
+	}
+
+	@Override
+	public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
+		return baseAccadjApplyService.fetchVeh(pq);
 	}
 }

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

@@ -28,21 +28,24 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.baseaccadjapply.*;
+import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
+import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
+import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
+import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 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 com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyQuery;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDetailsVo;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDto;
-import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -60,66 +63,144 @@ import java.util.List;
  */
 @Service
 public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMapper, BaseAccadjApply> {
-	private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<BaseAccadjApplyVo> listPageVo(PagerQuery<BaseAccadjApplyQuery> pq) {
-		BaseAccadjApplyQuery query = pq.getParams();
-		QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();
-		String applyStartDate = query.getApplyStartDate();
-		String applyEndDate = query.getApplyEndDate();
-		qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
-				);
-		qw.eq("createOrgSid",query.getCreateOrgSid());
-		if (StringUtils.isNotBlank(query.getAccadjTypeKey())){
-			qw.eq("accadjTypeKey",query.getAccadjTypeKey());
-		}
-		if (StringUtils.isNotBlank(query.getCallOutOrgSid())){
-			qw.eq("callOutOrgSid",query.getCallOutOrgSid());
-		}
-		if (StringUtils.isNotBlank(query.getCallInOrgSid())){
-			qw.eq("callInOrgSid",query.getCallInOrgSid());
-		}
-		IPage<BaseAccadjApply> page = PagerUtil.queryToPage(pq);
-		IPage<BaseAccadjApplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseAccadjApplyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(BaseAccadjApplyDto dto){
+
+    @Autowired
+    private BaseAccadjApplyeVehService baseAccadjApplyeVehService;
+    @Autowired
+    private BaseInternalPurchaseVehicleService baseInternalPurchaseVehicleService;
+
+    private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseAccadjApplyVo> listPageVo(PagerQuery<BaseAccadjApplyQuery> pq) {
+        BaseAccadjApplyQuery query = pq.getParams();
+        QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();
+        String applyStartDate = query.getApplyStartDate();
+        String applyEndDate = query.getApplyEndDate();
+        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+                );
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getAccadjTypeKey())) {
+            qw.eq("accadjTypeKey", query.getAccadjTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getCallOutOrgSid())) {
+            qw.eq("callOutOrgSid", query.getCallOutOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getCallInOrgSid())) {
+            qw.eq("callInOrgSid", query.getCallInOrgSid());
+        }
+        IPage<BaseAccadjApply> page = PagerUtil.queryToPage(pq);
+        IPage<BaseAccadjApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseAccadjApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(BaseAccadjApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<String> accSids = dto.getAccSids();
+        if (StringUtils.isBlank(dtoSid)) {//新增
+            ResultBean resultBean = this.insertByDto(dto);
+            String sid = (String) resultBean.getData();
+            for (String accSid : accSids) {
+                BaseAccadjApplyeVeh baseAccadjApplyeVeh = new BaseAccadjApplyeVeh();
+                baseAccadjApplyeVeh.setAccadjSid(sid);
+                baseAccadjApplyeVeh.setPurchaseSid(accSid);
+                baseAccadjApplyeVehService.save(baseAccadjApplyeVeh);
+            }
+            return rb.success().setMsg("保存成功");
+        }
+        BaseAccadjApply baseAccadjApply = fetchBySid(dtoSid);
+        if (baseAccadjApply == null) {
+            rb.setMsg("该调账申请不存在");
+        }
+        this.updateByDto(dto);
+        baseAccadjApplyeVehService.delByMainSid(dtoSid);
+        for (String accSid : accSids) {
+            BaseAccadjApplyeVeh baseAccadjApplyeVeh = new BaseAccadjApplyeVeh();
+            baseAccadjApplyeVeh.setAccadjSid(dtoSid);
+            baseAccadjApplyeVeh.setPurchaseSid(accSid);
+            baseAccadjApplyeVehService.save(baseAccadjApplyeVeh);
+        }
+        return rb.success().setMsg("修改成功");
+    }
+
+    public ResultBean insertByDto(BaseAccadjApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApply entity = new BaseAccadjApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setData(entity.getSid());
+    }
+
+    public void updateByDto(BaseAccadjApplyDto dto) {
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(BaseAccadjApplyDto dto){
-		BaseAccadjApply entity = new BaseAccadjApply();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(BaseAccadjApplyDto dto){
-          String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		BaseAccadjApply entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public BaseAccadjApplyDetailsVo fetchDetailsVoBySid(String sid){
-		BaseAccadjApply entity = fetchBySid(sid);
-		BaseAccadjApplyDetailsVo vo = new BaseAccadjApplyDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        BaseAccadjApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsVoBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApply entity = fetchBySid(sid);
+        BaseAccadjApplyDetailsVo vo = new BaseAccadjApplyDetailsVo();
+        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
+        BeanUtil.copyProperties(entity, vo);
+        String sid1 = vo.getSid();
+        List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(sid1);
+        for (String s : stringList) {
+            BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+            baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
+        }
+        vo.setBaseInternalPurchaseVehicles(baseInternalPurchaseVehicles);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApplyByVehQuery query = pq.getParams();
+        QueryWrapper<BaseInternalPurchaseVehicleDetailsVo> qw = new QueryWrapper<>();
+        String accadjTypeKey = query.getAccadjTypeKey();
+        String callInOrgSid = query.getCallInOrgSid();
+        String callOutOrgSid = query.getCallOutOrgSid();
+        if (StringUtils.isBlank(accadjTypeKey)) {
+            return rb.setMsg("请选择调账类型");
+        }
+        if (StringUtils.isBlank(callInOrgSid)) {
+            return rb.setMsg("请选择调入分公司");
+        }
+        if (StringUtils.isBlank(callOutOrgSid)) {
+            return rb.setMsg("请选择调出分公司");
+        }
+        if (accadjTypeKey.equals("0")) {
+            qw.eq("bip.shuntingType", accadjTypeKey);
+            qw.eq("bip.buyerOrgSid", callInOrgSid);
+            qw.eq("bip.sellerOrgSid", callOutOrgSid);
+        } else if (accadjTypeKey.equals("1")) {
+            qw.eq("bip.shuntingType", accadjTypeKey);
+            qw.eq("bip.buyerOrgSid", callInOrgSid);
+            qw.eq("bip.sellerOrgSid", callOutOrgSid);
+        }
+        IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
+        IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
+        PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        for (String sid : sids) {
+            baseAccadjApplyeVehService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java

@@ -29,6 +29,7 @@ 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 org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,10 @@ public interface BaseAccadjApplyeVehMapper extends BaseMapper<BaseAccadjApplyeVe
 	
 	@Select("select * from base_accadj_applye_veh")
 	List<BaseAccadjApplyeVehVo> selectListVo();
+
+	@Delete("delete from base_accadj_applye_veh where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select purchaseSid from base_accadj_applye_veh where mainSid = #{sid1}")
+	List<String> fetchByMainSid(String sid1);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java

@@ -107,4 +107,12 @@ public class BaseAccadjApplyeVehService extends MybatisBaseService<BaseAccadjApp
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<String> fetchByMainSid(String sid1) {
+		return baseMapper.fetchByMainSid(sid1);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml

@@ -49,9 +49,9 @@
     </select>
 
 	<select id="selectBySid" resultType="int">
-		select count(*)
-		from base_internal_purchase
-		where length(nodeState) > 0
+		SELECT COUNT(*)
+		FROM base_internal_purchase
+		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -233,6 +233,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                 listDto.setOrderType("排产订单");
                 listDto.setOrderTypeKey("001");
                 listDto.setInsideCode(vo.getInsideCode());
+                listDto.setOrderStatus("0");
                 dtoList.add(listDto);
             }
             busVehicleOrderService.saveVehicleOrder(dtoList);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml

@@ -37,7 +37,7 @@
 	<select id="selectBySid" resultType="int">
 		select count(*)
 		from base_model_modprice
-		where length(nodeState) > 0
+		where nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehMapper <br/>
+ * Description: 调车开票申请车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseShuntingInvoicinApplyeVehMapper extends BaseMapper<BaseShuntingInvoicinApplyeVeh> {
+
+	//@Update("update base_shunting_invoicin_applye_veh set name=#{msg} where id=#{id}")
+	//IPage<BaseShuntingInvoicinApplyeVehVo> voPage(IPage<BaseShuntingInvoicinApplyeVeh> page, @Param(Constants.WRAPPER) QueryWrapper<BaseShuntingInvoicinApplyeVeh> qw);
+	
+	IPage<BaseShuntingInvoicinApplyeVehVo> selectPageVo(IPage<BaseShuntingInvoicinApplyeVeh> page, @Param(Constants.WRAPPER) Wrapper<BaseShuntingInvoicinApplyeVeh> qw);
+	
+	List<BaseShuntingInvoicinApplyeVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseShuntingInvoicinApplyeVeh> qw);
+	
+	@Select("select * from base_shunting_invoicin_applye_veh")
+	List<BaseShuntingInvoicinApplyeVehVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.xml

@@ -0,0 +1,13 @@
+<?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.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
+		SELECT * FROM base_shunting_invoicin_applye_veh <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
+		SELECT * FROM base_shunting_invoicin_applye_veh <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh;
+
+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;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehQuery;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehFeign;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehRest <br/>
+ * Description: 调车开票申请车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "调车开票申请车辆表")
+@RestController("com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehRest")
+@RequestMapping("v1/baseshuntinginvoicinapplyeveh")
+public class BaseShuntingInvoicinApplyeVehRest implements BaseShuntingInvoicinApplyeVehFeign {
+
+	@Autowired
+	private BaseShuntingInvoicinApplyeVehService baseShuntingInvoicinApplyeVehService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseShuntingInvoicinApplyeVehVo>> listPage(@RequestBody PagerQuery<BaseShuntingInvoicinApplyeVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseShuntingInvoicinApplyeVehVo> pv = baseShuntingInvoicinApplyeVehService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseShuntingInvoicinApplyeVehDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseShuntingInvoicinApplyeVehService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseShuntingInvoicinApplyeVehService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseShuntingInvoicinApplyeVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseShuntingInvoicinApplyeVehDetailsVo vo = baseShuntingInvoicinApplyeVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehQuery;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicinApplyeVehService.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService <br/>
+ * Description: 调车开票申请车辆表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseShuntingInvoicinApplyeVehService extends MybatisBaseService<BaseShuntingInvoicinApplyeVehMapper, BaseShuntingInvoicinApplyeVeh> {
+	private QueryWrapper<BaseShuntingInvoicinApplyeVeh> createQueryWrapper(BaseShuntingInvoicinApplyeVehQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseShuntingInvoicinApplyeVeh> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseShuntingInvoicinApplyeVehVo> listPageVo(PagerQuery<BaseShuntingInvoicinApplyeVehQuery> pq) {
+		BaseShuntingInvoicinApplyeVehQuery query = pq.getParams();
+		QueryWrapper<BaseShuntingInvoicinApplyeVeh> qw = createQueryWrapper(query);
+		IPage<BaseShuntingInvoicinApplyeVeh> page = PagerUtil.queryToPage(pq);
+		IPage<BaseShuntingInvoicinApplyeVehVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseShuntingInvoicinApplyeVehVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseShuntingInvoicinApplyeVehDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseShuntingInvoicinApplyeVehDto dto){
+		BaseShuntingInvoicinApplyeVeh entity = new BaseShuntingInvoicinApplyeVeh();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseShuntingInvoicinApplyeVehDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseShuntingInvoicinApplyeVeh entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseShuntingInvoicinApplyeVehDetailsVo fetchDetailsVoBySid(String sid){
+		BaseShuntingInvoicinApplyeVeh entity = fetchBySid(sid);
+		BaseShuntingInvoicinApplyeVehDetailsVo vo = new BaseShuntingInvoicinApplyeVehDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyMapper <br/>
+ * Description: 调车开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseShuntingInvoicingApplyMapper extends BaseMapper<BaseShuntingInvoicingApply> {
+
+	//@Update("update base_shunting_invoicing_apply set name=#{msg} where id=#{id}")
+	//IPage<BaseShuntingInvoicingApplyVo> voPage(IPage<BaseShuntingInvoicingApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseShuntingInvoicingApply> qw);
+	
+	IPage<BaseShuntingInvoicingApplyVo> selectPageVo(IPage<BaseShuntingInvoicingApply> page, @Param(Constants.WRAPPER) Wrapper<BaseShuntingInvoicingApply> qw);
+	
+	List<BaseShuntingInvoicingApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseShuntingInvoicingApply> qw);
+	
+	@Select("select * from base_shunting_invoicing_apply")
+	List<BaseShuntingInvoicingApplyVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml

@@ -0,0 +1,13 @@
+<?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.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo">
+		SELECT * FROM base_shunting_invoicing_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo">
+		SELECT * FROM base_shunting_invoicing_apply <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
+
+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;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyQuery;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest <br/>
+ * Description: 调车开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "调车开票申请表")
+@RestController("com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest")
+@RequestMapping("v1/baseshuntinginvoicingapply")
+public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingApplyFeign {
+
+	@Autowired
+	private BaseShuntingInvoicingApplyService baseShuntingInvoicingApplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseShuntingInvoicingApplyVo>> listPage(@RequestBody PagerQuery<BaseShuntingInvoicingApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseShuntingInvoicingApplyVo> pv = baseShuntingInvoicingApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseShuntingInvoicingApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseShuntingInvoicingApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseShuntingInvoicingApplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseShuntingInvoicingApplyDetailsVo vo = baseShuntingInvoicingApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -0,0 +1,119 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyQuery;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调车开票) <br/>
+ * File: BaseShuntingInvoicingApplyService.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyService <br/>
+ * Description: 调车开票申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-11 15:30:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseShuntingInvoicingApplyMapper, BaseShuntingInvoicingApply> {
+    private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseShuntingInvoicingApply> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseShuntingInvoicingApplyVo> listPageVo(PagerQuery<BaseShuntingInvoicingApplyQuery> pq) {
+        BaseShuntingInvoicingApplyQuery query = pq.getParams();
+        QueryWrapper<BaseShuntingInvoicingApply> qw = new QueryWrapper<>();
+        String applyStartDate = query.getApplyStartDate();
+        String applyEndDate = query.getApplyEndDate();
+        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+                );
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getCallOutOrgSid())) {
+            qw.eq("callOutOrgSid", query.getCallOutOrgSid());
+        }
+        IPage<BaseShuntingInvoicingApply> page = PagerUtil.queryToPage(pq);
+        IPage<BaseShuntingInvoicingApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseShuntingInvoicingApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BaseShuntingInvoicingApplyDto dto) {
+        BaseShuntingInvoicingApply entity = new BaseShuntingInvoicingApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BaseShuntingInvoicingApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BaseShuntingInvoicingApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BaseShuntingInvoicingApplyDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseShuntingInvoicingApply entity = fetchBySid(sid);
+        BaseShuntingInvoicingApplyDetailsVo vo = new BaseShuntingInvoicingApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -72,6 +72,13 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
 
     @Override
     public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) {
+        if (StringUtils.isNotBlank(dto.getExpectLaunchDate()) && StringUtils.isNotBlank(dto.getLaunchDate())) {
+            long expectLaunchTime = DateUtils.dateStrConvertDate(dto.getExpectLaunchDate(), "yyyy-MM-dd").getTime();
+            long launchTime = DateUtils.dateStrConvertDate(dto.getLaunchDate(), "yyyy-MM-dd").getTime();
+            if (expectLaunchTime > launchTime) {
+                return new ResultBean().setMsg("上线日期不能小于预上线日期");
+            }
+        }
         if (StringUtils.isNotBlank(dto.getLaunchDate()) && StringUtils.isNotBlank(dto.getOfflineDate())) {
             long launchTime = DateUtils.dateStrConvertDate(dto.getLaunchDate(), "yyyy-MM-dd").getTime();
             long OfflineTime = DateUtils.dateStrConvertDate(dto.getOfflineDate(), "yyyy-MM-dd").getTime();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -217,9 +217,21 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         } else { // 修改
             BusVehicleOrder vehicleOrder = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, vehicleOrder);
-            updateById(vehicleOrder);
+            //下线日期
             String offlineDate = dto.getOfflineDate();
-            if (StringUtils.isNotBlank(offlineDate)){
+            //上线日期
+            String launchDate = dto.getLaunchDate();
+            //预上线日期
+            String expectLaunchDate = dto.getExpectLaunchDate();
+            if (StringUtils.isNotBlank(offlineDate)) {
+                vehicleOrder.setOrderStatus("3");
+            } else if (StringUtils.isNotBlank(launchDate)) {
+                vehicleOrder.setOrderStatus("2");
+            } else if (StringUtils.isNotBlank(expectLaunchDate)) {
+                vehicleOrder.setOrderStatus("1");
+            }
+            updateById(vehicleOrder);
+            if (StringUtils.isNotBlank(offlineDate)) {
                 ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
                 //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
                 //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份