Merge remote-tracking branch 'origin/master'

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

@@ -863,7 +863,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
         }
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -872,6 +872,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+            map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -985,7 +999,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
         }
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -994,6 +1008,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+            map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -1413,7 +1441,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String idNo = crmCustomerTempVo.getIDNumber();
         map.put("customerName", appOrderDetailsVo.getName());
         map.put("idNo", idNo);
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+       /* if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1422,6 +1450,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         String ftl = "receiveCar";
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
@@ -1560,7 +1602,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
         map.put("contractNo", "D" + map.get("contractNo"));
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1569,6 +1611,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
         if (commonContract != null) {
@@ -1661,7 +1717,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("day", day);
         }
         BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1670,6 +1726,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板
@@ -1762,7 +1832,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("day", day);
         }
         BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
-        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+        /*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
             map.put("createOrgName", dto.getCreateOrgName());
         } else {
             if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
@@ -1771,6 +1841,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                 }
             }
+        }*/
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
+            map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
+        }else{
+            if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+                map.put("createOrgName", dto.getCreateOrgName());
+            } else {
+                if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
+                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
+                    if (invoicingDetailsVoResultBean.getData() != null) {
+                        map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                    }
+                }
+            }
         }
         if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
             //获取模板

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

@@ -147,4 +147,9 @@ public class BusSalesOrder extends BaseEntity {
     private String nowCarUnknownVinNum;
     @ApiModelProperty("是否是挂靠公司")
     private int affiliatedCompanyType;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -178,4 +178,9 @@ public class BusSalesOrderDetailsVo implements Vo {
 
     @ApiModelProperty(value = "总优惠")
     private String totaldiscount;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -69,4 +69,13 @@ public class AppBusSalesOrderAllDto implements Dto {
     @ApiModelProperty("当前组织机构全路径sid")
     private String orgPath;
 
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+
+  /*  @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;*/
 }

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

@@ -69,4 +69,9 @@ public class AppBusSalesOrderBillInfoVo implements Vo {
     @ApiModelProperty("客户类型value")
     private String customerClass;
 
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+
 }

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

@@ -145,5 +145,10 @@ public class AppOrderDetailsVo implements Vo {
 
     private String procDefId;
 
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+
 
 }

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

@@ -39,4 +39,9 @@ public class OrderFlowableQuery implements Query {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -1273,7 +1273,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             }
         }
         if(showNotice){
-//            allDownloadUrl = getFileUrlNew(dto);
+            allDownloadUrl = getFileUrlNew(dto);
         }
         return allDownloadUrl;
     }
@@ -1302,11 +1302,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                 if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
                     BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1380,11 +1390,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();
@@ -1523,11 +1543,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                     Map<String, Object> carMap = new HashMap<>();
                     BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1598,11 +1628,21 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();

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

@@ -245,4 +245,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     String selectByBusSid1D(String sid);
 
     String selectByBusVinSid1(String sid);
+
+    FinCompanyInvoicing selectByIncovingSid(String companyInvoicingSid);
 }

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

@@ -222,7 +222,8 @@
                financePlanValue,
                licensePlateKey,
                licensePlateValue,
-        customerClass,customerClassKey
+        customerClass,customerClassKey,
+        companyInvoicingName,companyInvoicingSid
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>
@@ -332,7 +333,9 @@
                bo.contractNo                             contractId,
                bo.financePlan,
                procDefId,
-               nodeId                                 as taskDefKey
+               nodeId                                 as taskDefKey,
+        bo.companyInvoicingSid,
+        bo.companyInvoicingName
         from bus_sales_order bo
         where sid = #{sid}
     </select>
@@ -680,4 +683,8 @@
         from anrui_fin.fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
     </select>
+
+    <select id="selectByIncovingSid" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing">
+        select * from anrui_fin.fin_company_invoicing where sid = #{companyInvoicingSid}
+    </select>
 </mapper>

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

@@ -2285,7 +2285,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
                 busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());
                 busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey());
-
+                FinCompanyInvoicing finCompanyInvoicingNew = baseMapper.selectByIncovingSid(busSalesOrder.getCompanyInvoicingSid());
+                if (finCompanyInvoicingNew != null) {
+                    busSalesOrder.setPurchaseSystemSid(finCompanyInvoicingNew.getPurchaseSystemSid());
+                    busSalesOrder.setPurchaseSystemName(finCompanyInvoicingNew.getPurchaseSystemName());
+                }
                 busSalesOrder.setCreateDate(new Date());
                 if ("0".equals(affiliatedType)) {
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
@@ -2365,12 +2369,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 //修改销售订单
                 boolean isTrue = false;
+                boolean issTrue = false;
                 BusSalesOrder busSalesOrder = fetchBySid(dto.getSid());
                 if (busSalesOrder == null) {
                     return rb.setMsg("该销售订单不存在");
                 }
                 if (!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())) {
                     isTrue = true;
+                }else{
+                    if("2".equals(busSalesOrder.getPayTypeKey())){//贷款
+                        if(!busSalesOrder.getFinancePlan().equals(dto.getFinancePlan())){
+                            issTrue = true;
+                        }
+                    }
                 }
                 BeanUtil.copyProperties(dto, busSalesOrder, "sid");
                 if ("0".equals(affiliatedType)) {
@@ -2392,6 +2403,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
                 busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());
                 busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey());
+                FinCompanyInvoicing finCompanyInvoicingNew = baseMapper.selectByIncovingSid(busSalesOrder.getCompanyInvoicingSid());
+                if (finCompanyInvoicingNew != null) {
+                    busSalesOrder.setPurchaseSystemSid(finCompanyInvoicingNew.getPurchaseSystemSid());
+                    busSalesOrder.setPurchaseSystemName(finCompanyInvoicingNew.getPurchaseSystemName());
+                }
                 boolean isUpdate = updateById(busSalesOrder);
                 if (!isUpdate) {
                     return rb.setMsg("修改失败");
@@ -2401,7 +2417,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //如果选择的为自有资金的，需要删除金融方案
                 //补充：01担保、02非担保
-                if ("1".equals(busSalesOrder.getFinancePlan()) || isTrue || "01".equals(busSalesOrder.getFinancePlan()) || "02".equals(busSalesOrder.getFinancePlan())) {
+               /* if ("1".equals(busSalesOrder.getFinancePlan()) || isTrue || "01".equals(busSalesOrder.getFinancePlan()) || "02".equals(busSalesOrder.getFinancePlan())) {
+                    //删除和该销售订单相关的金融方案
+                    ResultBean deleteResultBean = loanSolutionsFeign.deleteByOrderSid(busSalesOrder.getSid());
+                }*/
+                if ("1".equals(busSalesOrder.getFinancePlan()) || isTrue || issTrue) {
                     //删除和该销售订单相关的金融方案
                     ResultBean deleteResultBean = loanSolutionsFeign.deleteByOrderSid(busSalesOrder.getSid());
                 }
@@ -6702,7 +6722,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @param orderFlowableQuery 参数
      * @return
      */
-    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
+    public ResultBean completeByOld(OrderFlowableQuery orderFlowableQuery) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
         if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType()) || (com.yxt.common.base.utils.StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
@@ -6743,6 +6763,93 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
+    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(orderFlowableQuery, bv);
+        bv.setModelId(busSalesOrder.getProcDefId());
+        //若为贷款业务的，在金融服务经理审批环节可以调整开票单位信息。全款业务的，在销售支持部审批环节可以调整开票单位信息。
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+            if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核
+                if (StringUtils.isBlank(orderFlowableQuery.getCompanyInvoicingSid())) {
+                    return rb.setMsg("开票单位不能为空");
+                }
+            }
+        } else {//贷款
+            if ("Activity_1ckx8lq".equals(bv.getTaskDefKey())) {//金融服务部经理审批
+                if (StringUtils.isBlank(orderFlowableQuery.getCompanyInvoicingSid())) {
+                    return rb.setMsg("开票单位不能为空");
+                }
+            }
+        }
+        ResultBean resultBean = complete(bv, true);
+        if (resultBean.getSuccess()) {
+            busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
+            if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+                if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核
+                    String companyInvoicingName = orderFlowableQuery.getCompanyInvoicingName();
+                    String companyInvoicingSid = orderFlowableQuery.getCompanyInvoicingSid();
+                    busSalesOrder.setCompanyInvoicingSid(companyInvoicingSid);
+                    busSalesOrder.setCompanyInvoicingName(companyInvoicingName);
+                    FinCompanyInvoicing finCompanyInvoicingNew = baseMapper.selectByIncovingSid(busSalesOrder.getCompanyInvoicingSid());
+                    if (finCompanyInvoicingNew != null) {
+                        busSalesOrder.setPurchaseSystemSid(finCompanyInvoicingNew.getPurchaseSystemSid());
+                        busSalesOrder.setPurchaseSystemName(finCompanyInvoicingNew.getPurchaseSystemName());
+                    }
+                    baseMapper.updateById(busSalesOrder);
+                    //保存合同
+                    OrderContractQuery orderContractQuery = new OrderContractQuery();
+                    orderContractQuery.setSid(bv.getBusinessSid());
+                    orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
+                    if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
+                        saveContract(orderContractQuery);
+                    } else {
+                        updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
+                    }
+                }
+            } else {//贷款
+                if ("Activity_1ckx8lq".equals(bv.getTaskDefKey())) {//金融服务部经理审批
+                    String companyInvoicingName = orderFlowableQuery.getCompanyInvoicingName();
+                    String companyInvoicingSid = orderFlowableQuery.getCompanyInvoicingSid();
+                    busSalesOrder.setCompanyInvoicingSid(companyInvoicingSid);
+                    busSalesOrder.setCompanyInvoicingName(companyInvoicingName);
+                    FinCompanyInvoicing finCompanyInvoicingNew = baseMapper.selectByIncovingSid(busSalesOrder.getCompanyInvoicingSid());
+                    if (finCompanyInvoicingNew != null) {
+                        busSalesOrder.setPurchaseSystemSid(finCompanyInvoicingNew.getPurchaseSystemSid());
+                        busSalesOrder.setPurchaseSystemName(finCompanyInvoicingNew.getPurchaseSystemName());
+                    }
+                    baseMapper.updateById(busSalesOrder);
+                    //保存合同
+                    OrderContractQuery orderContractQuery = new OrderContractQuery();
+                    orderContractQuery.setSid(bv.getBusinessSid());
+                    orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
+                    if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
+                        saveContract(orderContractQuery);
+                    } else {
+                        updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
+                    }
+                }
+            }
+            //销售订单在销售支持部经理审核后，自动生成应收，此时也可以生成合同，生成合同的同时生成合同审核待办。
+            //查询应收是否已生成
+           /* if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核
+                //保存合同
+                OrderContractQuery orderContractQuery = new OrderContractQuery();
+                orderContractQuery.setSid(bv.getBusinessSid());
+                orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
+                if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
+                    saveContract(orderContractQuery);
+                } else {
+                    updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
+                }
+            }*/
+        } else {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
+
     public ResultBean<String> selectTemporaryNo(String vehSid, String contractNo) {
         ResultBean<String> rb = ResultBean.fireFail();
         BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid, contractNo);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -277,202 +277,18 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                 if (StringUtils.isNotBlank(topSidVin)) {
                                     if (!topSidVin.equals(topSid)) {
                                         szConfig(salesOrderSid, topSid, topPrice);
-                                   /* busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
-                                    //新增上装
-                                    BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
-                                    BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
-                                    busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
-                                    //上装名称
-                                    busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
-                                    busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
-                                    //委改方式
-                                    busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
-                                    busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
-                                    //委改厂
-                                    busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
-                                    //外廓尺寸
-                                    busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
-                                    busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
-                                    busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
-                                    //板材材质
-                                    busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
-                                    busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
-                                    //板材厚度
-                                    busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
-                                    busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
-                                    busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
-                                    //上装价格
-                                    if (StringUtils.isNotBlank(topPrice)) {
-                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
-                                    }
-                                    //更多配置
-                                    busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
-                                    //颜色
-                                    busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
-                                    busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
-                                    //篷布滑道
-                                    busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
-                                    //冷藏冷机
-                                    busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
-                                    //自卸液压盖板
-                                    busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
-                                    //地板加热
-                                    busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
-                                    busSalesOrderMakeup.setBuyTypeKey("01");
-                                    busSalesOrderMakeup.setBuyTypeValue("公司采购");
-                                    busSalesOrderMakeup.setIsMain(0);
-                                    busSalesOrderMakeupService.insert(busSalesOrderMakeup);
-                                    busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
                                     } else {
                                         BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid);
                                         if (busSalesOrderMakeupDetailsVo == null) {
                                             szConfig(salesOrderSid, topSid, topPrice);
-                                       /* //新增上装
-                                        BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
-                                        BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
-                                        busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
-                                        //上装名称
-                                        busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
-                                        busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
-                                        //委改方式
-                                        busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
-                                        busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
-                                        //委改厂
-                                        busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
-                                        //外廓尺寸
-                                        busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
-                                        busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
-                                        busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
-                                        //板材材质
-                                        busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
-                                        busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
-                                        //板材厚度
-                                        busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
-                                        busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
-                                        busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
-                                        //上装价格
-                                        if (StringUtils.isNotBlank(topPrice)) {
-                                            busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
-                                        }
-                                        //更多配置
-                                        busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
-                                        //颜色
-                                        busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
-                                        busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
-                                        //篷布滑道
-                                        busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
-                                        //冷藏冷机
-                                        busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
-                                        //自卸液压盖板
-                                        busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
-                                        //地板加热
-                                        busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
-                                        busSalesOrderMakeup.setBuyTypeKey("01");
-                                        busSalesOrderMakeup.setBuyTypeValue("公司采购");
-                                        busSalesOrderMakeup.setIsMain(0);
-                                        busSalesOrderMakeupService.insert(busSalesOrderMakeup);
-                                        busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
-
                                         }
                                     }
                                 } else {
                                     if (StringUtils.isNotBlank(topSid)) {
                                         szConfig(salesOrderSid, topSid, topPrice);
-                                  /*  busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
-                                    //新增上装
-                                    BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
-                                    BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
-                                    busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
-                                    //上装名称
-                                    busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
-                                    busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
-                                    //委改方式
-                                    busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
-                                    busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
-                                    //委改厂
-                                    busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
-                                    //外廓尺寸
-                                    busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
-                                    busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
-                                    busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
-                                    //板材材质
-                                    busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
-                                    busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
-                                    //板材厚度
-                                    busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
-                                    busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
-                                    busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
-                                    //上装价格
-                                    if (StringUtils.isNotBlank(topPrice)) {
-                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
-                                    }
-                                    //更多配置
-                                    busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
-                                    //颜色
-                                    busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
-                                    busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
-                                    //篷布滑道
-                                    busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
-                                    //冷藏冷机
-                                    busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
-                                    //自卸液压盖板
-                                    busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
-                                    //地板加热
-                                    busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
-                                    busSalesOrderMakeup.setBuyTypeKey("01");
-                                    busSalesOrderMakeup.setBuyTypeValue("公司采购");
-                                    busSalesOrderMakeup.setIsMain(0);
-                                    busSalesOrderMakeupService.insert(busSalesOrderMakeup);
-                                    busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
                                     }
                                 }
                             } else {
-                            /*busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
-                            //新增上装
-                            BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
-                            BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
-                            busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
-                            //上装名称
-                            busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
-                            busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
-                            //委改方式
-                            busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
-                            busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
-                            //委改厂
-                            busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
-                            //外廓尺寸
-                            busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
-                            busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
-                            busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
-                            //板材材质
-                            busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
-                            busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
-                            //板材厚度
-                            busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
-                            busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
-                            busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
-                            //上装价格
-                            if (StringUtils.isNotBlank(topPrice)) {
-                                busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
-                            }
-                            //更多配置
-                            busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
-                            //颜色
-                            busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
-                            busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
-                            //篷布滑道
-                            busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
-                            //冷藏冷机
-                            busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
-                            //自卸液压盖板
-                            busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
-                            //地板加热
-                            busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
-                            busSalesOrderMakeup.setBuyTypeKey("01");
-                            busSalesOrderMakeup.setBuyTypeValue("公司采购");
-                            busSalesOrderMakeup.setIsMain(0);
-                            busSalesOrderMakeupService.insert(busSalesOrderMakeup);
-                            busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
                                 szConfig(salesOrderSid, topSid, topPrice);
                             }
                         }
@@ -739,8 +555,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                 return rb.setMsg("采购数量不能为空");
             }
             num = Integer.parseInt(dto.getArrangeNumber());
-            busSalesOrder.setPurchaseSystemName("");
-            busSalesOrder.setPurchaseSystemSid("");
+          /*  busSalesOrder.setPurchaseSystemName("");
+            busSalesOrder.setPurchaseSystemSid("");*/
             busSalesOrderService.updateById(busSalesOrder);
         }
         //新增或更新价格信息中的台数及单台销售指导价

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -173,7 +173,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (nowCarList.size() > 0) {
             String linkSid = nowCarList.get(0).getLinkSid();
             //根据车辆sid查询采购系统sid和采购系统名称
-            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid);
+            /*ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid);
             if (vehicleSelectVoResultBean.getData() != null) {
                 BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
                 //采购系统sid
@@ -183,7 +183,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 //根据销售订单sid更新采购系统sid和采购系统名称
                 busSalesOrderService.updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid);
 
-            }
+            }*/
             for (int i = 0; i < nowCarList.size(); i++) {
                 AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList.get(i);
                 if (appBusSalesOrderVehicleDto != null) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -131,7 +131,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         if (readyCarList.size() > 0) {
             String linkSid = readyCarList.get(0).getLinkSid();
             //根据采购订单查询采购系统的sid和采购系统的名称
-            ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid);
+           /* ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid);
             if(getDetails.getData() != null){
                 BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
                 //采购系统sid
@@ -140,7 +140,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
                 String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
                 //根据销售订单sid更新采购系统sid和采购系统名称
                 busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
-            }
+            }*/
             for (int i = 0; i < readyCarList.size(); i++) {
                 AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/AppCompanyInvoicingVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/23
+ **/
+@Data
+public class AppCompanyInvoicingVo {
+
+    private String id;
+    private String dictValue;
+    private InvoicingExtra extra;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/CompanyInvoicingVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/22
+ **/
+@Data
+public class CompanyInvoicingVo {
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -176,4 +176,16 @@ public interface FinCompanyInvoicingFeign {
     @PostMapping("/qyAppSelByUseOrgSid2")
     @ResponseBody
     List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey);
+
+
+    @ApiOperation("获取分公司的开票单位")
+    @GetMapping("/getInvoicingList")
+    @ResponseBody
+    ResultBean<List<CompanyInvoicingVo>> getInvoicingList(@RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("获取分公司的开票单位")
+    @GetMapping("/getAppInvoicingList")
+    @ResponseBody
+    ResultBean<List<AppCompanyInvoicingVo>> getAppInvoicingList(@RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -169,4 +169,14 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<CompanyInvoicingVo>> getInvoicingList(String orgPath) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AppCompanyInvoicingVo>> getAppInvoicingList(String orgPath, String search) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingExtra.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/23
+ **/
+@Data
+public class InvoicingExtra {
+
+    private String name;
+    private String sid;
+    private String info;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1073,11 +1073,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
                     FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1151,11 +1161,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();
@@ -1298,11 +1318,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     Map<String, Object> carMap = new HashMap<>();
                     FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
                     //生成开票申请书
-                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                    /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                         if (invoicingDetailsVoResultBean.getData() != null) {
                             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                         }
+                    }*/
+                    if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                        map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                    }else{
+                        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                            if (invoicingDetailsVoResultBean.getData() != null) {
+                                map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                            }
+                        }
                     }
                     map.put("contractNo", busSalesOrder.getContractNo());
                     List<BillFileVo> list = new ArrayList<>();
@@ -1373,11 +1403,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 carMap.put("invoiceName", finCompanyInvoicing.getName());//开票名称
                             }
                             carMap.put("contractNo", "D" + map.get("contractNo"));
-                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                            /*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
                                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
                                 if (invoicingDetailsVoResultBean.getData() != null) {
                                     carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
                                 }
+                            }*/
+                            if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
+                                carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
+                            }else{
+                                if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                    if (invoicingDetailsVoResultBean.getData() != null) {
+                                        carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                    }
+                                }
                             }
                             carMap.put("date", date);
                             List<CarContractListVo> carContractListVos = new ArrayList<>();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -90,4 +90,8 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 
     @Select("select * from fin_company_invoicing where sid = #{affiliatedCompanySid}")
     FinCompanyInvoicingDetailsVo selectInvoingBySid(String affiliatedCompanySid);
+
+    List<CompanyInvoicingVo> getInvoicingList(String useOrgSid);
+
+    List<AppCompanyInvoicingVo> getAppInvoicingList(@Param("useOrgSid") String useOrgSid, @Param("search") String search);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -124,4 +124,15 @@
           and useOrgSid = #{useOrgSid}
           and isDelete = 0
     </select>
+
+    <select id="getInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.CompanyInvoicingVo">
+        select name companyInvoicingName,sid companyInvoicingSid,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
+    </select>
+
+    <select id="getAppInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.AppCompanyInvoicingVo">
+        select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
+        <if test="search != null and search != ''">
+            and name like concat('%',#{search},'%')
+        </if>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -202,4 +202,14 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) {
         return finCompanyInvoicingService.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
     }
+
+    @Override
+    public ResultBean<List<CompanyInvoicingVo>> getInvoicingList(String orgPath) {
+        return finCompanyInvoicingService.getInvoicingList(orgPath);
+    }
+
+    @Override
+    public ResultBean<List<AppCompanyInvoicingVo>> getAppInvoicingList(String orgPath, String search) {
+        return finCompanyInvoicingService.getAppInvoicingList(orgPath,search);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basedistributor.AppDisAndCustm;
+import com.yxt.anrui.base.api.basedistributor.Extra;
 import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
 import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
@@ -59,6 +61,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -577,4 +580,28 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = baseMapper.selectInvoingBySid(affiliatedCompanySid);
         return rb.success().setData(finCompanyInvoicingDetailsVo);
     }
+
+    public ResultBean<List<CompanyInvoicingVo>> getInvoicingList(String orgPath) {
+        ResultBean<List<CompanyInvoicingVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<CompanyInvoicingVo> list = baseMapper.getInvoicingList(useOrgSid);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
+
+    public ResultBean<List<AppCompanyInvoicingVo>> getAppInvoicingList(String orgPath, String search) {
+        ResultBean<List<AppCompanyInvoicingVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<AppCompanyInvoicingVo> list = baseMapper.getAppInvoicingList(useOrgSid,search);
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            for (AppCompanyInvoicingVo v : list) {
+                InvoicingExtra extra = new InvoicingExtra();
+                extra.setSid(v.getId());
+                extra.setName(v.getDictValue());
+                v.setExtra(extra);
+            }
+        }
+        return rb.success().setData(list);
+    }
 }

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

@@ -39,4 +39,9 @@ public class SaleOrderQueryBy implements Query {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -73,4 +73,14 @@ public class BusOrerSalesAllDto implements Dto {
 
     @ApiModelProperty("当前组织机构全路径sid")
     private String orgPath;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+
+  /*  @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/BusSalesOrderBillInfoVo.java

@@ -72,4 +72,9 @@ public class BusSalesOrderBillInfoVo implements Vo {
     private String customerClassKey;
     @ApiModelProperty("客户类型value")
     private String customerClass;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -28,4 +28,9 @@ public class FlowOrderVo implements Vo {
     @ApiModelProperty("是否显示")
     @JsonProperty("isShow")
     private boolean isShow;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -113,5 +113,10 @@ public class OrderDetailsVo implements Vo {
     private String procDefId;
     private String taskDefKey;
 
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo.java

@@ -14,9 +14,15 @@ import lombok.Data;
 public class SystemVo implements Vo {
     private static final long serialVersionUID = 1398500358286529937L;
     @ApiModelProperty("部门sid")
-    @JsonProperty("dictKey")
     private String deptSid;
     @ApiModelProperty("采购系统名称")
-    @JsonProperty("dictValue")
     private String purchaseSystemName;
+
+
+    @ApiModelProperty("开票单位名称")
+    @JsonProperty("dictValue")
+    private String companyInvoicingName;
+    @JsonProperty("dictKey")
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

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

@@ -76,6 +76,9 @@ import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeD
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.CompanyInvoicingVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@@ -181,6 +184,8 @@ public class AppBusSalesOrderService {
     private AppSubsetVersionFeign appSubsetVersionFeign;
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -668,7 +673,7 @@ public class AppBusSalesOrderService {
         return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
     }
 
-    public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
+    public ResultBean<FlowOrderVo> getFlowOperateTitleByOld(SaleOrderQuery query) {
         ResultBean<FlowOrderVo> rb = ResultBean.fireFail();
         FlowOrderVo flowOrderVo = new FlowOrderVo();
         //0 上一环节  1下一环节
@@ -717,6 +722,68 @@ public class AppBusSalesOrderService {
         return rb.success().setData(flowOrderVo);
     }
 
+    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());
+            flowOrderVo.setCompanyInvoicingName(busSalesOrder.getCompanyInvoicingName());
+            flowOrderVo.setCompanyInvoicingSid(busSalesOrder.getCompanyInvoicingSid());
+            //查询该分公司下的采购系统
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                ResultBean<List<CompanyInvoicingVo>> resultBean = finCompanyInvoicingFeign.getInvoicingList(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);
+            }
+            //若为贷款业务的，在金融服务经理审批环节可以调整开票单位信息。全款业务的，在销售支持部审批环节可以调整开票单位信息。
+            if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+                if ("Activity_10w0sy1".equals(query.getTaskDefKey())) {//销售支持部经理审核
+                    flowOrderVo.setShow(true);
+                }
+
+            } else {//贷款
+                if("Activity_1ckx8lq".equals(query.getTaskDefKey())){//金融服务部经理审批
+                    flowOrderVo.setShow(true);
+                }
+            }
+           /* if ("3".equals(busSalesOrder.getType()) || (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
+                flowOrderVo.setShow(true);
+            } else {
+                flowOrderVo.setShow(false);
+            }*/
+        }
+        return rb.success().setData(flowOrderVo);
+    }
+
     public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
         ResultBean rb = ResultBean.fireFail();
         OrderFlowableQuery busSalesOrderFlowQuery = new OrderFlowableQuery();