diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index 820e54323a..9fea4c884a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 03bdd2e2b4..e701ea1f94 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/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; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java index f217bc2738..0d359ae3cd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java +++ b/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;*/ } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java index 07119b5672..f6785cf3eb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 1d8da905ed..44c42d073f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java index d04e99ae36..7e3f9002c6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index ab74a9602f..69c7908aaf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/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 { String selectByBusSid1D(String sid); String selectByBusVinSid1(String sid); + + FinCompanyInvoicing selectByIncovingSid(String companyInvoicingSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 064165883c..da7d99f428 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/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} @@ -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} @@ -680,4 +683,8 @@ from anrui_fin.fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金') + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index b5c3c9b2c3..24b6b217a2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 selectTemporaryNo(String vehSid, String contractNo) { ResultBean rb = ResultBean.fireFail(); BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid, contractNo); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 40bc874235..5148dbe8b0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/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 0) { String linkSid = nowCarList.get(0).getLinkSid(); //根据车辆sid查询采购系统sid和采购系统名称 - ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid); + /*ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid); if (vehicleSelectVoResultBean.getData() != null) { BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); //采购系统sid @@ -183,7 +183,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService 0) { String linkSid = readyCarList.get(0).getLinkSid(); //根据采购订单查询采购系统的sid和采购系统的名称 - ResultBean getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid); + /* ResultBean getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid); if(getDetails.getData() != null){ BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); //采购系统sid @@ -140,7 +140,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey); + + + @ApiOperation("获取分公司的开票单位") + @GetMapping("/getInvoicingList") + @ResponseBody + ResultBean> getInvoicingList(@RequestParam("orgPath") String orgPath); + + @ApiOperation("获取分公司的开票单位") + @GetMapping("/getAppInvoicingList") + @ResponseBody + ResultBean> getAppInvoicingList(@RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index f5b8819c1d..0c46ccae75 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/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 qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) { return null; } + + @Override + public ResultBean> getInvoicingList(String orgPath) { + return null; + } + + @Override + public ResultBean> getAppInvoicingList(String orgPath, String search) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingExtra.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingExtra.java new file mode 100644 index 0000000000..0214a123d6 --- /dev/null +++ b/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; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index b7ac35d31d..7d75850f7d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/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 getInvoicingList(String useOrgSid); + + List getAppInvoicingList(@Param("useOrgSid") String useOrgSid, @Param("search") String search); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 5b616f263e..aa7bb86752 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/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 + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index 15c78cb39e..0b24fadc98 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/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 qyAppSelByUseOrgSid2(String useOrgSid, String search, String invoiceKey) { return finCompanyInvoicingService.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey); } + + @Override + public ResultBean> getInvoicingList(String orgPath) { + return finCompanyInvoicingService.getInvoicingList(orgPath); + } + + @Override + public ResultBean> getAppInvoicingList(String orgPath, String search) { + return finCompanyInvoicingService.getAppInvoicingList(orgPath,search); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 4fd8262f2c..1f75bda83c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/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> getInvoicingList(String orgPath) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List list = baseMapper.getInvoicingList(useOrgSid); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } + + public ResultBean> getAppInvoicingList(String orgPath, String search) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List 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); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java index 77ba5c2ef1..add76d7ae0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java index 1b5100350a..b6ce4b4352 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java +++ b/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;*/ } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java index 916f0fe4d9..3844e4f542 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java index ed43e26a45..c596670c07 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index 391cf318d2..06455d654b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/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; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo.java index 6fb320b85c..bc5a22087d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index f5925da7fe..69d1a949e5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/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 getFlowOperateTitleBy(SaleOrderQuery query) { + public ResultBean getFlowOperateTitleByOld(SaleOrderQuery query) { ResultBean rb = ResultBean.fireFail(); FlowOrderVo flowOrderVo = new FlowOrderVo(); //0 上一环节 1下一环节 @@ -717,6 +722,68 @@ public class AppBusSalesOrderService { return rb.success().setData(flowOrderVo); } + public ResultBean getFlowOperateTitleBy(SaleOrderQuery query) { + ResultBean 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> 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> 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 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> resultBean = finCompanyInvoicingFeign.getInvoicingList(query.getOrgPath()); + List 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();