Merge remote-tracking branch 'origin/master'

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

@@ -5635,6 +5635,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     scmPurchaseChannelPush.setNum(busSalesOrderPrice.getQuantity().toString());
                     scmPurchaseChannelPush.setBusinessType(busSalesOrder.getPayType());
                     scmPurchaseChannelPush.setBusinessTypeKey(busSalesOrder.getPayTypeKey());
+                    scmPurchaseChannelPush.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                    scmPurchaseChannelPush.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
                     scmPurchaseChannelFeign.push(scmPurchaseChannelPush);
                 }
                 //------------设置办结日期----------------------------------

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java

@@ -73,6 +73,10 @@ public class ScmPurchaseChannel extends BaseEntity {
     private String purchaseOrderTypeKey;
     @ApiModelProperty("采购渠道value")
     private String purchaseOrderTypeValue;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
     @ApiModelProperty("操作人sid")
     private String operateSid;
     @ApiModelProperty("操作人")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDetailsVo.java

@@ -73,5 +73,8 @@ public class ScmPurchaseChannelDetailsVo implements Vo {
     private String purchaseOrderTypeKey; // 采购渠道key
 	@ApiModelProperty("采购渠道value")
     private String purchaseOrderTypeValue; // 采购渠道value
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java

@@ -45,6 +45,10 @@ public class ScmPurchaseChannelDto implements Dto {
     private String purchaseOrderTypeKey;
     @ApiModelProperty("采购渠道value")
     private String purchaseOrderTypeValue;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java

@@ -68,6 +68,11 @@ public interface ScmPurchaseChannelFeign {
     @ResponseBody
     public ResultBean choice(@RequestBody List<ScmPurchaseChannelDto> dto);
 
+    @ApiOperation("作废")
+    @PostMapping("/cancel")
+    @ResponseBody
+    public ResultBean cancel(@RequestBody String[] sids);
+
     @ApiOperation("销售订单推送待选择采购渠道")
     @PostMapping("/push")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java

@@ -62,6 +62,11 @@ public class ScmPurchaseChannelFeignFallback implements ScmPurchaseChannelFeign
         return null;
     }
 
+    @Override
+    public ResultBean cancel(String[] sids) {
+        return null;
+    }
+
     @Override
     public ResultBean push(ScmPurchaseChannelPush dto) {
         return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelPush.java

@@ -48,4 +48,8 @@ public class ScmPurchaseChannelPush implements Dto {
     private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelQuery.java

@@ -55,5 +55,5 @@ public class ScmPurchaseChannelQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("待/已选择")
-    private String state; // 待/已选择(1待选择，2已选择)
+    private String state; // 待/已选择(1待选择，2已选择，3已作废)
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java

@@ -37,6 +37,8 @@ public class ScmPurchaseChannelVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("状态")
+    private String state;
     @ApiModelProperty("创建人接口")
     private String createByName;
     @ApiModelProperty("销售订单sid")
@@ -73,6 +75,10 @@ public class ScmPurchaseChannelVo implements Vo {
     private String purchaseOrderTypeKey;
     @ApiModelProperty("采购渠道value")
     private String purchaseOrderTypeValue;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
     @ApiModelProperty("流程定义id")
     private String procDefId;
     @ApiModelProperty("流程实例id")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/SendOutApplyDto.java

@@ -40,4 +40,8 @@ public class SendOutApplyDto implements Dto {
     private String userSid;
 	@ApiModelProperty("组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -48,4 +49,7 @@ public interface ScmPurchaseChannelMapper extends BaseMapper<ScmPurchaseChannel>
     List<ScmPurchaseChannelVo> selectListVo();
 
     void choice(@Param("sid") String sid, @Param("purchaseOrderTypeKey") String purchaseOrderTypeKey, @Param("purchaseOrderTypeValue") String purchaseOrderTypeValue);
+
+    @Update("update scm_purchase_channel set state = '3' where sid = #{sid}")
+    void cancel(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java

@@ -83,6 +83,11 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign {
         return scmPurchaseChannelService.choice(dto);
     }
 
+    @Override
+    public ResultBean cancel(@RequestBody String[] sids) {
+        return scmPurchaseChannelService.cancel(sids);
+    }
+
     @Override
     public ResultBean push(ScmPurchaseChannelPush dto) {
         return scmPurchaseChannelService.push(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@@ -94,7 +94,12 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
     public PagerVo<ScmPurchaseChannelVo> listPageVo(PagerQuery<ScmPurchaseChannelQuery> pq) {
         ScmPurchaseChannelQuery query = pq.getParams();
         QueryWrapper<ScmPurchaseChannel> qw = new QueryWrapper<>();
-        qw.eq("bpc.state", query.getState());
+        if (query.getState().equals("2")){
+            qw.eq("bpc.state", "2");
+            qw.eq("bpc.state", "3");
+        }else {
+            qw.eq("bpc.state", query.getState());
+        }
         qw.eq("bpc.useOrgSid", query.getUseOrgSid());
         String saleOrderApproStartDate = query.getSaleOrderApproStartDate();
         String saleOrderApproEndDate = query.getSaleOrderApproEndDate();
@@ -176,6 +181,8 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
                 sendOutApplyDto.setSid(scmPurchaseChannelDto.getSid());
                 sendOutApplyDto.setUserSid(scmPurchaseChannelDto.getUserSid());
                 sendOutApplyDto.setOrgSidPath(scmPurchaseChannelDto.getOrgSidPath());
+                sendOutApplyDto.setPurchaseSystemSid(scmPurchaseChannelDto.getPurchaseSystemSid());
+                sendOutApplyDto.setPurchaseSystemName(scmPurchaseChannelDto.getPurchaseSystemName());
                 sendOutApply(sendOutApplyDto);
             } else if ("001".equals(scmPurchaseChannelDto.getPurchaseOrderTypeKey()) || "004".equals(scmPurchaseChannelDto.getPurchaseOrderTypeKey())) {
                 pushApply(scmPurchaseChannelDto);
@@ -217,8 +224,8 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
             busApplyPushDto.setCreateOrgName(scmPurchaseChannel.getUseOrgName());
             busApplyPushDto.setApplyType(scmPurchaseChannel.getPurchaseOrderTypeValue());
             busApplyPushDto.setApplyTypeKey(scmPurchaseChannel.getPurchaseOrderTypeKey());
-            busApplyPushDto.setOrgDeptName(busSalesOrder.getPurchaseSystemName());
+            busApplyPushDto.setOrgDeptName(dto.getPurchaseSystemName());
-            busApplyPushDto.setOrgDeptSid(busSalesOrder.getPurchaseSystemSid());
+            busApplyPushDto.setOrgDeptSid(dto.getPurchaseSystemSid());
             busApplyPushDto.setCarBrandSid(busSalesOrderModel.getBrandSid());
             busApplyPushDto.setCarBrandName(busSalesOrderModel.getBrandName());
             busApplyPushDto.setOrgSidPath(dto.getOrgSidPath());
@@ -271,10 +278,20 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         receiveSaveDto.setOrgPath(dto.getOrgSidPath());
         receiveSaveDto.setSaleOrderSid(scmPurchaseChannel.getSaleOrderSid());
         receiveSaveDto.setStaffSid(sysUserVo.getStaffSid());
+        receiveSaveDto.setPurchaseSystemSid(dto.getPurchaseSystemSid());
+        receiveSaveDto.setPurchaseSystemName(dto.getPurchaseSystemName());
         ResultBean resultBean = baseOutsourcingApplicationFeign.receiveSave(receiveSaveDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         return rb.success();
     }
+
+    public ResultBean cancel(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            baseMapper.cancel(sid);
+        }
+        return rb.success();
+    }
 }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -658,8 +659,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             orgName = sysOrganizationVo.getName();
         }
         String vinNo = dto.getVin();
-        int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
+        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, orgSid).getData();
-        if (countByVinNo > 0) {
+        if (baseVehicle != null) {
             return rb.setMsg("该车架号已存在，请勿重复验车！");
         }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandle.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle <br/>
+ * Description: 处理旧件列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "处理旧件列表", description = "处理旧件列表")
+@TableName("as_oldparthandle")
+public class AsOldparthandle extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("商品ID")
+    private String goodsSkuId; // 商品ID
+	@ApiModelProperty("商品名称")
+    private String goodsSkuName; // 商品名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂家")
+    private String manufacturerName; // 厂家
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@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 count; // 数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandle;
+
+
+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-as(旧件处理申请) <br/>
+ * File: AsOldparthandleVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
+ * Description: 处理旧件列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
+public class AsOldparthandleDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("商品ID")
+    private String goodsSkuId; // 商品ID
+	@ApiModelProperty("商品名称")
+    private String goodsSkuName; // 商品名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂家")
+    private String manufacturerName; // 厂家
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@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 count; // 数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto <br/>
+ * Description: 处理旧件列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象")
+public class AsOldparthandleDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("商品ID")
+    private String goodsSkuId; // 商品ID
+	@ApiModelProperty("商品名称")
+    private String goodsSkuName; // 商品名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂家")
+    private String manufacturerName; // 厂家
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@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 count; // 数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandle;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery <br/>
+ * Description: 处理旧件列表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "处理旧件列表 查询条件", description = "处理旧件列表 查询条件")
+public class AsOldparthandleQuery implements Query {
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("商品ID")
+    private String goodsSkuId; // 商品ID
+	@ApiModelProperty("商品名称")
+    private String goodsSkuName; // 商品名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂家")
+    private String manufacturerName; // 厂家
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@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 count; // 数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandle;
+
+
+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-as(旧件处理申请) <br/>
+ * File: AsOldparthandleVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
+ * Description: 处理旧件列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "处理旧件列表 视图数据对象", description = "处理旧件列表 视图数据对象")
+public class AsOldparthandleVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("商品ID")
+    private String goodsSkuId; // 商品ID
+	@ApiModelProperty("商品名称")
+    private String goodsSkuName; // 商品名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂家")
+    private String manufacturerName; // 厂家
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@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 count; // 数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandleapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApply.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply <br/>
+ * Description: 旧件处理申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件处理申请", description = "旧件处理申请")
+@TableName("as_oldparthandle_apply")
+public class AsOldparthandleApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("处理原因key")
+    private String handleReasonKey; // 处理原因key
+	@ApiModelProperty("处理原因value")
+    private String handleReasonValue; // 处理原因value
+	@ApiModelProperty("处理方式key")
+    private String handleModeKey; // 处理方式key
+	@ApiModelProperty("处理方式value")
+    private String handleModeValue; // 处理方式value
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandleapply;
+
+
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
+ * Description: 旧件处理申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
+public class AsOldparthandleApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("处理原因key")
+    private String handleReasonKey; // 处理原因key
+	@ApiModelProperty("处理原因value")
+    private String handleReasonValue; // 处理原因value
+	@ApiModelProperty("处理方式key")
+    private String handleModeKey; // 处理方式key
+	@ApiModelProperty("处理方式value")
+    private String handleModeValue; // 处理方式value
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("待处理旧件列表")
+    private List<AsOldparthandleDetailsVo> asOldparthandleList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandleapply;
+
+
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto <br/>
+ * Description: 旧件处理申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象")
+public class AsOldparthandleApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("发起部门sid")
+    private String createDeptSid; // 发起部门sid
+	@ApiModelProperty("发起部门名称")
+    private String createDeptName; // 发起部门名称
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("处理原因key")
+    private String handleReasonKey; // 处理原因key
+	@ApiModelProperty("处理原因value")
+    private String handleReasonValue; // 处理原因value
+	@ApiModelProperty("处理方式key")
+    private String handleModeKey; // 处理方式key
+	@ApiModelProperty("处理方式value")
+    private String handleModeValue; // 处理方式value
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@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 HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("待处理旧件列表")
+    private List<AsOldparthandleDto> asOldparthandleList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandleapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery <br/>
+ * Description: 旧件处理申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件")
+public class AsOldparthandleApplyQuery implements Query {
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("申请开始日期")
+    private String createStartTime;
+    @ApiModelProperty("申请结束日期")
+    private String createEndTime;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("处理原因key")
+    private String handleReasonKey;
+    @ApiModelProperty("处理方式key")
+    private String handleModeKey;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldparthandleapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
+ * Description: 旧件处理申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象")
+public class AsOldparthandleApplyVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("发起部门名称")
+    private String createDeptName;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
+    private Date finishTime;
+    @ApiModelProperty("处理原因value")
+    private String handleReasonValue;
+    @ApiModelProperty("处理方式value")
+    private String handleModeValue;
+	@ApiModelProperty("流程定义的id")
+    private String procDefId;
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/AsOldparthandleApplyCompleteDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 14:57
+ * @Description
+ */
+@Data
+public class AsOldparthandleApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 6378752532534735663L;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id(PC)")
+    private String instanceId;
+    @ApiModelProperty(value = "流程id(移动)")
+    private String procInsId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+
+    private String orgPath;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/AsOldparthandleApplyDelegateQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 9:28
+ */
+@Data
+public class AsOldparthandleApplyDelegateQuery {
+    @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;
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/AsOldparthandleApplyNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:04
+ * @Description
+ */
+@Data
+public class AsOldparthandleApplyNodeQuery implements Query {
+    private static final long serialVersionUID = 9117613683840483366L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    private Integer next;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/AsOldparthandleApplyNodeVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:03
+ * @Description
+ */
+@Data
+public class AsOldparthandleApplyNodeVo implements Vo {
+    private static final long serialVersionUID = -833419512294877848L;
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/AsOldparthandleApplyTaskQuery.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:06
+ * @Description
+ */
+@Data
+public class AsOldparthandleApplyTaskQuery implements Query {
+    private static final long serialVersionUID = 1288615499873178778L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @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(PC)")
+    private String instanceId;
+
+    @ApiModelProperty("流程实例Id(移动)")
+    private String procInsId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/flowable/SubmitAsOldparthandleApplyDto.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.as.api.asoldparthandleapply.flowable;
+
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
+import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description
+ * @date 2022/04/13
+ */
+@ApiModel("提交")
+@Data
+public class SubmitAsOldparthandleApplyDto extends AsOldparthandleApplyDto {
+
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java

@@ -54,6 +54,10 @@ public class AsOldpartreturn extends BaseEntity {
 
     @ApiModelProperty("主表sid")
     private String mainSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家")
+    private String manufacturerName;
 	@ApiModelProperty("商品名称")
     private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java

@@ -53,8 +53,14 @@ public class AsOldpartreturnDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("主表sid")
     private String mainSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家")
+    private String manufacturerName;
 	@ApiModelProperty("商品名称")
     private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java

@@ -53,8 +53,14 @@ public class AsOldpartreturnDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("主表sid")
     private String mainSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家")
+    private String manufacturerName;
 	@ApiModelProperty("商品名称")
     private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.as.api.asoldpartreturn;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AsOldpartreturnExcelInfo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("商品名称")
+    private String goodsSkuName;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+    @ApiModelProperty("厂家")
+    private String manufacturerName;
+    @ApiModelProperty("需返厂数量")
+    private BigDecimal needReturnCount;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/ReturnExcelInfo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.as.api.asoldpartreturn;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ReturnExcelInfo {
+    private String checkInfo;
+    private List<AsOldpartreturnExcelInfo> infos = new ArrayList<>();
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDetailsVo.java

@@ -59,12 +59,19 @@ public class AsOldpartreturnApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("发起部门sid")
     private String createDeptSid; // 发起部门sid
 	@ApiModelProperty("发起部门名称")
     private String createDeptName; // 发起部门名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("附件路径")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDto.java

@@ -58,12 +58,19 @@ public class AsOldpartreturnApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("发起部门sid")
     private String createDeptSid; // 发起部门sid
 	@ApiModelProperty("发起部门名称")
     private String createDeptName; // 发起部门名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
     @ApiModelProperty("附件路径")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java

@@ -51,12 +51,24 @@ import lombok.Data;
 @ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
 public class AsOldpartreturnApplyQuery implements Query {
 
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
 	@ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("申请开始日期")
     private String createStartTime;
     @ApiModelProperty("申请结束日期")
     private String createEndTime;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("厂家确认结果")
+    private String confirmResult;
 
     private String userSid;
     private String orgPath;

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyVo.java

@@ -53,20 +53,24 @@ import lombok.Data;
 @ApiModel(value = "旧件返厂申请 视图数据对象", description = "旧件返厂申请 视图数据对象")
 public class AsOldpartreturnApplyVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("流程状态")
     private String nodeState;
     @ApiModelProperty("单据编号")
     private String billNo;
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+	@ApiModelProperty("申请人")
     private String createByName;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("创建日期")
+    @ApiModelProperty("申请日期")
     private Date createTime;
-	@ApiModelProperty("应返厂数量")
+	@ApiModelProperty("应返厂数量合计")
     private String needReturnCount;
-	@ApiModelProperty("实际返厂数量")
+	@ApiModelProperty("实际返厂数量合计")
     private String actualReturnCount;
 	@ApiModelProperty("附件路径")
     private List<String> filePaths;
@@ -74,4 +78,6 @@ public class AsOldpartreturnApplyVo implements Vo {
     private String procDefId;
 	@ApiModelProperty("流程实例的sid")
     private String procInstId;
+    @ApiModelProperty("厂家确认结果")
+    private String confirmResult;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirm.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturnconfirm;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirm.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirm <br/>
+ * Description: 旧件返厂厂家确认. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件返厂厂家确认", description = "旧件返厂厂家确认")
+@TableName("as_oldpartreturn_confirm")
+public class AsOldpartreturnConfirm extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("返件数量确认(0一致,1不一致)")
+    private Integer isUnanimous; // 返件数量确认(0一致,1不一致)
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturnconfirm;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo <br/>
+ * Description: 旧件返厂厂家确认 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件返厂厂家确认 视图数据详情", description = "旧件返厂厂家确认 视图数据详情")
+public class AsOldpartreturnConfirmDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+    @ApiModelProperty("返件数量确认(0一致,1不一致)")
+    private Integer isUnanimous;
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturnconfirm;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmDto.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto <br/>
+ * Description: 旧件返厂厂家确认 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件返厂厂家确认 数据传输对象", description = "旧件返厂厂家确认 数据传输对象")
+public class AsOldpartreturnConfirmDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+    @ApiModelProperty("返件数量确认(0一致,1不一致)")
+    private Integer isUnanimous;
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturnconfirm;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery <br/>
+ * Description: 旧件返厂厂家确认 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
+public class AsOldpartreturnConfirmQuery implements Query {
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+    @ApiModelProperty("返件数量确认(0一致,1不一致)")
+    private Integer isUnanimous;
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturnconfirm;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo <br/>
+ * Description: 旧件返厂厂家确认 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
+public class AsOldpartreturnConfirmVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+    @ApiModelProperty("返件数量确认(0一致,1不一致)")
+    private Integer isUnanimous;
+	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
+    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandle;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleMapper <br/>
+ * Description: 处理旧件列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsOldparthandleMapper extends BaseMapper<AsOldparthandle> {
+
+	//@Update("update as_oldparthandle set name=#{msg} where id=#{id}")
+	//IPage<AsOldparthandleVo> voPage(IPage<AsOldparthandle> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandle> qw);
+	
+	IPage<AsOldparthandleVo> selectPageVo(IPage<AsOldparthandle> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandle> qw);
+	
+	List<AsOldparthandleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandle> qw);
+	
+	@Select("select * from as_oldparthandle")
+	List<AsOldparthandleVo> selectListVo();
+
+	@Delete("delete from as_oldparthandle where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select * from as_oldparthandle where mainSid = #{mainSid}")
+	List<AsOldparthandleDetailsVo> selByMainSid(String mainSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandle;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleRest <br/>
+ * Description: 处理旧件列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "处理旧件列表")
+@RestController
+@RequestMapping("v1/asoldparthandle")
+public class AsOldparthandleRest{
+
+	@Autowired
+	private AsOldparthandleService asOldparthandleService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsOldparthandleVo>> listPage(@RequestBody PagerQuery<AsOldparthandleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsOldparthandleVo> pv = asOldparthandleService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsOldparthandleDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asOldparthandleService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asOldparthandleService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsOldparthandleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsOldparthandleDetailsVo vo = asOldparthandleService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandle;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService <br/>
+ * Description: 处理旧件列表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsOldparthandleService extends MybatisBaseService<AsOldparthandleMapper, AsOldparthandle> {
+	private QueryWrapper<AsOldparthandle> createQueryWrapper(AsOldparthandleQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsOldparthandle> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsOldparthandleVo> listPageVo(PagerQuery<AsOldparthandleQuery> pq) {
+		AsOldparthandleQuery query = pq.getParams();
+		QueryWrapper<AsOldparthandle> qw = createQueryWrapper(query);
+		IPage<AsOldparthandle> page = PagerUtil.queryToPage(pq);
+		IPage<AsOldparthandleVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsOldparthandleVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsOldparthandleDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsOldparthandleDto dto){
+		AsOldparthandle entity = new AsOldparthandle();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsOldparthandleDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsOldparthandle entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsOldparthandleDetailsVo fetchDetailsVoBySid(String sid){
+		AsOldparthandle entity = fetchBySid(sid);
+		AsOldparthandleDetailsVo vo = new AsOldparthandleDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<AsOldparthandleDetailsVo> selByMainSid(String mainSid) {
+		return baseMapper.selByMainSid(mainSid);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandleapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper <br/>
+ * Description: 旧件处理申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> {
+
+	//@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}")
+	//IPage<AsOldparthandleApplyVo> voPage(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandleApply> qw);
+	
+	IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
+	
+	List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
+	
+	@Select("select * from as_oldparthandle_apply")
+	List<AsOldparthandleApplyVo> selectListVo();
+
+	int selectBySid(String join);
+
+	int updateFlowFiled(Map<String, Object> map);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo">
+		SELECT * FROM as_oldparthandle_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo">
+		SELECT * FROM as_oldparthandle_apply <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM as_oldparthandle_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE as_oldparthandle_apply
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+	</update>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java

@@ -0,0 +1,151 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandleapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
+import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyRest <br/>
+ * Description: 旧件处理申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "旧件处理申请")
+@RestController
+@RequestMapping("v1/asoldparthandleapply")
+public class AsOldparthandleApplyRest {
+
+	@Autowired
+	private AsOldparthandleApplyService asOldparthandleApplyService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsOldparthandleApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asOldparthandleApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return asOldparthandleApplyService.delAll(sids);
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@ApiOperation("提交审批流程")
+	@PostMapping("/submit")
+	public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) {
+		return asOldparthandleApplyService.submit(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PostMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
+		return asOldparthandleApplyService.complete(bv);
+	}
+
+	@ApiOperation(value = "获取上一个环节")
+	@GetMapping(value = "/getPreviousNodesForReject")
+	public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
+		return asOldparthandleApplyService.getPreviousNodesForReject(query);
+	}
+
+	@ApiOperation(value = "获取下一个环节")
+	@GetMapping(value = "/getNextNodesForSubmit")
+	public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
+		return asOldparthandleApplyService.getNextNodesForSubmit(query);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PostMapping(value = "/reject")
+	public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
+		return asOldparthandleApplyService.reject(query);
+	}
+
+	@ApiOperation(value = "撤回流程")
+	@PostMapping(value = "/revokeProcess")
+	public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
+		return asOldparthandleApplyService.revokeProcess(query);
+	}
+
+	@ApiOperation(value = "终止任务")
+	@PostMapping(value = "/breakProcess")
+	public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
+		return asOldparthandleApplyService.breakProcess(query);
+	}
+
+	@ApiOperation(value = "加签")
+	@PostMapping(value = "/delegate")
+	public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) {
+		return asOldparthandleApplyService.delegate(query);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java

@@ -0,0 +1,550 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldparthandleapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
+import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
+import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApply;
+import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery;
+import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
+import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
+import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService;
+import com.yxt.anrui.as.feign.flowable.flow.*;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDetailsVo;
+import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: yxt-as(旧件处理申请) <br/>
+ * File: AsOldparthandleApplyService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyService <br/>
+ * Description: 旧件处理申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-23 17:56:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> {
+
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private FlowableFeign flowableFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+	@Autowired
+	private FlowFeign flowFeign;
+	@Autowired
+	private MessageFeign messageFeign;
+	@Autowired
+	private AsOldparthandleService asOldparthandleService;
+
+	public PagerVo<AsOldparthandleApplyVo> listPageVo(PagerQuery<AsOldparthandleApplyQuery> pq) {
+		AsOldparthandleApplyQuery query = pq.getParams();
+		QueryWrapper<AsOldparthandleApply> qw = new QueryWrapper<>();
+		//========================================数据授权开始
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setMenuSid(query.getMenuSid());
+			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<AsOldparthandleApplyVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		if (StringUtils.isNotBlank(query.getUseOrgName())){
+			qw.like("useOrgName",query.getUseOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateDeptName())){
+			qw.like("createDeptName",query.getCreateDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateByName())){
+			qw.like("createByName",query.getCreateByName());
+		}
+		if (StringUtils.isNotBlank(query.getBillNo())){
+			qw.like("billNo",query.getBillNo());
+		}
+		if (StringUtils.isNotBlank(query.getHandleReasonKey())){
+			qw.like("handleReasonKey",query.getHandleReasonKey());
+		}
+		if (StringUtils.isNotBlank(query.getHandleModeKey())){
+			qw.like("handleModeKey",query.getHandleModeKey());
+		}
+		String createStartTime = query.getCreateStartTime();
+		String createEndTime = query.getCreateEndTime();
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
+		String finishStartTime = query.getFinishStartTime();
+		String finishEndTime = query.getFinishEndTime();
+		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+				);
+		IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq);
+		IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public String saveOrUpdateDto(AsOldparthandleApplyDto dto){
+        String dtoSid = dto.getSid();
+		List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList();
+		if (StringUtils.isBlank(dtoSid)) {
+			String sid = this.insertByDto(dto);
+			for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
+				asOldparthandleDto.setMainSid(sid);
+				asOldparthandleService.saveOrUpdateDto(asOldparthandleDto);
+			}
+			return sid;
+        } 
+		this.updateByDto(dto);
+		asOldparthandleService.delByMainSid(dtoSid);
+		for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
+			asOldparthandleDto.setMainSid(dtoSid);
+			asOldparthandleService.saveOrUpdateDto(asOldparthandleDto);
+		}
+		return dtoSid;
+	}
+	
+	public String insertByDto(AsOldparthandleApplyDto dto){
+		AsOldparthandleApply entity = new AsOldparthandleApply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
+		entity.setNodeState("待提交");
+		baseMapper.insert(entity);
+		return entity.getSid();
+	}
+	
+	public void updateByDto(AsOldparthandleApplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsOldparthandleApply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid){
+		AsOldparthandleApply entity = fetchBySid(sid);
+		AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		String filePath = entity.getFilePath();
+		String[] filePaths = filePath.split(",");
+		List<String> urlPahts = new ArrayList<>();
+		for (String path : filePaths) {
+			String url = fileUploadComponent.getUrlPrefix() + path;
+			urlPahts.add(url);
+		}
+		vo.setFilePaths(urlPahts);
+		List<AsOldparthandleDetailsVo> asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid);
+		vo.setAsOldparthandleList(asOldpartreturnDetailsVos);
+		return vo;
+	}
+
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+		}
+		delBySids(sids);
+		for (String sid : sids) {
+			asOldparthandleService.delByMainSid(sid);
+		}
+		return rb.success();
+	}
+
+	public ResultBean submit(SubmitAsOldparthandleApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid());
+		int r = submitBusinessData(dto, asOldparthandleApply);
+		if (r == 3) {
+			return rb.setMsg("该申请不存在");
+		}
+		if (r == 0) {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+		//新增修改保存
+		String businessSid = saveOrUpdateDto(dto);
+		asOldparthandleApply = fetchBySid(businessSid);
+		//创建BusinessVariables实体对象
+		BusinessVariables bv = new BusinessVariables();
+		//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+		Map<String, Object> variables = new HashMap<>();
+		//用户的部门全路径sid
+		bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath());
+		//业务sid
+		bv.setBusinessSid(businessSid);
+		//用户sid
+		bv.setUserSid(asOldparthandleApply.getCreateBySid());
+		//若app移动端有此功能，则传递appMap参数
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+		variables.put("app", appMap);
+		//流程定义id
+		bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
+		bv.setFormVariables(variables);
+		if (r == 1) {
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			UpdateFlowFieldVo ufVo = voResultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(ufVo));
+			//极光推送
+			asOldparthandleApply = fetchBySid(businessSid);
+			MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+			MessageFlowVo messageFlowVo = new MessageFlowVo();
+			BeanUtil.copyProperties(ufVo, messageFlowVo);
+			messageFlowableQuery.setUfVo(messageFlowVo);
+			messageFlowableQuery.setAppMap(appMap);
+			messageFlowableQuery.setBusinessSid(businessSid);
+			messageFlowableQuery.setModuleName("旧件处理申请");
+			messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+			messageFlowableQuery.setMsgTitle("旧件处理申请");
+			messageFeign.pushMessage(messageFlowableQuery);
+			return voResultBean;
+		}
+		if (r == 2) {
+			// ToDo:驳回到发起人后再次提交
+			if (StringUtils.isBlank(dto.getInstanceId())) {
+				return rb.setMsg("参数错误：instanceId");
+			}
+			bv.setTaskId(asOldparthandleApply.getTaskId());
+			bv.setTaskDefKey(asOldparthandleApply.getNodeId());
+			bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+			bv.setInstanceId(dto.getInstanceId());
+			return complete(bv);
+		}
+		return rb;
+	}
+
+	private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) {
+		int r = 0;
+		if (StringUtils.isBlank(dto.getSid())) {
+			r = 1;
+		} else {
+			if (asOldparthandleApply != null) {
+				String businessTaskId = asOldparthandleApply.getTaskId();
+				if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+					//新提交
+					r = 1;
+				} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+					//二次提交//只有数据一致的时候才能进行下一步
+					r = 2;
+				}
+			} else {
+				r = 3;
+			}
+
+		}
+		return r;
+	}
+
+	private int updateFlowFiled(Map<String, Object> map) {
+		return baseMapper.updateFlowFiled(map);
+	}
+
+	public ResultBean complete(BusinessVariables bv) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = bv.getBusinessSid();
+		AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+		if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) {
+			flowProcessMapQuery.setProDefKey(bv.getModelId());
+		} else {
+			flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId());
+		}
+		flowProcessMapQuery.setVariables(variables);
+		variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+		//=======================================
+		bv.setFormVariables(variables);
+		bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath());
+		if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) {
+			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+			if (!resultBean.getSuccess()) {
+				return rb.setMsg(resultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = resultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
+			} else {
+				//极光推送
+				asOldparthandleApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
+				ufVo.setProcInsId(asOldparthandleApply.getProcInstId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("旧件处理申请");
+				messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				messageFlowableQuery.setMsgTitle("旧件处理申请");
+				messageFeign.pushMessage(messageFlowableQuery);
+			}
+			return rb.success().setData(resultBean.getData());
+		} else {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+	}
+
+	public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) {
+		ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+		List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) {
+		ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+		List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean reject(AsOldparthandleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = query.getBusinessSid();
+		AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
+		if (asOldparthandleApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		String businessTaskId = asOldparthandleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				if (StringUtils.isBlank(query.getComment())) {
+					return rb.setMsg("请填写意见");
+				}
+				if (StringUtils.isBlank(query.getUserSid())) {
+					return rb.setMsg("参数错误：userSid");
+				}
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				Map<String, Object> variables = new HashMap<>();
+				Map<String, Object> appMap = new HashMap<>();
+				appMap.put("sid", businessSid);
+				variables.put("app", appMap);
+				flowTaskVo.setValues(variables);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				UpdateFlowFieldVo ufVo = resultBean.getData();
+				Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+				//更新业务中的流程相关的参数
+				updateFlowFiled(map);
+				//极光推送
+				asOldparthandleApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				String procId = asOldparthandleApply.getProcInstId();
+				ufVo.setProcInsId(procId);
+				ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("旧件处理申请");
+				ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+				String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+				List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+				if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) {
+					messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+				} else {
+					messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				}
+				messageFlowableQuery.setMsgTitle("旧件处理申请");
+				messageFeign.pushMessage(messageFlowableQuery);
+				return rb.success();
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asOldparthandleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+				return rb.success().setData(resultBean.getData());
+			}
+		}
+		return rb.setMsg("操作失败，提交的数据不一致!");
+	}
+
+	public ResultBean breakProcess(AsOldparthandleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getInstanceId())) {
+			return rb.setMsg("参数错误：instanceId");
+		}
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		if (StringUtils.isBlank(query.getComment())) {
+			return rb.setMsg("请填写意见");
+		}
+		AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asOldparthandleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (query.getUserSid().equals(asOldparthandleApply.getCreateBySid())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+				updateFlowFiled(map);
+				return rb.success().setData(resultBean.getData());
+			} else {
+				if (businessTaskId.equals(query.getTaskId())) {
+					FlowTaskVo flowTaskVo = new FlowTaskVo();
+					BeanUtil.copyProperties(query, flowTaskVo);
+					ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+					if (!resultBean.getSuccess()) {
+						return rb.setMsg(resultBean.getMsg());
+					}
+					Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+					updateFlowFiled(map);
+					return rb.success().setData(resultBean.getData());
+				}
+			}
+
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+		BeanUtil.copyProperties(query, delegateQuery);
+		flowFeign.delegate(delegateQuery);
+		return rb.success();
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java

@@ -62,4 +62,6 @@ public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnAp
 	List<AsOldpartreturnApplyVo> selectListVo();
 
 	int updateFlowFiled(Map<String, Object> map);
+
+    int selectBySid(String join);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@@ -7,11 +7,21 @@
 		SELECT
 		aoa.*,
 		SUM(needReturnCount) AS needReturnCount,
-		SUM(actualReturnCount) AS actualReturnCount
+		SUM(actualReturnCount) AS actualReturnCount,
+		CASE
+		ac.isUnanimous
+		WHEN '0'
+		THEN '一致'
+		WHEN '1'
+		THEN '不一致'
+		ELSE '未确认'
+		END AS confirmResult
 		FROM
 		as_oldpartreturn_apply aoa
 		LEFT JOIN as_oldpartreturn AS ao
 		ON aoa.`sid` = ao.`mainSid`
+		LEFT JOIN as_oldpartreturn_confirm ac
+		ON ac.`mainSid` = aoa.`sid`
 		<where> ${ew.sqlSegment} </where>
 	</select>
 	
@@ -33,4 +43,11 @@
 		</if>
 		WHERE sid=#{sid}
 	</update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM as_oldpartreturn_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.as.biz.asoldpartreturnapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
@@ -35,6 +36,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -43,8 +48,14 @@ import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery;
 import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyDto;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -76,6 +87,14 @@ public class AsOldpartreturnApplyRest{
 		return rb.success().setData(pv);
 	}
 
+	@ApiOperation("返厂确认列表")
+	@PostMapping("/confirmListPage")
+	public ResultBean<PagerVo<AsOldpartreturnApplyVo>> confirmListPage(@RequestBody PagerQuery<AsOldpartreturnApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsOldpartreturnApplyVo> pv = asOldpartreturnApplyService.confirmListPage(pq);
+		return rb.success().setData(pv);
+	}
+
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto){
@@ -87,9 +106,7 @@ public class AsOldpartreturnApplyRest{
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
+		return asOldpartreturnApplyService.delAll(sids);
-		asOldpartreturnApplyService.delAll(sids);
-		return rb.success();
 	}
 
 	@ApiOperation("根据SID获取一条记录")
@@ -111,7 +128,7 @@ public class AsOldpartreturnApplyRest{
 	public ResultBean complete(@Valid @RequestBody AsOldpartreturnApplyCompleteDto query) {
 		BusinessVariables bv = new BusinessVariables();
 		BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId());
+		bv.setModelId(ProcDefEnum.ASOLDPARTRETURNAPPLY.getProDefId());
 		return asOldpartreturnApplyService.complete(bv);
 	}
 
@@ -150,4 +167,11 @@ public class AsOldpartreturnApplyRest{
 	public ResultBean delegate(@RequestBody AsOldpartreturnApplyDelegateQuery query) {
 		return asOldpartreturnApplyService.delegate(query);
 	}
+
+	@PostMapping("/getExcelInfo")
+	@ResponseBody
+	@ApiOperation(value = "导入")
+	public ResultBean<List<AsOldpartreturnDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+		return asOldpartreturnApplyService.getExcelInfo(file, request);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java

@@ -35,6 +35,8 @@ import com.yxt.anrui.as.api.asarrearsoutapply.flowable.AsArrearsoutApplyNodeVo;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.SubmitAsArrearsoutApplyDto;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnExcelInfo;
+import com.yxt.anrui.as.api.asoldpartreturn.ReturnExcelInfo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
 import com.yxt.anrui.as.biz.asoldpartreturn.AsOldpartreturnService;
 import com.yxt.anrui.as.feign.flowable.flow.*;
@@ -62,10 +64,24 @@ import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyDto;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -144,14 +160,31 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 				return p;
 			}
 		}
+		if (StringUtils.isNotBlank(query.getUseOrgName())){
+			qw.like("aoa.useOrgName",query.getUseOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateDeptName())){
+			qw.like("aoa.createDeptName",query.getCreateDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateByName())){
+			qw.like("aoa.createByName",query.getCreateByName());
+		}
 		if (StringUtils.isNotBlank(query.getBillNo())){
 			qw.like("aoa.billNo",query.getBillNo());
 		}
+		if (StringUtils.isNotBlank(query.getConfirmResult())){
+			qw.having("confirmResult = {0}", query.getConfirmResult());
+		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
 				);
+		String finishStartTime = query.getFinishStartTime();
+		String finishEndTime = query.getFinishEndTime();
+		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+				);
 		IPage<AsOldpartreturnApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsOldpartreturnApplyVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsOldpartreturnApplyVo> p = PagerUtil.pageToVo(pagging, null);
@@ -188,6 +221,7 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 			url = url + filePath + ",";
 		}
 		entity.setFilePath(url);
+		entity.setNodeState("待提交");
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
@@ -219,11 +253,18 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		return vo;
 	}
 
-	public void delAll(String[] sids) {
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+		}
 		delBySids(sids);
 		for (String sid : sids) {
 			asOldpartreturnService.delByMainSid(sid);
 		}
+		return rb.success();
 	}
 
 	public ResultBean submit(SubmitAsOldpartreturnApplyDto dto) {
@@ -517,4 +558,253 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public PagerVo<AsOldpartreturnApplyVo> confirmListPage(PagerQuery<AsOldpartreturnApplyQuery> pq) {
+		AsOldpartreturnApplyQuery query = pq.getParams();
+		QueryWrapper<AsOldpartreturnApply> qw = new QueryWrapper<>();
+		//========================================数据授权开始
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setMenuSid(query.getMenuSid());
+			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("aoa.orgSidPath", orgSidPath);
+				} else if ("2".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i2);
+					qw.like("aoa.orgSidPath", orgSidPath);
+				} else if ("3".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i3);
+					qw.like("aoa.orgSidPath", orgSidPath);
+				} else if ("4".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i4);
+					qw.like("aoa.orgSidPath", orgSidPath);
+				} else if ("5".equals(orgLevelKey)) {
+					qw.eq("aoa.createBySid", query.getUserSid());
+				} else {
+					PagerVo<AsOldpartreturnApplyVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<AsOldpartreturnApplyVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		qw.eq("aoa.nodeState","已办结");
+		if (StringUtils.isNotBlank(query.getBillNo())){
+			qw.like("aoa.billNo",query.getBillNo());
+		}
+		String createStartTime = query.getCreateStartTime();
+		String createEndTime = query.getCreateEndTime();
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
+		IPage<AsOldpartreturnApply> page = PagerUtil.queryToPage(pq);
+		IPage<AsOldpartreturnApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsOldpartreturnApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+
+	public ResultBean<List<AsOldpartreturnDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+		ResultBean rb = ResultBean.fireFail();
+		String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
+		File tempFile = new File(temp);
+		if (!tempFile.exists()) {
+			tempFile.mkdirs();
+		}
+		String fileName = file.getOriginalFilename();
+		if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			return rb.fail().setMsg("上传文件不正确");
+		}
+
+		int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7};
+		List<AsOldpartreturnExcelInfo> resultList = new ArrayList<>();
+		List<AsOldpartreturnDetailsVo> resultList2 = new ArrayList<>();
+		boolean isExcel2003 = true;
+		if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			isExcel2003 = false;
+		}
+		InputStream is = file.getInputStream();
+		Workbook wb = null;
+		if (isExcel2003) {
+			wb = new HSSFWorkbook(is);
+		} else {
+			wb = new XSSFWorkbook(is);
+		}
+		Sheet sheet = wb.getSheetAt(0);
+		ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
+		resultList = importReturn.getInfos();
+		for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) {
+			AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = new AsOldpartreturnDetailsVo();
+			asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo());
+			asOldpartreturnDetailsVo.setGoodsSkuName(asOldpartreturnExcelInfo.getGoodsSkuName());
+			asOldpartreturnDetailsVo.setGoodsSkuCode(asOldpartreturnExcelInfo.getGoodsSkuCode());
+			asOldpartreturnDetailsVo.setManufacturerName(asOldpartreturnExcelInfo.getManufacturerName());
+			asOldpartreturnDetailsVo.setNeedReturnCount(asOldpartreturnExcelInfo.getNeedReturnCount());
+			resultList2.add(asOldpartreturnDetailsVo);
+		}
+		if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
+			return rb.setMsg(importReturn.getCheckInfo());
+		} else {
+			return rb.success().setData(resultList2).setMsg("成功导入数据，请点击确定按钮");
+		}
+	}
+
+	private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell) {
+		ReturnExcelInfo importReturn = new ReturnExcelInfo();
+		List<AsOldpartreturnExcelInfo> importVoList = new ArrayList<>();
+		Set<String> checkWord = new HashSet<>();
+		for (int r = 1; r <= sheet.getLastRowNum(); r++) {
+			Row row = sheet.getRow(r);
+			if (row == null) {
+				continue;
+			}
+			AsOldpartreturnExcelInfo importVo = new AsOldpartreturnExcelInfo();
+			int physicalNumberOfCells = row.getPhysicalNumberOfCells();
+			if (physicalNumberOfCells < 8) {
+				physicalNumberOfCells = 8;
+			}
+			for (int i = 0; i < physicalNumberOfCells; i++) {
+				String trim = new String();
+				try {
+					trim = getCellVal(row.getCell(i)).toString().trim();
+					if (StringUtils.isBlank(trim)) {
+						NullPointerException nullPointerException = new NullPointerException();
+					}
+					String temp = getCellVal(row.getCell(i)).toString().trim();
+					for (int j = 0; j < resultCell.length; j++) {
+						if (i == resultCell[j]) {
+							switch (i) {
+								case 0:
+									importVo.setVinNo(temp);
+									break;
+								case 1:
+									importVo.setGoodsSkuName(temp);
+									break;
+								case 2:
+									importVo.setGoodsSkuCode(temp);
+									break;
+								case 3:
+									importVo.setManufacturerName(temp);
+									break;
+								case 4:
+									importVo.setNeedReturnCount(new BigDecimal(temp));
+									break;
+								default:
+									break;
+							}
+						} else {
+							continue;
+						}
+					}
+				} catch (Exception e) {
+					if (StringUtils.isBlank(trim)) {
+						String word = new String();
+						switch (i) {
+							case 0:
+								word = "车架号";
+								break;
+							case 1:
+								word = "商品名称";
+								break;
+							case 2:
+								word = "图号";
+								break;
+							case 3:
+								word = "厂家";
+								break;
+							case 4:
+								word = "需返厂数量";
+								break;
+							default:
+								break;
+						}
+						continue;
+					}
+				}
+			}
+			importVoList.add(importVo);
+		}
+		if (!importVoList.isEmpty()) {
+			for (AsOldpartreturnExcelInfo excelInfo : importVoList) {
+				if (StringUtils.isBlank(excelInfo.getVinNo())) {
+					checkWord.add("车架号不能为空");
+					break;
+				}
+				if (StringUtils.isBlank(excelInfo.getGoodsSkuName())) {
+					checkWord.add("商品名称不能为空");
+					break;
+				}
+				if (StringUtils.isBlank(excelInfo.getGoodsSkuCode())) {
+					checkWord.add("图号不能为空");
+					break;
+				}
+				if (StringUtils.isBlank(excelInfo.getManufacturerName())) {
+					checkWord.add("厂家不能为空");
+					break;
+				}
+				if (StringUtils.isNotBlank(excelInfo.getNeedReturnCount().toString())) {
+					String count = excelInfo.getNeedReturnCount().toString();
+					Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+					boolean matches = pattern.matcher(count).matches();
+					if (!matches) {
+						checkWord.add("需返厂数量必须为数字");
+						break;
+					}
+				}
+			}
+		}
+		StringBuffer sbcheck1 = new StringBuffer();
+		if (!checkWord.isEmpty()) {
+			for (String s : checkWord) {
+				if (StringUtils.isBlank(s)) {
+					continue;
+				}
+				sbcheck1.append(s).append("；");
+			}
+		}
+		if (sbcheck1.length() > 0) {
+			sbcheck1.delete(sbcheck1.length() - 1, sbcheck1.length());
+			importReturn.setCheckInfo(sbcheck1.toString());
+			importReturn.setInfos(new ArrayList<>());
+			return importReturn;
+		}
+		importReturn.setInfos(importVoList);
+		return importReturn;
+	}
+
+	public Object getCellVal(Cell cell) {
+		Object obj = null;
+		if (cell != null) {
+			switch (cell.getCellTypeEnum()) {
+				case BOOLEAN:
+					obj = cell.getBooleanCellValue();
+					break;
+				case ERROR:
+					obj = cell.getErrorCellValue();
+					break;
+				case NUMERIC:
+					obj = cell.getNumericCellValue();
+					break;
+				case STRING:
+					obj = cell.getStringCellValue();
+					break;
+				default:
+					break;
+			}
+		}
+		return obj;
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldpartreturnconfirm;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirm;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper <br/>
+ * Description: 旧件返厂厂家确认. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> {
+
+	//@Update("update as_oldpartreturn_confirm set name=#{msg} where id=#{id}")
+	//IPage<AsOldpartreturnConfirmVo> voPage(IPage<AsOldpartreturnConfirm> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldpartreturnConfirm> qw);
+	
+	IPage<AsOldpartreturnConfirmVo> selectPageVo(IPage<AsOldpartreturnConfirm> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnConfirm> qw);
+	
+	List<AsOldpartreturnConfirmVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldpartreturnConfirm> qw);
+	
+	@Select("select * from as_oldpartreturn_confirm")
+	List<AsOldpartreturnConfirmVo> selectListVo();
+
+	@Select("select * from as_oldpartreturn_confirm where mainSid = #{mainSid}")
+    AsOldpartreturnConfirmDetailsVo fetchDetailsByMainSid(String mainSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldpartreturnconfirm;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest <br/>
+ * Description: 旧件返厂厂家确认. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "旧件返厂厂家确认")
+@RestController
+@RequestMapping("v1/asoldpartreturnconfirm")
+public class AsOldpartreturnConfirmRest {
+
+	@Autowired
+	private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsOldpartreturnConfirmDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asOldpartreturnConfirmService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		asOldpartreturnConfirmService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@ApiOperation("根据旧件返厂申请sid查询")
+	@GetMapping("/fetchDetailsByMainSid/{mainSid}")
+	public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsByMainSid(@PathVariable("mainSid") String mainSid){
+		ResultBean rb = ResultBean.fireFail();
+		AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsByMainSid(mainSid);
+		return rb.success().setData(vo);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java

@@ -0,0 +1,183 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asoldpartreturnconfirm;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.message.PushMessageQuery;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirm;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
+import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
+
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+
+/**
+ * Project: yxt-as(旧件返厂厂家确认) <br/>
+ * File: AsOldpartreturnConfirmService.java <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService <br/>
+ * Description: 旧件返厂厂家确认 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-04-18 16:51:44 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> {
+
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private MessageFeign messageFeign;
+
+	private QueryWrapper<AsOldpartreturnConfirm> createQueryWrapper(AsOldpartreturnConfirmQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<AsOldpartreturnConfirm> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<AsOldpartreturnConfirmVo> listPageVo(PagerQuery<AsOldpartreturnConfirmQuery> pq) {
+		AsOldpartreturnConfirmQuery query = pq.getParams();
+		QueryWrapper<AsOldpartreturnConfirm> qw = createQueryWrapper(query);
+		IPage<AsOldpartreturnConfirm> page = PagerUtil.queryToPage(pq);
+		IPage<AsOldpartreturnConfirmVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsOldpartreturnConfirmVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(AsOldpartreturnConfirmDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+			if (dto.getIsUnanimous().equals("1")){
+				//获取站长userSid
+				/*List<String> receIveUserSidList = new ArrayList<>();
+				BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanCapitalCreditResult.getSaleOrderSid()).getData();
+				SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+				receIveUserSidList.add(sysUserVo.getSid());
+				//发送通知给站长
+				try {
+					ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+							.setNameFormat("demo-pool-%d").build();
+					ExecutorService pool = new ThreadPoolExecutor(1, 10,
+							1000, TimeUnit.MILLISECONDS,
+							new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+					String finalVinNo = vinNo;
+					Future future1 = pool.submit(() -> {
+						PushMessageQuery pushMessageQuery = new PushMessageQuery();
+						pushMessageQuery.setReceivedSids(receIveUserSidList);
+						pushMessageQuery.setModuleName("风控");
+						pushMessageQuery.setMsgContent(busSalesOrderVehicles.get(0).getBorrowName() + "的" + finalVinNo + "车架号的车辆资方信审终审已通过。");
+						pushMessageQuery.setApp_type("2");
+						pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+						pushMessageQuery.setMsgTitle("资方信审终审提醒");
+						// 消息推送
+						messageFeign.pushNoUriMessage(pushMessageQuery);
+					});
+				} catch (Exception e) {
+					e.printStackTrace();
+				}*/
+			}
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(AsOldpartreturnConfirmDto dto){
+		AsOldpartreturnConfirm entity = new AsOldpartreturnConfirm();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(AsOldpartreturnConfirmDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsOldpartreturnConfirm entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsOldpartreturnConfirmDetailsVo fetchDetailsVoBySid(String sid){
+		AsOldpartreturnConfirm entity = fetchBySid(sid);
+		AsOldpartreturnConfirmDetailsVo vo = new AsOldpartreturnConfirmDetailsVo();
+		String filePath = entity.getFilePath();
+		String[] filePaths = filePath.split(",");
+		List<String> urlPahts = new ArrayList<>();
+		for (String path : filePaths) {
+			String url = fileUploadComponent.getUrlPrefix() + path;
+			urlPahts.add(url);
+		}
+		vo.setFilePaths(urlPahts);
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public AsOldpartreturnConfirmDetailsVo fetchDetailsByMainSid(String mainSid) {
+		AsOldpartreturnConfirmDetailsVo vo = baseMapper.fetchDetailsByMainSid(mainSid);
+		AsOldpartreturnConfirm entity = fetchBySid(vo.getSid());
+		BeanUtil.copyProperties(entity, vo);
+		String filePath = entity.getFilePath();
+		String[] filePaths = filePath.split(",");
+		List<String> urlPahts = new ArrayList<>();
+		for (String path : filePaths) {
+			String url = fileUploadComponent.getUrlPrefix() + path;
+			urlPahts.add(url);
+		}
+		vo.setFilePaths(urlPahts);
+		return vo;
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

@@ -84,6 +84,7 @@ public enum ProcDefEnum {
     LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
     ASARREARSOUTAPPLY("欠款出厂申请", "process_u14c671d:1:10442504"),
     ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_6de5c2r8:1:10640004"),
+    ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_sshks74p:1:10887504"),
 
     /******************************测试流程id*********************************************/
 

yxt-as/src/main/java/com/yxt/anrui/as/feign/message/PushMessageQuery.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.as.feign.message;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/10
+ **/
+@Data
+public class PushMessageQuery implements Query {
+    private static final long serialVersionUID = -5710109873182775336L;
+
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("模块名称")
+    private String moduleName;
+    @ApiModelProperty("消息内容")
+    private String msgContent;
+    @ApiModelProperty("消息标题")
+    private String msgTitle;
+    @ApiModelProperty("接收人sidList")
+    private List<String> receivedSids;
+    /*  @ApiModelProperty("跳转地址")
+      private String msgTargetUri;*/
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String app_type;
+    @ApiModelProperty("插件sid")
+    private String moduleSid;
+}