Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(基础信息) <br/>
  * File: BaseTrailerFeignFallback.java <br/>
@@ -78,4 +76,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(PagerQuery<BaseTrailerSearchQuery> pagerQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean trailerOut(BaseTrailerDto dto) {
+		return null;
+	}
 }

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

@@ -864,26 +864,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list2 = new ArrayList<>();
-        list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor()));
-        list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine()));
-        list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
-        list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
-        list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
         list2.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue()));
         list2.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio()));
-        list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
+        list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase()));
-        list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
-        list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
         list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension()));
-        list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
-        list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover()));
         list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle()));
-        list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase()));
+        list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor()));
+        list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
         list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper()));
-        list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
-        list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
         list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank()));
+        list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
+        list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
+        list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine()));
+        list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover()));
+        list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
+        list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
+        list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
+        list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
+        list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
         list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
+        list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
+
+
+
         configDetailVo.setConfigInfo(list2);
         //更多配置
         String otherConfig = configVo.getOtherConfig();

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

@@ -470,31 +470,31 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         AppModelConfigDetailsVo configVo = baseModelConfigService.getAppProductionSchedulingDetailsVo(modelSid, configSid);
         List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list3 = new ArrayList<>();
-        list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1));
-        list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1));
-        list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1));
-        list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1));
-        list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1));
         list3.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue(),1));
         list3.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio(), 1));
-        list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1));
+        list3.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1));
-        list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1));
-        list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1));
         list3.add(getConfigValueSpanSize("悬架", configVo.getSuspension(), 1));
-        list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1));
-        list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1));
         list3.add(getConfigValueSpanSize("鞍座", configVo.getSaddle(), 1));
-        list3.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1));
+        list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1));
+        list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1));
         list3.add(getConfigValueSpanSize("保险杠", configVo.getBumper(), 1));
-        list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1));
-        list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
         list3.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1));
+        list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1));
+        list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
+        list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1));
+        list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1));
+        list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1));
+        list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1));
+        list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1));
+        list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1));
+        list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1));
         list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1));
+        list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1));
         configDetailVo.setConfigInfo(list3);
         //更多配置
         String otherConfig = configVo.getOtherConfig();
         configDetailVo.setMoreConfig(otherConfig);
-        return null;
+        return configDetailVo;
     }
 
     /**

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

@@ -1688,10 +1688,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //根据车型sid查询车型的全称
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
         //车型
-        String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue() + baseVehicleModel.getMarketSegmentsValue() + baseVehicleModel.getSpecifications();
+        String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue();
-        String modelName = "车型：" + modelName1 + "。";
+        String modelName = "车型：" + baseVehicleModel.getModelName()+"。";
         //配置
-        String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。";
+        String modelConfig = "配置：" + modelName1+"/"+appOrderModelInfoVo.getConfig() + "。";
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
@@ -2082,7 +2082,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 });
             }
             if("2".equals(appOrderDetailsVo.getPayTypeKey())){
-                return rb.setMsg("贷款合同附件请线下处理");
+                return rb.setMsg("贷款合同附件请线下处理").setCode("1000001");
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -258,4 +258,19 @@ public interface BusSalesOrderFeign {
     @DeleteMapping("/deleteVirtualDepositList")
     @ResponseBody
     ResultBean deleteVirtualDepositList(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("virtualOrderSid") String virtualOrderSid, @RequestParam("depositRecordSid") String depositRecordSid);
+
+    @ApiOperation("App销售订单根据组织机构查询")
+    @PostMapping("/getSaleOrdersByOrgPath")
+    @ResponseBody
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<OrderQuery> pq);
+
+    @ApiOperation("App销售订单根据组织机构查询")
+    @GetMapping("/selectBySid")
+    @ResponseBody
+    ResultBean<BusSalesOrder> selectBySid(@RequestParam("businessSid") String businessSid);
+
+    @ApiOperation(value = "销售支持部经理审批办理（同意）")
+    @PutMapping("/completeBy")
+    @ResponseBody
+    public ResultBean completeBy(@RequestBody OrderFlowableQuery orderFlowableQuery);
 }

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

@@ -234,4 +234,19 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(PagerQuery<OrderQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
+        return null;
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/1 15:52
+ * @Description
+ */
+@Data
+public class OrderQuery implements Query {
+    private static final long serialVersionUID = 1302619482341233076L;
+
+    private String orgPath;
+
+    private String name;
+}

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

@@ -19,7 +19,6 @@ public class BusSalesOrderFlowQuery implements Query {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

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

@@ -0,0 +1,42 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/2 13:54
+ * @Description
+ */
+@Data
+public class OrderFlowableQuery implements Query {
+    private static final long serialVersionUID = -8969469601635793219L;
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+}

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

@@ -311,4 +311,21 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
         return busSalesOrderService.deleteVirtualDepositList(saleOrderSid, virtualOrderSid,depositRecordSid);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(PagerQuery<OrderQuery> pq) {
+        ResultBean<PagerVo<AppBusSalesOrderVo>> rb = ResultBean.fireFail();
+        PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrdersByOrgPath(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
+        return busSalesOrderService.selectBySid(businessSid);
+    }
+
+    @Override
+    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
+        return busSalesOrderService.completeBy(orderFlowableQuery);
+    }
 }

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

@@ -37,9 +37,7 @@ import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
-import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
@@ -1558,8 +1556,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @return
      */
     public PagerVo<AppBusSalesOrderVo> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
-//        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(pq.getParams().getUserSid()).getData();
-//        pq.getParams().setStaffSid(data.getStaffSid());
         QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
@@ -3749,4 +3745,96 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success().setData(vo);
     }
+
+    public PagerVo<AppBusSalesOrderVo> getSaleOrdersByOrgPath(PagerQuery<OrderQuery> pq) {
+        IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
+        OrderQuery pagerQuery = pq.getParams();
+        QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
+        String orgSidPath = pagerQuery.getOrgPath();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("bo.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
+            qw.eq("bo.useOrgSid", orgSid);
+        }
+        qw.eq("bo.nodeState", "已办结");
+        IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
+        for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            record.setShowStopBtn(false);
+            record.setShowContractBtn(false);
+            if (StringUtils.isNotBlank(record.getCustomerImage())) {
+                record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
+            }
+            //根据销售订单sid查询是否有合同，有合同的话，查询合同是否审核。且需补交订金是否为0
+            String sid = record.getSaleOrderSid();
+            ResultBean<CommonContractBuscenterVo> buscenterVoResultBean = commonContractFeign.selectByBusSid(sid);
+            //已交定金
+            String deposit = "-";
+            BigDecimal depositBig = new BigDecimal("0");
+            if (StringUtils.isNotBlank(record.getDepositAll())) {
+                //需补交订金
+                if (StringUtils.isNotBlank(record.getMakeUpDeposit())) {
+                    depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit()));
+
+                } else {
+                    depositBig = new BigDecimal(record.getDepositAll());
+
+                }
+                //将已交订金转为string
+                deposit = depositBig.toString();
+            }
+            record.setDeposit(deposit);
+            //查询车型信息
+            AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid());
+            if (appModelInfo != null) {
+                if (StringUtils.isBlank(appModelInfo.getPrice())) {
+                    appModelInfo.setPrice("-");
+                }
+                //根据车型查询车型图片
+                ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid());
+                if (imageString.getSuccess()) {
+                    appModelInfo.setCarImage(imageString.getData().toString());
+                }
+                record.setModelInfo(appModelInfo);
+            }
+            //是否保险
+            String insuranceInfo = record.getInsuranceInfo();
+            if (StringUtils.isBlank(insuranceInfo)) {
+                record.setInsuranceInfo("-");
+            }
+        }
+        PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
+        ResultBean<BusSalesOrder> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(businessSid);
+        if(busSalesOrder == null){
+            return rb;
+        }
+        return rb.success().setData(busSalesOrder);
+    }
+
+    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(orderFlowableQuery, bv);
+        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        ResultBean resultBean = complete(bv);
+        if(resultBean.getSuccess()){
+            //更新销售订单的采购系统
+            //根据销售订单sid更新采购系统sid和采购系统名称
+            String purchaseSystemName = orderFlowableQuery.getPurchaseSystemName();
+            String purchaseSystemSid = orderFlowableQuery.getPurchaseSystemSid();
+            String salesOrderSid = orderFlowableQuery.getBusinessSid();
+            updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid);
+        }else{
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -95,7 +95,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span><span class="icon">*</span>付款方</span>
+            <span><span class="icon">*</span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item prop="payerName">

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue

@@ -89,7 +89,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span>付款方</span>
+            <span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
@@ -161,7 +161,7 @@
           </el-col>
           <el-col :span="6" class="trightb">
             <el-form-item>
-              {{ formobj.collectionMoney }}
+              <span>{{ formobj.collectionMoney }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6" class="tleftb">
@@ -169,7 +169,17 @@
           </el-col>
           <el-col :span="6" class="trightb">
             <el-form-item>
-              {{ formobj.balance }}
+              <span>{{ formobj.balance }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.reason !== ''">
+          <el-col :span="6" class="tleftb">
+            <el-form-item><span>审核状态</span></el-form-item>
+          </el-col>
+          <el-col :span="18" class="trightb">
+            <el-form-item>
+              <span>{{ formobj.reason }}</span>
             </el-form-item>
           </el-col>
         </el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue

@@ -98,7 +98,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span>付款方</span>
+            <span>付款方名称</span>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
@@ -182,6 +182,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="formobj.reason !== ''">
+          <el-col :span="6" class="tleftb">
+            <el-form-item><span>审核状态</span></el-form-item>
+          </el-col>
+          <el-col :span="18" class="trightb">
+            <el-form-item>
+              <span>{{ formobj.reason }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-table border :key="selectedreceivableKey" style="width: 100%" :data="formobj.finSelectedReceivablesDetaileds">
           <el-table-column label="合同编号" align="center">
             <template slot-scope="scope">

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

@@ -68,5 +68,7 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
 
+    private String reason;
+
 
 }

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

@@ -112,5 +112,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
 
+    private String reason;
+
 
 }

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

@@ -595,6 +595,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
         finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos);
+        if(finCollectionConfirmation.getAuditState() ==2){
+            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
+            finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
+        }else if(finCollectionConfirmation.getAuditState() == 3){
+            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
+            finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
+        }
         return rb.success().setData(finCollectionConfirmationDetailsVo);
     }
 
@@ -703,6 +710,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
                 qw.eq("useOrgSid", pagerQuery.getOrgPath());
             }
+            if(StringUtils.isNotBlank(pagerQuery.getUserSid())){
+                qw.eq("createBySid",pagerQuery.getUserSid());
+            }
         }
         qw.eq("pushMessgae", 0);
         return qw;
@@ -883,6 +893,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             images.add(url);
         }
         vo.setImages(images);
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
+        if(finCollectionConfirmation.getAuditState() ==2){
+//            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
+//            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
+            vo.setReason(finCollectionConfirmation.getReason());
+        }/*else if(finCollectionConfirmation.getAuditState() == 3){
+            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
+            vo.setReason(confirmationDetails);
+        }*/
         return rb.success().setData(vo);
     }
 
@@ -1155,6 +1174,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(useOrgSid)) {
             qw.eq("useOrgSid", useOrgSid);
         }
+        if(StringUtils.isNotBlank(userSid)){
+            qw.eq("createBySid",userSid);
+        }
         if (params.getSidList().size() > 0) {
             qw.notIn("sid", params.getSidList());
         }
@@ -1323,7 +1345,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
             }
         }
-        arReceivebill.setFREMARK(confirmation.getPayerName());
+        arReceivebill.setFREMARK("付款人:" + confirmation.getPayerName());
         //物料列表
         List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
@@ -1597,7 +1619,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (finSelectedReceivablesDetailedVos1_1.size() > 0) {
             for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
-                String customerNum = vvvv.getContractNo()+vvvv.getVIN();
+                String customerNum = "";
+                if (vvvv.getVIN().length() < 8) {
+                    customerNum = vvvv.getContractNo() + vvvv.getVIN();
+                } else {
+                    customerNum = vvvv.getVIN();
+                }
                 BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
@@ -1651,7 +1678,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i);
                 //先推送客户
-                String customerNum = vvvv.getContractNo()+vvvv.getVIN();
+                String customerNum = "";
+                if (vvvv.getVIN().length() < 8) {
+                    customerNum = vvvv.getContractNo() + vvvv.getVIN();
+                } else {
+                    customerNum = vvvv.getVIN();
+                }
                 BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
@@ -1680,7 +1712,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 arReceivebill.setF_PAEZ_AssistantKey("006");
                 arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                 if (finSelectedReceivablesDetailedVos1.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 1 &&
-                        finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 0) {
+                        finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos1_1.size() == 0) {
                     arReceivebill.setFBillNo(confirmation.getBillNo());
                 } else {
                     //单据编号
@@ -1857,7 +1889,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         String fname = name + vin;
         bdCustomer.setFName(fname);
-        String code = name + vin;
+        String code = HanZiConverterPinYin.getPinYinFirst(name) + vin;
         bdCustomer.setFNumber(code);
         return bdCustomer;
     }

anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml

@@ -25,10 +25,10 @@ image:
   url:
     prefix: http://192.168.1.116:8111/upload/
 kingdee: #金蝶的系统的链接账号 url等信息
-  acctID: 61dce6601125a0 #登录金蝶的账户信息 2022010测试
+  acctID: 63d9dee6684d6c #登录金蝶的账户信息 202302测试
-  userName: 信息部 #登录金蝶的账户信息 2022010测试的
+  userName: 信息部 #登录金蝶的账户信息 202302测试的
-  password: 123321 #登录金蝶的账户信息
+  password: 123456 #登录金蝶的账户信息
-  userName_administrator: administrator #登录金蝶的账户信息 2022010测试
+  userName_administrator: Administrator #登录金蝶的账户信息 202302测试
-  password_administrator: ANrui123456. #登录金蝶的账户信息 2022010测试
+  password_administrator: ANrui123456. #登录金蝶的账户信息 202302测试
   lcid: 2052 #登录金蝶的账户信息
   url: http://121.36.43.55 #金蝶财务系统ip地址

anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml

@@ -25,10 +25,10 @@ image:
   url:
     prefix: http://anrui.yyundong.com/upload/
 kingdee:
-  acctID: 61dce6601125a0 #登录金蝶的账户信息 2022010测试
+  acctID: 63d9dee6684d6c #登录金蝶的账户信息 202302测试
-  userName: 信息部 #登录金蝶的账户信息 2022010测试的
+  userName: 信息部 #登录金蝶的账户信息 202302测试的
-  password: 123321 #登录金蝶的账户信息
+  password: 123456 #登录金蝶的账户信息
-  userName_administrator: administrator #登录金蝶的账户信息 2022010测试
+  userName_administrator: Administrator #登录金蝶的账户信息 202302测试
-  password_administrator: ANrui123456. #登录金蝶的账户信息 2022010测试
+  password_administrator: ANrui123456. #登录金蝶的账户信息 202302测试
   lcid: 2052 #登录金蝶的账户信息
   url: http://121.36.43.55 #金蝶财务系统ip地址

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/ButtonPermissionQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.portal.api.sysfunction;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 查询按钮的权限的表单参数
+ */
+@ApiModel(value = "查询按钮的权限的表单参数", description = "查询按钮的权限的表单参数")
+@Data
+public class ButtonPermissionQuery {
+    @ApiModelProperty("userSid")
+    private String userSid;
+    @ApiModelProperty("url")
+    private String url;
+    @ApiModelProperty("type")
+    private String type;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/ButtonPermissionVo.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.api.sysfunction;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "返回查询的按钮权限集合", description = "返回查询的按钮权限集合")
+@Data
+public class ButtonPermissionVo {
+    @ApiModelProperty("buttonId")
+    private String buttonId;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java

@@ -44,6 +44,9 @@ public class SysFunction extends BaseEntity {
     @ApiModelProperty("移动端按钮id")
     private String funId;
 
+    @ApiModelProperty("前端控制按钮的id")
+    private String cId;
+    
 	@ApiModelProperty("是否手机端权限0否，1是")
     private String phoneFunction;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java

@@ -43,7 +43,8 @@ public class SysFunctionDto implements Dto {
 
 	@ApiModelProperty("移动端按钮id")
     private String funId;
-    
+    @ApiModelProperty("前端控制按钮的id")
+    private String cId;
 	@ApiModelProperty("是否手机端权限0否，1是")
     private String phoneFunction;
 	@ApiModelProperty("备注")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java

@@ -82,4 +82,7 @@ public interface SysFunctionFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysFunctionVo> fetchBySid(@PathVariable("sid") String sid);
+    @ApiOperation("查询按钮的权限")
+    @PostMapping("/getButtonPermissions")
+    public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java

@@ -89,4 +89,9 @@ public class SysFunctionFeignFallback implements SysFunctionFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_portal/sysfunction/fetchBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java

@@ -43,7 +43,8 @@ public class SysFunctionQuery implements Query {
     
 	@ApiModelProperty("移动端按钮id")
     private String funId;
-
+    @ApiModelProperty("前端控制按钮的id")
+    private String cId;
 
 	@ApiModelProperty("是否手机端权限0否，1是")
     private String phoneFunction;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java

@@ -48,4 +48,8 @@ public class SysFunctionVo implements Vo {
     private String sourceSid;
     @ApiModelProperty("是否可用")
     private Integer isEnable;
+    @ApiModelProperty("移动端按钮id")
+    private String funId;
+    @ApiModelProperty("前端控制按钮的id")
+    private String cId;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@@ -5,9 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.portal.api.sysfunction.SysFunction;
+import com.yxt.anrui.portal.api.sysfunction.*;
-import com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo;
+import com.yxt.common.core.result.ResultBean;
-import com.yxt.anrui.portal.api.sysfunction.SysFunctionVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -56,4 +55,6 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
      * @return
      */
     int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
+
+     List<ButtonPermissionVo>  getButtonPermissions(@Param("query")ButtonPermissionQuery query);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml

@@ -60,4 +60,11 @@
         where sf.isEnable = #{isEnable}
           and ssf.sourceSid = #{sourceSid}
     </select>
+    <select id="getButtonPermissions" resultType="com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo">
+        select sf.cId as buttonId from sys_function sf
+        where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid in(
+            SELECT srf.functionSid FROM sys_user_role sur
+            LEFT JOIN sys_role_function srf  ON sur.roleSid = srf.rolesid
+            WHERE sur.userSid=#{query.userSid})
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java

@@ -192,4 +192,10 @@ public class SysFunctionRest implements SysFunctionFeign {
         }
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
+        ResultBean<List<ButtonPermissionVo>> rb = ResultBean.fireFail();
+        return rb.success().setData(sysFunctionService.getButtonPermissions(query));
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -10,6 +10,7 @@ import com.yxt.anrui.portal.biz.syssourcefunction.SysSourceFunctionService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -234,4 +235,9 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
 	public int updateBySourceSid(Integer isEnable, List<String> sids) {
 		return baseMapper.updateBySourceSid(isEnable, sids);
 	}
+
+    public  List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
+		List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
+		return buttonPermissions ;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -144,6 +144,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             String createOrgSid = record.getCreateOrgSid();
             String id = record.getId();
             List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid);
+            scmVehicleStayInventoryVos.removeAll(Collections.singleton(null));
             if (scmVehicleStayInventoryVos.size() > 0) {
                 ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
                 record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
@@ -248,19 +249,14 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         List<AppScmVehicleStayInventoryListPageVo> records = iPage.getRecords();
         for (AppScmVehicleStayInventoryListPageVo record : records) {
             List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(record.getVin(), record.getId(), record.getCreateOrgSid());
-            if (scmVehicleStayInventoryVos.removeAll(Collections.singleton(null))) {
+            scmVehicleStayInventoryVos.removeAll(Collections.singleton(null));
-                if (scmVehicleStayInventoryVos.size() <= 0) {
+            if(scmVehicleStayInventoryVos.size()>0){
-                    record.setInventoryDate("无");
-                } else {
                 ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
                 record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
-                }
-                if (scmVehicleStayInventoryVos.size() <= 0) {
-                    record.setInventoryName("无");
-                } else {
-                    ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
                 record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
-                }
+            }else{
+                record.setInventoryDate("无");
+                record.setInventoryName("无");
             }
         }
         return iPage;

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

@@ -32,10 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@@ -295,5 +292,22 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto);
 
+    @ApiOperation("App销售订单分页列表")
+    @PostMapping("/getSaleOrdersByOrgPath")
+    @ResponseBody
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<BusOrderQuery> pq);
+
+    @ApiOperation("销售支持部经理获取下一环节")
+    @GetMapping("/getFlowOperateTitleBy")
+    @ResponseBody
+    ResultBean<FlowOrderVo> getFlowOperateTitleBy(@SpringQueryMap SaleOrderQuery query);
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeSaleOrderInfoBy")
+    @ResponseBody
+    ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
+
+
+
 
 }

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

@@ -31,10 +31,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@@ -261,4 +258,19 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean saveSaleOrderVin(InputVinDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
+        return null;
+    }
 }

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

@@ -22,4 +22,7 @@ public class SaleOrderQuery implements Query {
     @ApiModelProperty(value = "0 上一环节  1下一环节")
     @NotNull(message = "参数错误：next")
     private Integer next;
+
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
 }

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

@@ -0,0 +1,42 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/2 13:47
+ * @Description
+ */
+@Data
+public class SaleOrderQueryBy implements Query {
+    private static final long serialVersionUID = 2845814240351212265L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+}

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/2 9:25
+ * @Description
+ */
+@Data
+public class BusOrderQuery implements Query {
+    private static final long serialVersionUID = 455461311930734575L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称")
+    private String name;
+    
+    @ApiModelProperty("当前组织机构全路径sid")
+    private String orgPath;
+}

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

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.base.common.SystemVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/2 11:48
+ * @Description
+ */
+@Data
+public class FlowOrderVo implements Vo {
+    private static final long serialVersionUID = -6393160265118686111L;
+    @ApiModelProperty("操作环节标题")
+    private String title;
+    @ApiModelProperty("采购系统下拉框")
+    private List<SystemVo> list;
+    //默认的采购系统
+    @ApiModelProperty("部门sid")
+    @JsonProperty("dictKey")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    @JsonProperty("dictValue")
+    private String purchaseSystemName;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java

@@ -58,5 +58,7 @@ public class ConfirmationDetailedVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    private String reason;
 }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.terminal.api.app.flowable.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -78,7 +79,8 @@ public class AppService {
         List<AppFlowableRecordVo> progressList = progressdata.getData();
         progressList.forEach(f->{
             AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo();
-            a.setTime(f.getCreateTime());
+            a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime());
+           // a.setTime(f.getCreateTime());
             a.setFlowableRecordVo(f);
             a.setState(0+"");
             list.add(a);

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

@@ -32,10 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@@ -349,4 +346,19 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saveSaleOrderVin(dto);
     }
 
+    @Override
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pq) {
+        return appBusSalesOrderService.getSaleOrdersByOrgPath(pq);
+    }
+
+    @Override
+    public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
+        return appBusSalesOrderService.getFlowOperateTitleBy(query);
+    }
+
+    @Override
+    public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
+        return appBusSalesOrderService.agreeSaleOrderInfoBy(dto);
+    }
+
 }

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

@@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
@@ -36,6 +38,7 @@ import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
@@ -70,6 +73,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@@ -77,10 +82,6 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositList
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@@ -95,6 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.base.common.SystemVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -153,6 +155,8 @@ public class AppBusSalesOrderService {
     private CommonContractFeign commonContractFeign;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -194,8 +198,6 @@ public class AppBusSalesOrderService {
     /**
      * 初始化销售订单单据信息
      *
-     * @param saleOrderSid
-     * @param userSid
      * @return
      */
     public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(OrderInitQuery orderInitQuery) {
@@ -621,4 +623,67 @@ public class AppBusSalesOrderService {
         }
         return rb.success().setData(remarksVo);
     }
+
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pagerQuery) {
+        ResultBean<PagerVo<BusOrderSalesVo>> rb = ResultBean.fireFail();
+        PagerQuery<OrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrdersByOrgPath(pq);
+        PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
+        return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
+    }
+
+    public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
+        ResultBean<FlowOrderVo> rb = ResultBean.fireFail();
+        FlowOrderVo flowOrderVo = new FlowOrderVo();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        BusSaleOrderNodeQuery getNodeQuery = new BusSaleOrderNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<BusSaleOrderNodeVo>> getPreviousNodesForReject = busSalesOrderFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<BusSaleOrderNodeVo>> getNextNodesForSubmit = busSalesOrderFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        flowOrderVo.setTitle(data);
+        //查询销售订单
+        ResultBean<BusSalesOrder> busSalesOrderResultBean = busSalesOrderFeign.selectBySid(query.getBusinessSid());
+        if (busSalesOrderResultBean.getSuccess()) {
+            BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData();
+            flowOrderVo.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+            flowOrderVo.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+            //查询该分公司下的采购系统
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                ResultBean<List<AppBasePurchSystemVo>> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(query.getOrgPath());
+                List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
+                flowOrderVo.setList(list);
+            }
+        }
+        return rb.success().setData(flowOrderVo);
+    }
+
+    public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
+        ResultBean rb = ResultBean.fireFail();
+        OrderFlowableQuery busSalesOrderFlowQuery = new OrderFlowableQuery();
+        BeanUtil.copyProperties(dto, busSalesOrderFlowQuery);
+        ResultBean resultBean = busSalesOrderFeign.completeBy(busSalesOrderFlowQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
 }