Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -114,6 +118,20 @@ public interface FinCollectionConfirmationFeign {
     @PostMapping("/selectSids")
     ResultBean<List<String>> selectSids(@RequestParam("busVehSid") String busVehSid);
 
+    /*-------------------------------------------------------------------------*/
+
+    @ApiOperation("售后提交新增保存")
+    @PostMapping("/asSave")
+    public ResultBean asSave(@RequestBody AsFinCollectionConfirmationDto dto);
+
+    @ApiOperation("售后编辑回显或详情")
+    @GetMapping("/asFetchBySid/{sid}")
+    public ResultBean<AsFinCollectionConfirmationDetailsVo> asFetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("售后查看收款申请以及代办理列表")
+    @PostMapping("/asListPagess")
+    public ResultBean<PagerVo<AsFinCollectionConfirmationVo>> asListPagess(@RequestBody PagerQuery<AsFinCollectionConfirmationQuery> pq);
+
     /*----------------------金融认款申请---------------------------*/
 
 
@@ -235,4 +253,4 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("手机端—初始化收款确认申请")
     @GetMapping("/getRskCollectionConfirmDetail")
     ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery);
-}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -114,6 +118,21 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
         return null;
     }
 
+    @Override
+    public ResultBean asSave(AsFinCollectionConfirmationDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AsFinCollectionConfirmationDetailsVo> asFetchBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<AsFinCollectionConfirmationVo>> asListPagess(PagerQuery<AsFinCollectionConfirmationQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {
         return null;
@@ -253,4 +272,4 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) {
         return null;
     }
-}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDetailsVo.java

@@ -0,0 +1,131 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+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-fin(销售相关) <br/>
+ * File: FinCollectionConfirmationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
+ * Description: 收款确认表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
+@Data
+public class AsFinCollectionConfirmationDetailsVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+	@ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+	@ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+	@ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+	@ApiModelProperty("打款凭证Url")
+    private String paymentVoucherUrl; // 打款凭证Url
+    /*@ApiModelProperty("打款凭证附件名称")
+    private String paymentVoucherFileName;*/ // 打款凭证附件名称
+	@ApiModelProperty("汇款确认书Url")
+    private String remittanceConfirmationUrl; // 汇款确认书Url
+    /*@ApiModelProperty("汇款确认书附件名称")
+    private String remittanceConfirmationFileName;*/ // 汇款确认书附件名称
+	@ApiModelProperty("余额")
+    private String balance; // 余额
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("已选应收款项明细")
+    private List<AsFinSelectedReceivablesDetailedVo> finSelectedReceivablesDetaileds; // 已选应收款项明细
+    @ApiModelProperty("打款凭证附件")
+    private List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs; // 打款凭证附件
+    @ApiModelProperty("汇款确认书附件")
+    private List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs; // 汇款确认书附件
+
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请日期")
+    private String createDate;
+    @ApiModelProperty("收款账户名称")
+    private String receivingName;
+    @ApiModelProperty("付款账号后4位")
+    private String payAccount;
+    @ApiModelProperty("付款银行")
+    private String payBank;
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
+    private String reason;
+
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationDto.java

@@ -0,0 +1,87 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 14:48
+ */
+@Data
+public class AsFinCollectionConfirmationDto implements Dto {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("sid")
+    private String sid; // 收款确认单sid
+    @ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    @ApiModelProperty("申请日期")
+    private String createDate;
+    @ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+    @ApiModelProperty("收款银行key")
+    private String collectionBankKey; // 收款银行key
+    @ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+    @ApiModelProperty("收款银行账号key")
+    private String collectionBankNumKey; // 收款银行账号key
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+    @ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+    @ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+    @ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+    @ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+    @ApiModelProperty("打款凭证Url")
+    private String paymentVoucherUrl; // 打款凭证Url
+    @ApiModelProperty("汇款确认书Url")
+    private String remittanceConfirmationUrl; // 汇款确认书Url
+    /*	@ApiModelProperty("余额")
+        private String balance;*/
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
+    private Integer paymentState; // 审核状态
+    @ApiModelProperty("已选应收款项明细")
+    @Valid
+    private List<AsFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetaileds; // 已选应收款项明细
+    @ApiModelProperty("打款凭证附件")
+    private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
+    @ApiModelProperty("汇款确认书附件")
+    private List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+
+    @ApiModelProperty("收款账户名称")
+    private String receivingName;
+    @ApiModelProperty("付款账号后4位")
+    private String payAccount;
+    @ApiModelProperty("付款银行")
+    private String payBank;
+    @ApiModelProperty("收款银行账号sid")
+    private String accountSid;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+
+    @ApiModelProperty("当前组织机构全路径sid")
+    private String orgPath;
+
+
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationQuery.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fincenter(销售相关) <br/>
+ * File: FinCollectionConfirmationQuery.java <br/>
+ * Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery <br/>
+ * Description: 收款确认表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件")
+@Data
+public class AsFinCollectionConfirmationQuery implements Query {
+
+	@ApiModelProperty("收款开始日期")
+    private String collectionStartDate; // 收款开始日期
+    @ApiModelProperty("收款结束日期")
+    private String collectionEndDate; // 收款结束日期
+	@ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+	@ApiModelProperty("收款方式key")
+    private String collectionTypeKey; // 收款方式key
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
+    //后端自己赋值的
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
+
+    @ApiModelProperty("状态：0申请，1确认")
+    private String state;
+
+
+    private String payerName;
+
+    private String auditState;
+
+    @ApiModelProperty("申请部门")
+    private String createDept; // 申请部门
+    @ApiModelProperty("申请人")
+    private String createByName; // 申请人
+    @ApiModelProperty("申请开始日期")
+    private String createStartDate; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String createEndDate; // 申请结束日期
+    @ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+    @ApiModelProperty("收款账号")
+    private String finBillNo;
+    @ApiModelProperty("使用组织sid")
+    private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinCollectionConfirmationVo.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(销售相关) <br/>
+ * File: FinCollectionConfirmationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
+ * Description: 收款确认表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
+@Data
+public class AsFinCollectionConfirmationVo implements Vo {
+
+    private static final long serialVersionUID = 6561005289102689912L;
+    @ApiModelProperty("收款确认单sid")
+    private String sid; // 收款确认单sid
+    @ApiModelProperty("收款日期")
+    private String collectionDate; // 收款日期
+    @ApiModelProperty("收款银行")
+    private String collectionBank; // 收款银行
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNum; // 收款银行账号
+    @ApiModelProperty("收款方式value")
+    private String collectionTypeValue; // 收款方式value
+    @ApiModelProperty("付款方名称")
+    private String payerName; // 付款方名称
+    @ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
+    private Integer auditState; // 审核状态
+    @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
+    private Integer subscriptionState; // 审核状态
+
+    @ApiModelProperty("是否允许认款")
+    private boolean showHandle;
+
+    @ApiModelProperty("余额")
+    private String balance;
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请日期")
+    private String createDate;
+    @ApiModelProperty("收款账户名称")
+    private String receivingName;
+    @ApiModelProperty("付款账号后4位")
+    private String payAccount;
+    @ApiModelProperty("付款银行")
+    private String payBank;
+
+    @ApiModelProperty("申请人")
+    private String createByName;
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("下载次数")
+    private String downNum; // 下载次数
+
+    @ApiModelProperty("是否有撤回按钮")
+    private boolean recallAtn;
+    private String createBySid;
+
+    @ApiModelProperty("是否金融认款")
+    private boolean loan;
+    private String source;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedDto.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 15:32
+ */
+@Data
+public class AsFinSelectedReceivablesDetailedDto {
+
+    @ApiModelProperty("创建人")
+    private String createByName; // 创建人接口
+    @ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("车架号")
+    @JsonProperty("VIN")
+    private String VIN; // 车架号
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+    /*  @ApiModelProperty("上次认款金额")
+      private String lastSubscriptionMoney; // 上次认款金额*/
+    @ApiModelProperty("认款金额")
+    @NotBlank(message = "认款金额不能为空")
+    private String subscriptionMoney; // 认款金额
+    @ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+    @ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
+
+    @ApiModelProperty("款项状态")
+    private String kxState;
+    private int subscribedOf;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/as/AsFinSelectedReceivablesDetailedVo.java

@@ -0,0 +1,93 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.as;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 15:54
+ */
+@Data
+public class AsFinSelectedReceivablesDetailedVo {
+
+
+    @ApiModelProperty("已选应收款项sid")
+    private String sid; // 已选应收款项sid
+
+    @ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+
+    @ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+
+    @ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("VIN")
+    private String VIN; // 车架号
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+
+    @ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+
+    @ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+
+    @ApiModelProperty("未认款金额")
+    private String noSubscriptionMoney; // 未认款金额
+
+    @ApiModelProperty("认款申请日期")
+    private String subscriptionDate; // 认款申请日期
+
+    @ApiModelProperty("收款确认单sid")
+    private String collSid; // 收款确认单sid
+
+    @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
+    private Integer auditState; // 审核状态
+
+    @ApiModelProperty("审核时间")
+    private String auditDate; // 审核时间
+
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+
+    @ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
+
+    private String sumAll;
+
+    @ApiModelProperty("全款贷款key:1是全款，2贷款")
+    private String payTypeKey;
+    @ApiModelProperty("全款贷款")
+    private String payType;
+
+    private int subscribedOf;
+
+    @ApiModelProperty("余额")
+    private String balance;
+    @ApiModelProperty("款项状态")
+    private String kxState;
+    private String vehMark;
+    private String billType;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -61,6 +63,11 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @PostMapping("/listAll")
     public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query);
 
+    @ApiOperation("售后应收未收款项列表")
+    @PostMapping("/asListAll")
+    public ResultBean<List<AsDetailsOfReceivablesAndUncollectedItemsVo>> asListAll(@RequestBody AsFinUncollectedReceivablesDetailedQuery query);
+
+
     @ApiOperation("新增或修改保存")
     @PostMapping("/saveOrUpdate")
     public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -55,6 +57,11 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问");
 	}
 
+	@Override
+	public ResultBean<List<AsDetailsOfReceivablesAndUncollectedItemsVo>> asListAll(AsFinUncollectedReceivablesDetailedQuery query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean saveOrUpdate(FinUncollectedReceivablesDetailedDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/saveOrUpdate无法访问");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsDetailsOfReceivablesAndUncollectedItemsVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 13:34
+ */
+@Data
+public class  AsDetailsOfReceivablesAndUncollectedItemsVo {
+
+    @ApiModelProperty("应收未收款项sid")
+    private String sid; // 应收未收款项sid
+    @ApiModelProperty("维修单号")
+    private String billNo; // 维修单号
+    @ApiModelProperty("车架号")
+    private String VIN; // 车架号
+    private String vehMark; // 车牌号
+    private String customerPhone; // 电话
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+    @ApiModelProperty("应收金额")
+    private String reveivableMoney;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+
+
+    @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
+    private int subscribedOf;
+
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/as/AsFinUncollectedReceivablesDetailedQuery.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 13:49
+ */
+@Data
+public class AsFinUncollectedReceivablesDetailedQuery implements Query {
+
+    @ApiModelProperty("维修单号")
+    private String billNo; // 维修单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    private String vinNo;
+    private String vehMark;
+    @ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+
+    @ApiModelProperty("当前组织全路径sid")
+    private String orgPath;
+    private String createBySid;
+    private String deptSid;
+    @ApiModelProperty("应收款项sid")
+    private String[] sids; // 应收款项sid
+
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.AppFinCollectionConfirmationInitRskVo;
 import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
@@ -191,4 +192,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     LoanFinBank selectByBanks(String saleOrderSid);
 
     List<String> selectSids(String busVehSid);
-}
+
+    IPage<AsFinCollectionConfirmationVo> asListPagess(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<FinCollectionConfirmation> qw);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -494,4 +494,13 @@
                            ON fs.receivablesSid = fu.sid
         WHERE fu.busVinSid = #{busVehSid}
     </select>
-</mapper>
+    <select id="asListPagess"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo">
+        SELECT *
+        FROM fin_collection_confirmation
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by id desc
+    </select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -29,6 +29,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationQuery;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.AsFinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
@@ -137,6 +141,24 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
         return finCollectionConfirmationService.selectSids(busVehSid);
     }
 
+    //---------------------------售后认款----------------------
+    @Override
+    public ResultBean asSave(AsFinCollectionConfirmationDto dto) {
+        return finCollectionConfirmationService.asSave(dto);
+    }
+
+    @Override
+    public ResultBean<AsFinCollectionConfirmationDetailsVo> asFetchBySid(String sid) {
+        return finCollectionConfirmationService.asFetchBySid(sid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<AsFinCollectionConfirmationVo>> asListPagess(PagerQuery<AsFinCollectionConfirmationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsFinCollectionConfirmationVo> pv = finCollectionConfirmationService.asListPagess(pq);
+        return rb.success().setData(pv);
+    }
+
     //------------------------金融认款申请-----------------------------------
     @Override
     public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -56,6 +56,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.as.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
@@ -78,6 +79,8 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
 import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
+import com.yxt.anrui.fin.fegin.as.asbusrepairbill.AsBusrepairBillFeign;
+import com.yxt.anrui.fin.fegin.as.asbusrepairbill.FinBusrepairBillVo;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -222,6 +225,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private LoanRepaymentScheduleFeign loanRepaymentScheduleFeign;
     @Autowired
     private LoanSettleApplyFeign loanSettleApplyFeign;
+    @Autowired
+    private AsBusrepairBillFeign asBusrepairBillFeign;
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -449,6 +454,121 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success();
     }
 
+    public ResultBean asSave(AsFinCollectionConfirmationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = "";
+        //首次认款
+        List<AsFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
+        BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AsFinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) {
+            return rb.setMsg("认款总额与收款金额不符");
+        }
+        List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+        List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+        if (finSelectedReceivablesDetailedDtos.size() > 0) {
+            for (AsFinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) {
+                if (StringUtils.isBlank(v.getSubscriptionMoney())) {
+                    return rb.setMsg("认款金额不允许为空");
+                }
+            }
+        }
+        List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList());
+        stringList.removeAll(Collections.singleton(null));
+        if (!stringList.isEmpty()) {
+            List<String> stringList1 = stringList.stream().distinct().collect(Collectors.toList());
+            if (stringList.size() != stringList1.size()) {
+                return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
+            }
+        }
+        //根据用户sid查询分公司sid
+        String useOrgSid = "";
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        } else {
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }
+        //对收款申请进行赋值操作
+        FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
+        BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+        finCollectionConfirmation.setSource("03");
+        String orgPath = dto.getOrgPath();
+        finCollectionConfirmation.setOrgSidPath(orgPath);
+        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
+        if (sysOrganizationVoResultBean.getData() != null) {
+            finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
+        }
+        sid = finCollectionConfirmation.getSid();
+        finCollectionConfirmation.setCreateBySid(dto.getUserSid());
+        finCollectionConfirmation.setUseOrgSid(useOrgSid);
+        //附件保存:打款凭证附件
+        paymentVoucherAppendixs.stream().forEach(v -> {
+            CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+            BeanUtil.copyProperties(v, commonAppendixDto);
+            String s = commonAppendixDto.getFilePath();
+            if (s.contains(fileUploadComponent.getUrlPrefix())) {
+                s = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
+            commonAppendixDto.setFilePath(s);
+            commonAppendixDto.setCreateBySid(dto.getUserSid());
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        });
+        String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+        finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
+        //汇款确认书附件保存
+        remittanceConfirmationAppendixs.stream().forEach(v -> {
+            CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+            BeanUtil.copyProperties(v, commonAppendixDto);
+            String s = commonAppendixDto.getFilePath();
+            if (s.contains(fileUploadComponent.getUrlPrefix())) {
+                s = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
+            commonAppendixDto.setFilePath(s);
+            commonAppendixDto.setCreateBySid(dto.getUserSid());
+            commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
+            commonAppendixFeign.save(commonAppendixDto);
+        });
+        String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+        finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+        if (finSelectedReceivablesDetailedDtos.size() > 0) {
+            //认款明细保存
+            String finalSid = sid;
+            String finalUseOrgSid = useOrgSid;
+            finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+                BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
+                finSelectedReceivablesDetailed.setCollSid(finalSid);
+                finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid);
+                //设置审核状态为待审核(1待审核/2已驳回/3已审核)
+                finSelectedReceivablesDetailed.setAuditState(1);
+                finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
+                //认款日期默认为当天的日期
+                finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
+                finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
+                finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
+                finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
+                if (v.getSubscribedOf() == 0) {
+                    //应收未收减去相应的认款
+                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                    BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
+                    finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                    finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                }
+            });
+        }
+        finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
+        finCollectionConfirmation.setAuditState(1);
+        //1未认款/2部分认款/3已认款
+        finCollectionConfirmation.setPaymentState(1);
+        //添加单据编号
+        String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
+        finCollectionConfirmation.setBillNo(billNo);
+        baseMapper.insert(finCollectionConfirmation);
+        return rb.success().setMsg("添加成功");
+    }
+
     public ResultBean saveAllDto(FinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -641,6 +761,74 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success().setMsg("添加成功");
     }
 
+    public ResultBean<AsFinCollectionConfirmationDetailsVo> asFetchBySid(String sid) {
+        ResultBean<AsFinCollectionConfirmationDetailsVo> rb = ResultBean.fireFail();
+        AsFinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new AsFinCollectionConfirmationDetailsVo();
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
+        BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
+
+        List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
+        List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
+        CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(sid);
+        //打款凭证附件
+        commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+        ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
+        if (listResultBean.getSuccess()) {
+            for (CommonAppendixVo commonApp : listResultBean.getData()) {
+                FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
+                //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
+                BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
+                paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
+            }
+        }
+        finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
+        commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(sid);
+        //汇款确认书附件
+        commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
+        listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
+        if (listResultBean.getSuccess()) {
+            for (CommonAppendixVo commonApp : listResultBean.getData()) {
+                FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
+                //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
+                BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
+                remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
+            }
+        }
+        finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
+        List<AsFinSelectedReceivablesDetailedVo> list = new ArrayList<>();
+        if (!finSelectedReceivablesDetailedVos.isEmpty()) {
+            for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
+                AsFinSelectedReceivablesDetailedVo vo = new AsFinSelectedReceivablesDetailedVo();
+                BeanUtil.copyProperties(finSelectedReceivablesDetailedVo, vo);
+                if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getContractSid())) {
+                    String asBillSid = finSelectedReceivablesDetailedVo.getContractSid(); // 售后维修单sid
+                    FinBusrepairBillVo busrepairBillVo = asBusrepairBillFeign.fetchVehMarkAndTypeBySid(asBillSid);
+                    if (null != busrepairBillVo) {
+                        if (StringUtils.isNotBlank(busrepairBillVo.getBillType())) {
+                            vo.setBillType(busrepairBillVo.getBillType());
+                        }
+                        if (StringUtils.isNotBlank(busrepairBillVo.getVehMark())) {
+                            vo.setVehMark(busrepairBillVo.getVehMark());
+                        }
+                    }
+                }
+                list.add(vo);
+            }
+        }
+        finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(list);
+        if (finCollectionConfirmation.getAuditState() == 2) {
+            String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason();
+            finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
+        } else if (finCollectionConfirmation.getAuditState() == 3) {
+            String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认";
+            finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
+        }
+        return rb.success().setData(finCollectionConfirmationDetailsVo);
+    }
+
     public ResultBean<FinCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo();
@@ -3977,7 +4165,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                             }
                                         }
                                     }
-                                } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0){
+                                } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
                                     try {
                                         Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
                                         historyEntity.setActualDate(collDate);
@@ -4181,7 +4369,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
         if (null != planDetails) {
-            ResultBean<SettleFinVo> finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(),v.getSubscriptionMoney());
+            ResultBean<SettleFinVo> finSettleVo = loanSettleApplyFeign.getFinSettleVo(planDetails.getBusVinSid(), v.getReceivablesName(), v.getSubscriptionMoney());
             if (finSettleVo.getSuccess()) {
                 SettleFinVo finVo = finSettleVo.getData();
                 voucherDetail.setPayCostTitleValue(v.getReceivablesName());
@@ -5571,4 +5759,83 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         List<String> sids = baseMapper.selectSids(busVehSid);
         return rb.success().setData(sids);
     }
+
+
+    public PagerVo<AsFinCollectionConfirmationVo> asListPagess(PagerQuery<AsFinCollectionConfirmationQuery> pq) {
+        AsFinCollectionConfirmationQuery query = pq.getParams();
+        QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
+
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("createBySid", query.getUserSid());
+            } else {
+                PagerVo<AsFinCollectionConfirmationVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<AsFinCollectionConfirmationVo> p = new PagerVo<>();
+            return p;
+        }
+        String collectionStartDate = query.getCollectionStartDate();
+        String collectionEndDate = query.getCollectionEndDate();
+        qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+                );
+        String createStartDate = query.getCreateStartDate();
+        String createEndDate = query.getCreateEndDate();
+        qw.apply(StringUtils.isNotEmpty(createStartDate), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndDate), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getCollectionBank())) {
+            qw.eq("collectionBankKey", query.getCollectionBank());
+        }
+        if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+            qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getSubscriptionState())) {
+            qw.eq("paymentState", query.getSubscriptionState());
+        }
+        if (StringUtils.isNotBlank(query.getPayerName())) {
+            qw.like("payerName", query.getPayerName());
+        }
+        if (StringUtils.isNotBlank(query.getCreateDept())) {
+            qw.like("createDept", query.getCreateDept());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getCollectionMoney())) {
+            qw.eq("collectionMoney", query.getCollectionMoney());
+        }
+        qw.eq("source","03");
+        IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
+        IPage<AsFinCollectionConfirmationVo> pagging = baseMapper.asListPagess(page, qw);
+        PagerVo<AsFinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -142,4 +143,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<CustomerBillSummaryVo> exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
 
     List<CustomerBillSummaryExportVo> selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo);
+
+    List<AsDetailsOfReceivablesAndUncollectedItemsVo> asListAll(@Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -1051,4 +1051,41 @@
         WHERE
             m.collectionMoney != 0
     </select>
+    <select id="asListAll"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo">
+select * from
+(SELECT
+        d.sid AS sid,
+        d.sid as receivablesSid,
+        d.staffDeptSid as staffDeptSid,
+        d.receivablesName,
+        d.contractNo AS billNo,
+        d.VIN,
+        d.customerSid,
+        d.contractSid,
+        d.contractNo,
+        d.customerName,
+        d.customerPhone,
+        d.reveivableMoney - IFNULL(((
+                SELECT
+                    SUM( IFNULL( se.subscriptionMoney, 0 ) )
+                FROM
+                    fin_selected_receivables_detailed AS se
+                WHERE
+                    se.receivablesSid = d.sid
+                  AND se.auditState != '2' and se.auditState != '4'
+                )),
+        0
+        ) AS currentReceivableMoney,
+        d.reveivableMoney,
+            a.billType,
+        v.vehMark
+        FROM
+                fin_uncollected_receivables_detailed AS d
+                LEFT JOIN yxt_4sas.as_busrepair_bill AS a ON d.contractSid = a.sid
+                LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON v.billSid = a.sid ) furd
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -73,6 +75,13 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return rb.success().setData(list);
     }
 
+    @Override
+    public ResultBean<List<AsDetailsOfReceivablesAndUncollectedItemsVo>> asListAll(AsFinUncollectedReceivablesDetailedQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AsDetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.asListAll(query);
+        return rb.success().setData(list);
+    }
+
     @Override
     @ApiOperation("新增或修改保存")
     @PostMapping("/saveOrUpdate")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -42,6 +42,8 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardA
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
@@ -252,6 +254,51 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         return list;
     }
 
+
+    /**
+     * 售后应收未收列表
+     * @param query
+     * @return
+     */
+    public List<AsDetailsOfReceivablesAndUncollectedItemsVo> asListAll(AsFinUncollectedReceivablesDetailedQuery query) {
+        QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getDeptSid())) {
+            qw.eq("furd.staffDeptSid", query.getDeptSid());
+        }
+//        qw.eq("furd.createBySid", query.getCreateBySid());
+        String[] sids = query.getSids();
+        if (sids != null) {
+            for (String sid : sids) {
+                if (StringUtils.isNotBlank(sid)) {
+                    qw.ne("furd.sid", sid);
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("furd.billNo", query.getBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("furd.vehMark", query.getVehMark());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("furd.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("furd.VIN", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerPhone())) {
+            qw.like("furd.customerPhone", query.getCustomerPhone());
+        }
+        qw.apply("furd.currentReceivableMoney > 0");
+        qw.apply("(furd.receivablesName = '材料费' OR furd.receivablesName = '工时费' OR furd.receivablesName = '其他费用')");
+        qw.orderBy(true, true, "furd.contractNo")
+                .orderBy(true, true, "furd.VIN")
+                .orderBy(true, true, "furd.receivablesName")
+        ;
+        List<AsDetailsOfReceivablesAndUncollectedItemsVo> list = baseMapper.asListAll(qw);
+        return list;
+    }
+
     public ResultBean saveOrUpdateDto(FinUncollectedReceivablesDetailedDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -1383,4 +1430,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
         return list;
     }
+
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/AsBusrepairBillFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.fegin.as.asbusrepairbill;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+        contextId = "yxt-as-AsBusrepairBill",
+        name = "yxt-as",
+        path = "v1/AsBusrepairBill")
+public interface AsBusrepairBillFeign {
+
+    @ApiOperation("获取维修单车牌号和单据类型")
+    @GetMapping("/fetchVehMarkAndTypeBySid")
+    public FinBusrepairBillVo fetchVehMarkAndTypeBySid(@RequestParam("sid") String sid);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/fegin/as/asbusrepairbill/FinBusrepairBillVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.fin.fegin.as.asbusrepairbill;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 17:33
+ */
+@Data
+public class FinBusrepairBillVo {
+
+    private String billType;
+    private String vehMark;
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -176,7 +176,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
     public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        dto.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(dto.getUploadDate())));
+        if (StringUtils.isNotBlank(dto.getUploadDate())){
+            dto.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(dto.getUploadDate())));
+        }
         List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
         if (StringUtils.isBlank(dtoSid)) {
             String s = this.insertByDto(dto);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.terminal.api.wms.otheroutapply;
+
+
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "售后盘盈入库")
+@FeignClient(
+        contextId = "terminal-AppOtherOutApply",
+        name = "anrui-terminal",
+        path = "v1/otheroutapply")
+public interface AppOtherOutApplyFeign {
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AppOtheroutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**********************************************流程********************************************/
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutApplyDetailsVo.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.wms.otheroutapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(其他出库) <br/>
+ * File: WmsOtheroutApplyVo.java <br/>
+ * Class: com.yxt.wms.api.wmsotheroutapply.WmsOtheroutApplyVo <br/>
+ * Description: 其他出库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-10-31 12:01:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "其他出库 视图数据详情", description = "其他出库 视图数据详情")
+public class AppOtheroutApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @ApiModelProperty("业务类型value")
+    private String busTypeValue;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("流程实例的sid")
+    private String procInsId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("明细")
+    private List<AppOtheroutDetailDetailsVo> otheroutDetailList;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtheroutDetailDetailsVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.wms.otheroutapply;
+
+
+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: yxt-wms(其他出库) <br/>
+ * File: WmsOtheroutDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsotheroutdetail.WmsOtheroutDetailVo <br/>
+ * Description: 其他出库-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-10-31 12:01:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "其他出库-明细 视图数据详情", description = "其他出库-明细 视图数据详情")
+public class AppOtheroutDetailDetailsVo implements Vo {
+
+	@ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("库位编码")
+    private String warehouseRackCode;
+    @ApiModelProperty("库位编码")
+    private String warehouseRackName;
+    @ApiModelProperty("入库单价")
+    private BigDecimal inCost;
+    @ApiModelProperty("出库数量")
+    private BigDecimal outCount;
+    @ApiModelProperty("出库金额")
+    private BigDecimal amount;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/flowable/AppDelegateQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.wms.otheroutapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 10:16
+ */
+@Data
+public class AppDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/flowable/AppFlowDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.wms.otheroutapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:09
+ * @Description
+ */
+@Data
+public class AppFlowDto implements Dto {
+    private static final long serialVersionUID = 3626473483180150495L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/flowable/AppFlowQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.wms.otheroutapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:15
+ * @Description
+ */
+@Data
+public class AppFlowQuery implements Query {
+    private static final long serialVersionUID = 5514095179438249641L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/flowable/AppFlowTaskQuery.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.terminal.api.wms.otheroutapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:11
+ * @Description
+ */
+@Data
+public class AppFlowTaskQuery implements Query {
+    private static final long serialVersionUID = -7082170710942810289L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply","com.yxt.anrui.terminal.fegin.wmsotheroutapply"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyRest.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.wms.otheroutapply;
+
+import com.yxt.anrui.terminal.api.wms.otheroutapply.AppOtherOutApplyFeign;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.AppOtheroutApplyDetailsVo;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.*;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("v1/otheroutapply")
+public class AppOtherOutApplyRest implements AppOtherOutApplyFeign {
+
+    @Autowired
+    private AppOtherOutApplyService appOtherOutApplyService;
+
+    @Override
+    public ResultBean<AppOtheroutApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return appOtherOutApplyService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        return appOtherOutApplyService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        return appOtherOutApplyService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        return appOtherOutApplyService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        return appOtherOutApplyService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        return appOtherOutApplyService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        return appOtherOutApplyService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        return appOtherOutApplyService.assignTask(delegateQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/otheroutapply/AppOtherOutApplyService.java

@@ -0,0 +1,174 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.wms.otheroutapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.AppOtheroutApplyDetailsVo;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.AppOtheroutDetailDetailsVo;
+import com.yxt.anrui.terminal.api.wms.otheroutapply.flowable.*;
+import com.yxt.anrui.terminal.fegin.wmsotheroutapply.WmsOtherOutApplyFeign;
+import com.yxt.anrui.terminal.fegin.wmsotheroutapply.WmsOtheroutApplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.wmsotheroutapply.WmsOtheroutDetailDetailsVo;
+import com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable.*;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AppOtherOutApplyService {
+
+    @Resource
+    private WmsOtherOutApplyFeign wmsOtherOutApplyFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    public ResultBean<AppOtheroutApplyDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsOtheroutApplyDetailsVo data = wmsOtherOutApplyFeign.fetchDetailsBySid(sid).getData();
+        AppOtheroutApplyDetailsVo appOtheroutApplyDetailsVo = new AppOtheroutApplyDetailsVo();
+        BeanUtil.copyProperties(data,appOtheroutApplyDetailsVo);
+        List<AppOtheroutDetailDetailsVo> otheroutDetailList = appOtheroutApplyDetailsVo.getOtheroutDetailList();
+        for (AppOtheroutDetailDetailsVo appOtheroutDetailDetailsVo : otheroutDetailList) {
+            appOtheroutDetailDetailsVo.setWarehouseRackName(appOtheroutDetailDetailsVo.getWarehouseRackCode());
+            appOtheroutDetailDetailsVo.setAmount(appOtheroutDetailDetailsVo.getOutCount().multiply(appOtheroutDetailDetailsVo.getInCost()));
+        }
+        return rb.success().setData(appOtheroutApplyDetailsVo);
+    }
+
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        CompleteOtheroutDto completeOtheroutDto = new CompleteOtheroutDto();
+        BeanUtil.copyProperties(dto, completeOtheroutDto);
+        completeOtheroutDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = wmsOtherOutApplyFeign.complete(completeOtheroutDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OtheroutTaskQuery otheroutTaskQuery = new OtheroutTaskQuery();
+        BeanUtil.copyProperties(query, otheroutTaskQuery);
+        ResultBean resultBean = wmsOtherOutApplyFeign.taskReject(otheroutTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OtheroutTaskQuery otheroutTaskQuery = new OtheroutTaskQuery();
+        BeanUtil.copyProperties(query, otheroutTaskQuery);
+        ResultBean resultBean = wmsOtherOutApplyFeign.revokeProcess(otheroutTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OtheroutTaskQuery otheroutTaskQuery = new OtheroutTaskQuery();
+        BeanUtil.copyProperties(query, otheroutTaskQuery);
+        ResultBean resultBean = wmsOtherOutApplyFeign.breakProcess(otheroutTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        OtheroutNodeQuery getNodeQuery = new OtheroutNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<OtheroutNodeVo>> getPreviousNodesForReject = wmsOtherOutApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<OtheroutNodeVo>> getNextNodesForSubmit = wmsOtherOutApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        OtheroutDelegateQuery delegateQuery1 = new
+                OtheroutDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        wmsOtherOutApplyFeign.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        OtheroutDelegateQuery delegateQuery1 = new
+                OtheroutDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        wmsOtherOutApplyFeign.assignTask(delegateQuery1);
+        return rb.success();
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/WmsOtherOutApplyFeign.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply;
+
+import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.WmsInventoryProfitinDetailsVo;
+import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable.*;
+import com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable.*;
+import com.yxt.anrui.terminal.fegin.wmswarehouserack.WmsHouseInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@FeignClient(
+        contextId = "terminal-WmsOtherOutApply",
+        name = "yxt-wms",
+        path = "v1/wmsotheroutapply")
+public interface WmsOtherOutApplyFeign {
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<WmsOtheroutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteOtheroutDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<OtheroutNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap OtheroutNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<OtheroutNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap OtheroutNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody OtheroutTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody OtheroutTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody OtheroutTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody OtheroutDelegateQuery query);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody OtheroutDelegateQuery query);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/WmsOtheroutApplyDetailsVo.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(其他出库) <br/>
+ * File: WmsOtheroutApplyVo.java <br/>
+ * Class: com.yxt.wms.api.wmsotheroutapply.WmsOtheroutApplyVo <br/>
+ * Description: 其他出库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-10-31 12:01:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "其他出库 视图数据详情", description = "其他出库 视图数据详情")
+public class WmsOtheroutApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+	@ApiModelProperty("业务类型key")
+    private String busTypeKey; // 业务类型key
+	@ApiModelProperty("业务类型value")
+    private String busTypeValue; // 业务类型value
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("明细")
+    private List<WmsOtheroutDetailDetailsVo> otheroutDetailList;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/WmsOtheroutDetailDetailsVo.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply;
+
+
+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: yxt-wms(其他出库) <br/>
+ * File: WmsOtheroutDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsotheroutdetail.WmsOtheroutDetailVo <br/>
+ * Description: 其他出库-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-10-31 12:01:51 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "其他出库-明细 视图数据详情", description = "其他出库-明细 视图数据详情")
+public class WmsOtheroutDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+	@ApiModelProperty("商品spuSid")
+    private String goodsSpuSid; // 商品spuSid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skuSid")
+    private String goodsSkuSid; // 商品skuSid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@ApiModelProperty("厂家sid")
+    private String manufacturerSid; // 厂家sid
+	@ApiModelProperty("厂家名称")
+    private String manufacturerName; // 厂家名称
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("库位编码")
+    private String warehouseRackCode;
+	@ApiModelProperty("入库单价")
+    private BigDecimal inCost; // 入库单价
+	@ApiModelProperty("出库数量")
+    private BigDecimal outCount; // 出库数量
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/flowable/CompleteOtheroutDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteOtheroutDto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/flowable/OtheroutDelegateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OtheroutDelegateQuery {
+
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/flowable/OtheroutNodeQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OtheroutNodeQuery {
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/flowable/OtheroutNodeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OtheroutNodeVo {
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsotheroutapply/flowable/OtheroutTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.fegin.wmsotheroutapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class OtheroutTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/FinBusrepairBillVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/11/18 17:33
+ */
+@Data
+public class FinBusrepairBillVo {
+
+    private String billType;
+    private String vehMark;
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -131,6 +131,14 @@ public class AsBusrepairBillRest {
     public ResultBean<AsBusrepairBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         return asBusrepairBillService.fetchDetailsBySid(sid);
     }
+
+    @ApiOperation("获取维修单车牌号和单据类型")
+    @GetMapping("/fetchVehMarkAndTypeBySid")
+    public FinBusrepairBillVo fetchVehMarkAndTypeBySid(@RequestParam("sid") String sid) {
+        return asBusrepairBillService.fetchVehMarkAndTypeBySid(sid);
+    }
+
+
     @ApiOperation("获取维修单开票信息")
     @GetMapping("/fetchInvoiceBySid")
     public AsBusrepairBillInvoice fetchInvoiceBySid(@RequestParam("sid") String sid) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1554,6 +1554,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                             finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
                             finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
                             finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
+                            finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
                             AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
                             if (null != billVech) {
                                 if (StringUtils.isNotBlank(billVech.getVinNo())) {
@@ -1561,6 +1562,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                                     finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
                                 }
                             }
+                            finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
+                            finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
                             finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
                             finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
                             finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
@@ -1580,6 +1583,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                             finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
                             finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
                             finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
+                            finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
                             AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
                             if (null != billVech) {
                                 if (StringUtils.isNotBlank(billVech.getVinNo())) {
@@ -1587,6 +1591,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                                     finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
                                 }
                             }
+                            finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
+                            finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
                             finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
                             finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
                             finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
@@ -1598,6 +1604,50 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                             finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
                         }
                     }
+                    BigDecimal addAmount = BigDecimal.ZERO;
+                    BigDecimal outAmount = BigDecimal.ZERO;
+                    BigDecimal subsidyAmount = BigDecimal.ZERO;
+                    BigDecimal rescueAmount = BigDecimal.ZERO;
+                    if (null != asBusrepairBill.getAddAmount()) {
+                        addAmount = asBusrepairBill.getAddAmount();
+                    }
+                    if (null != asBusrepairBill.getOutAmount()) {
+                        outAmount = asBusrepairBill.getOutAmount();
+                    }
+                    if (null != asBusrepairBill.getSubsidyAmount()) {
+                        subsidyAmount = asBusrepairBill.getSubsidyAmount();
+                    }
+                    if (null != asBusrepairBill.getRescueAmount()) {
+                        rescueAmount = asBusrepairBill.getRescueAmount();
+                    }
+                    BigDecimal otherAmountAll = addAmount.add(outAmount).add(subsidyAmount).add(rescueAmount);
+                    if (otherAmountAll.compareTo(BigDecimal.ZERO) > 0) {
+                            FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
+                            finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
+                            finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
+                            finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
+                            finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
+                            finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
+                            finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
+                            AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
+                            if (null != billVech) {
+                                if (StringUtils.isNotBlank(billVech.getVinNo())) {
+                                    finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo());
+                                    finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
+                                }
+                            }
+                            finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
+                            finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
+                            finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
+                            finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
+                            finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
+                            finUncollectedReceivablesDetailedDto.setReceivablesName("其他费用");
+                            finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(otherAmountAll.toString());
+                            finUncollectedReceivablesDetailedDto.setReveivableMoney(otherAmountAll.toString());
+                            finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
+                            finUncollectedReceivablesDetailedDto.setKxState("01");
+                            finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
+                    }
                 }
                 asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
                 asBusrepairBill.setNodeCode(6);
@@ -3004,4 +3054,19 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         PagerVo<BusinessDetailsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public FinBusrepairBillVo fetchVehMarkAndTypeBySid(String sid) {
+        FinBusrepairBillVo vo = new FinBusrepairBillVo();
+        AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+        if (null != asBusrepairBill) {
+            vo.setBillType(asBusrepairBill.getBillType());
+        }
+        AsBusrepairBillVech vech = asBusrepairBillVechService.fetchByBillSid(sid);
+        if (null != vech) {
+            if (StringUtils.isNotBlank(vech.getVehMark())) {
+                vo.setVehMark(vech.getVehMark());
+            }
+        }
+        return vo;
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java

@@ -45,4 +45,4 @@ public class AsBusrepairBillInvoiceService extends MybatisBaseService<AsBusrepai
         baseMapper.delByBillSid(billSid);
     }
 
-}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asstandrecordapply/AsStandRecordApplyService.java

@@ -392,7 +392,7 @@ public class AsStandRecordApplyService extends MybatisBaseService<AsStandRecordA
 				return rb.setMsg("参数错误：instanceId");
 			}
 			bv.setTaskId(AsStandRecordApply.getTaskId());
-			bv.setTaskDefKey(AsStandRecordApply.getNodeSid());
+			bv.setTaskDefKey(AsStandRecordApply.getNodeId());
 			bv.setComment("重新提交");
 			bv.setInstanceId(dto.getInstanceId());
 			return complete(bv);