Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 6 months ago
parent
commit
86ad1cec10
  1. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  3. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  4. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  5. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  7. 25
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryQuery.java
  8. 25
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java
  9. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  10. 269
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReport.java
  11. 451
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportDetailsVo.java
  12. 271
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportDto.java
  13. 82
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportFeign.java
  14. 72
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportFeignFallback.java
  15. 60
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportQuery.java
  16. 125
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportVo.java
  17. 71
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportMapper.java
  18. 158
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportMapper.xml
  19. 96
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportRest.java
  20. 185
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportService.java
  21. 70
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
  22. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  23. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
  24. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
  25. 6
      yxt-as-ui/src/api/storage/otherOutbound.js
  26. 129
      yxt-as-ui/src/components/publicPage/quickAddCustomer.vue
  27. 89
      yxt-as-ui/src/components/publicPage/selectCustomer.vue
  28. 25
      yxt-as-ui/src/router/index.js
  29. 2
      yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingInfo.vue
  30. 3
      yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue
  31. 10
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  32. 2
      yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
  33. 3
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue
  34. 2
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue
  35. 2
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
  36. 2
      yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue
  37. 2
      yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue
  38. 438
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue
  39. 445
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundEdit.vue
  40. 191
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue
  41. 168
      yxt-as-ui/src/views/workFlow/qitachukuFlow/relation/chooseproducts.vue
  42. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java
  43. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/QuickAddCustomer.java
  44. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
  45. 21
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
  46. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
  47. 236
      yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/CrmCustomerDto.java
  48. 36
      yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/YxtCrmCustomerTempFeign.java
  49. 12
      yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java
  50. 62
      yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java
  51. 100
      yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@ -149,6 +149,12 @@ public interface BusSalesOrderVehicleFeign {
@ResponseBody
ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid);
@ApiOperation("根据销售订单sid和贷款人sid和贷款合同sid查车辆信息")
@PostMapping("/selectListByOrderSidAndDkrSidAndLoanContractSid")
@ResponseBody
ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid);
@ApiOperation("根据销售订单sid和消贷合同sid查车辆信息")
@PostMapping("/selectListByOrderSidAndXdConSid")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@ -143,6 +143,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
return null;
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid, String loanContractSid) {
return null;
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndXdConSid(String saleOrderSid, String loanContractSid) {
return null;

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

@ -165,6 +165,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid,@Param("loanContractSid") String loanContractSid);
List<String> selectVinNos(@Param("borrowSid") String sid, @Param("saleOrderSid") String saleOrderSid);

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@ -375,6 +375,14 @@
WHERE salesOrderSid = #{saleOrderSid}
AND borrowerSid = #{borrowerSid}
</select>
<select id="selectListByOrderSidAndDkrSidAndLoanContractSid"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
SELECT *
FROM bus_sales_order_vehicle
WHERE salesOrderSid = #{saleOrderSid}
AND borrowerSid = #{borrowerSid}
AND loanContractSid = #{loanContractSid}
</select>
<select id="selectVinNos" resultType="java.lang.String">
select

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

@ -160,6 +160,14 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
return rb.success().setData(busSalesOrderVehicles);
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid,String loanContractSid) {
ResultBean rb = ResultBean.fireFail();
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndDkrSidAndLoanContractSid(saleOrderSid, borrowerSid,loanContractSid);
return rb.success().setData(busSalesOrderVehicles);
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndXdConSid(String saleOrderSid, String loanContractSid) {
ResultBean rb = ResultBean.fireFail();

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

@ -631,7 +631,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
}
public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid,String loanContractSid) {
return baseMapper.selectListByOrderSidAndDkrSidAndLoanContractSid(saleOrderSid, borrowerSid,loanContractSid);
}
public List<String> selectVinNos(String sid, String saleOrderSid) {
return baseMapper.selectVinNos(sid, saleOrderSid);
}

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

@ -0,0 +1,25 @@
package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/11/5 16:12
*/
@Data
public class CustomerBillSummaryQuery {
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("未认款金额")
private String noSubscriptionMoneyStart; // 未认款开始金额
private String noSubscriptionMoneyEnd; // 未认款结束金额
private String userSid;
private String orgPath;
private String menuUrl;
}

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

@ -39,36 +39,19 @@ import java.util.List;
@Data
public class CustomerBillSummaryVo implements Vo {
@ApiModelProperty("应收未收款项sid")
private String sid; // 应收未收款项sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("合同编号sid")
private String contractSid; // 合同编号sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("款项类型value")
private String paymentTypeValue; // 款项类型value
@ApiModelProperty("认款状态")
private String subscriptionState; // 认款状态
@ApiModelProperty("车架号")
@JsonProperty("VIN")
private String VIN; // 车架号
@ApiModelProperty("联系电话")
private String customerPhone; // 联系电话
@ApiModelProperty("应收项目名称")
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额
@ApiModelProperty("应收金额")
private String receivableMoney; // 当前应收金额
@ApiModelProperty("认款金额")
private String subscriptionMoney; // 认款金额
@ApiModelProperty("未认款金额")
private String noSubscriptionMoney; // 未认款金额
@ApiModelProperty("生成时间")
private String createTime; // 生成时间
@ApiModelProperty("审核时间")
private String auditDate; // 审核时间
@ApiModelProperty("备注")
private String remarks; // 备注
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@ -48,7 +48,12 @@ public class VoucherService extends FinKingDeeService {
}
String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
try {
// ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
// if (!resultBean1.getSuccess()) {
// log.info("凭证暂存失败!");
// return rb.setMsg("凭证暂存失败!");
// }
// log.info("凭证暂存成功!");
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
if (!resultBean1.getSuccess()) {
log.info("凭证保存失败!");
@ -56,12 +61,7 @@ public class VoucherService extends FinKingDeeService {
}
log.info("凭证保存成功!");
// ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
// if (!resultBean1.getSuccess()) {
// log.info("凭证暂存失败!");
// return rb.setMsg("凭证暂存失败!");
// }
// log.info("凭证暂存成功!");
// String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
// ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
// if (!resultBean2.getSuccess()) {

269
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReport.java

@ -0,0 +1,269 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.Entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReport.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReport <br/>
* Description: 售后日报表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "售后日报表", description = "售后日报表")
@TableName("as_daily_report")
public class AsDailyReport extends Entity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("id")
private Long id; //
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("createTime")
private Date createTime; //
@ApiModelProperty("事业部sid")
private String busOrgSid; // 事业部sid
@ApiModelProperty("事业部名称")
private String busOrgName; // 事业部名称
@ApiModelProperty("分公司sid")
private String createOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String createOrgName; // 分公司名称
@ApiModelProperty("部门(服务站)sid")
private String useOrgSid; // 部门(服务站)sid
@ApiModelProperty("部门(服务站)")
private String useOrgName; // 部门(服务站)
@ApiModelProperty("维修开单-本日")
private Integer busrepairOrder_day; // 维修开单-本日
@ApiModelProperty("维修开单-本日保内")
private Integer busrepairOrder_day_inside; // 维修开单-本日保内
@ApiModelProperty("维修开单-本日保外")
private Integer busrepairOrder_day_out; // 维修开单-本日保外
@ApiModelProperty("维修开单-本月")
private Integer busrepairOrder_month; // 维修开单-本月
@ApiModelProperty("维修开单-本月保内")
private Integer busrepairOrder_month_inside; // 维修开单-本月保内
@ApiModelProperty("维修开单-本月保外")
private Integer busrepairOrder_month_out; // 维修开单-本月保外
@ApiModelProperty("维修开单-本年")
private Integer busrepairOrder_year; // 维修开单-本年
@ApiModelProperty("维修开单-本年保内")
private Integer busrepairOrder_year_inside; // 维修开单-本年保内
@ApiModelProperty("维修开单-本年保外")
private Integer busrepairOrder_year_out; // 维修开单-本年保外
@ApiModelProperty("在修车辆")
private Integer repair_veh; // 在修车辆
@ApiModelProperty("在修车辆-保内")
private Integer repair_veh_inside; // 在修车辆-保内
@ApiModelProperty("在修车辆-保外")
private Integer repair_veh_out; // 在修车辆-保外
@ApiModelProperty("索赔单-已竣工未提报数量")
private Integer claim_form_noReporting_num; // 索赔单-已竣工未提报数量
@ApiModelProperty("索赔单-已竣工未提报金额")
private BigDecimal claim_form_noReporting_amount; // 索赔单-已竣工未提报金额
@ApiModelProperty("索赔单-已提报未生效数量")
private Integer claim_form_reporting_num; // 索赔单-已提报未生效数量
@ApiModelProperty("索赔单-已提报未生效金额")
private BigDecimal claim_form_reporting_amount; // 索赔单-已提报未生效金额
@ApiModelProperty("维修业务-本日结算台数")
private Integer repair_bus_veh_day; // 维修业务-本日结算台数
@ApiModelProperty("维修业务-本日结算金额")
private BigDecimal repair_bus_veh_amount_day; // 维修业务-本日结算金额
@ApiModelProperty("维修业务-本日保内结算台数")
private Integer repair_bus_veh_inside_day; // 维修业务-本日保内结算台数
@ApiModelProperty("维修业务-本日保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_day; // 维修业务-本日保内结算金额
@ApiModelProperty("维修业务-本日保外结算台数")
private Integer repair_bus_veh_out_day; // 维修业务-本日保外结算台数
@ApiModelProperty("维修业务-本日保外结算金额")
private BigDecimal repair_bus_veh_out_amount_day; // 维修业务-本日保外结算金额
@ApiModelProperty("配件销售业务-本日结算数量")
private Integer sales_bus_veh_day; // 配件销售业务-本日结算数量
@ApiModelProperty("配件销售业务-本日结算金额")
private BigDecimal sales_bus_veh_amount_day; // 配件销售业务-本日结算金额
@ApiModelProperty("维修业务-本月结算台数")
private Integer repair_bus_veh_month; // 维修业务-本月结算台数
@ApiModelProperty("维修业务-本月结算金额")
private BigDecimal repair_bus_veh_amount_month; // 维修业务-本月结算金额
@ApiModelProperty("维修业务-本月保内结算台数")
private Integer repair_bus_veh_inside_month; // 维修业务-本月保内结算台数
@ApiModelProperty("维修业务-本月保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_month; // 维修业务-本月保内结算金额
@ApiModelProperty("维修业务-本月保外结算台数")
private Integer repair_bus_veh_out_month; // 维修业务-本月保外结算台数
@ApiModelProperty("维修业务-本月保外结算金额")
private BigDecimal repair_bus_veh_out_amount_month; // 维修业务-本月保外结算金额
@ApiModelProperty("配件销售业务-本月结算数量")
private Integer sales_bus_veh_month; // 配件销售业务-本月结算数量
@ApiModelProperty("配件销售业务-本月结算金额")
private BigDecimal sales_bus_veh_amount_month; // 配件销售业务-本月结算金额
@ApiModelProperty("维修业务-本年结算台数")
private Integer repair_bus_veh_year; // 维修业务-本年结算台数
@ApiModelProperty("维修业务-本年结算金额")
private BigDecimal repair_bus_veh_amount_year; // 维修业务-本年结算金额
@ApiModelProperty("维修业务-本年保内结算台数")
private Integer repair_bus_veh_inside_year; // 维修业务-本年保内结算台数
@ApiModelProperty("维修业务-本年保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_year; // 维修业务-本年保内结算金额
@ApiModelProperty("维修业务-本年保外结算台数")
private Integer repair_bus_veh_out_year; // 维修业务-本年保外结算台数
@ApiModelProperty("维修业务-本年保外结算金额")
private BigDecimal repair_bus_veh_out_amount_year; // 维修业务-本年保外结算金额
@ApiModelProperty("配件销售业务-本年结算数量")
private Integer sales_bus_veh_year; // 配件销售业务-本年结算数量
@ApiModelProperty("配件销售业务-本年结算金额")
private BigDecimal sales_bus_veh_amount_year; // 配件销售业务-本年结算金额
@ApiModelProperty("采购订单-本日结算数量")
private Integer purchase_order_day; // 采购订单-本日结算数量
@ApiModelProperty("采购订单-本日结算金额")
private BigDecimal purchase_order_amount_day; // 采购订单-本日结算金额
@ApiModelProperty("采购订单-本月结算数量")
private Integer purchase_order_month; // 采购订单-本月结算数量
@ApiModelProperty("采购订单-本月结算金额")
private BigDecimal purchase_order_amount_month; // 采购订单-本月结算金额
@ApiModelProperty("采购订单-本年结算数量")
private Integer purchase_order_year; // 采购订单-本年结算数量
@ApiModelProperty("采购订单-本年结算金额")
private BigDecimal purchase_order_amount_year; // 采购订单-本年结算金额
@ApiModelProperty("配件库存-总数量")
private Integer fittings_counts; // 配件库存-总数量
@ApiModelProperty("配件库存-总金额")
private BigDecimal fittings_amount; // 配件库存-总金额
@ApiModelProperty("配件库存-正常(1-90天)数量")
private Integer fittings_normal; // 配件库存-正常(1-90天)数量
@ApiModelProperty("配件库存-正常(1-90天)金额")
private BigDecimal fittings_normal_amount; // 配件库存-正常(1-90天)金额
@ApiModelProperty("配件库存-滞销件(91-180天)数量")
private Integer fittings_unsalable; // 配件库存-滞销件(91-180天)数量
@ApiModelProperty("配件库存-滞销件(91-180天)金额")
private BigDecimal fittings_unsalable_amount; // 配件库存-滞销件(91-180天)金额
@ApiModelProperty("配件库存-积压件(181-270天)数量")
private Integer fittings_backlog_one; // 配件库存-积压件(181-270天)数量
@ApiModelProperty("配件库存-积压件(181-270天)金额")
private BigDecimal fittings_backlog_one_amount; // 配件库存-积压件(181-270天)金额
@ApiModelProperty("配件库存-积压件(271-360天)数量")
private Integer fittings_backlog_two; // 配件库存-积压件(271-360天)数量
@ApiModelProperty("配件库存-积压件(271-360天)金额")
private BigDecimal fittings_backlog_two_amount; // 配件库存-积压件(271-360天)金额
@ApiModelProperty("配件库存-积压件(361-720天)数量")
private Integer fittings_backlog_three; // 配件库存-积压件(361-720天)数量
@ApiModelProperty("配件库存-积压件(361-720天)金额")
private BigDecimal fittings_backlog_three_amount; // 配件库存-积压件(361-720天)金额
@ApiModelProperty("配件库存-积压件(720天以上)数量")
private Integer fittings_backlog_four; // 配件库存-积压件(720天以上)数量
@ApiModelProperty("配件库存-积压件(720天以上)金额")
private BigDecimal fittings_backlog_four_amount; // 配件库存-积压件(720天以上)金额
@ApiModelProperty("配件流转-本日入库数量")
private Integer fittings_in_counts_day; // 配件流转-本日入库数量
@ApiModelProperty("配件流转-本日入库金额")
private BigDecimal fittings_in_amount_day; // 配件流转-本日入库金额
@ApiModelProperty("配件流转-本月入库数量")
private Integer fittings_in_counts_month; // 配件流转-本月入库数量
@ApiModelProperty("配件流转-本月入库金额")
private BigDecimal fittings_in_amount_month; // 配件流转-本月入库金额
@ApiModelProperty("配件流转-本年入库数量")
private Integer fittings_in_counts_year; // 配件流转-本年入库数量
@ApiModelProperty("配件流转-本年入库金额")
private BigDecimal fittings_in_amount_year; // 配件流转-本年入库金额
@ApiModelProperty("配件流转-本日出库数量")
private Integer fittings_out_counts_day; // 配件流转-本日出库数量
@ApiModelProperty("配件流转-本日出库金额")
private BigDecimal fittings_out_amount_day; // 配件流转-本日出库金额
@ApiModelProperty("配件流转-本月出库数量")
private Integer fittings_out_counts_month; // 配件流转-本月出库数量
@ApiModelProperty("配件流转-本月出库金额")
private BigDecimal fittings_out_amount_month; // 配件流转-本月出库金额
@ApiModelProperty("配件流转-本年出库数量")
private Integer fittings_out_counts_year; // 配件流转-本年出库数量
@ApiModelProperty("配件流转-本年出库金额")
private BigDecimal fittings_out_amount_year; // 配件流转-本年出库金额
@ApiModelProperty("旧件库存-总数量")
private Integer old_fittings_all_counts; // 旧件库存-总数量
@ApiModelProperty("旧件库存-保内数量")
private Integer old_fittings_in_counts; // 旧件库存-保内数量
@ApiModelProperty("旧件库存-保外数量")
private Integer old_fittings_out_counts; // 旧件库存-保外数量
@ApiModelProperty("旧件流转-本日入库数量")
private Integer old_fittings_in_day; // 旧件流转-本日入库数量
@ApiModelProperty("旧件流转-本月入库数量")
private Integer old_fittings_in_month; // 旧件流转-本月入库数量
@ApiModelProperty("旧件流转-本年入库数量")
private Integer old_fittings_in_year; // 旧件流转-本年入库数量
@ApiModelProperty("旧件流转-本日出库数量")
private Integer old_fittings_out_day; // 旧件流转-本日出库数量
@ApiModelProperty("旧件流转-本月出库数量")
private Integer old_fittings_out_month; // 旧件流转-本月出库数量
@ApiModelProperty("旧件流转-本年出库数量")
private Integer old_fittings_out_year; // 旧件流转-本年出库数量
@ApiModelProperty("旧件流转-本日出库数量其中返件")
private Integer old_fittings_out_day_return; // 旧件流转-本日出库数量其中返件
@ApiModelProperty("旧件流转-本月出库数量其中返件")
private Integer old_fittings_out_month_return; // 旧件流转-本月出库数量其中返件
@ApiModelProperty("旧件流转-本年出库数量其中返件")
private Integer old_fittings_out_year_return; // 旧件流转-本年出库数量其中返件
@ApiModelProperty("保外未回款-台数")
private Integer insurance_out_Payment_counts; // 保外未回款-台数
@ApiModelProperty("保外未回款-金额")
private BigDecimal insurance_out_Payment_amount; // 保外未回款-金额
@ApiModelProperty("保外未回款-客户欠款台数")
private Integer out_Payment_customer_counts; // 保外未回款-客户欠款台数
@ApiModelProperty("保外未回款-客户欠款金额")
private BigDecimal out_Payment_customer_debt; // 保外未回款-客户欠款金额
@ApiModelProperty("保外未回款-保险欠款台数")
private Integer out_Payment_insurance_counts; // 保外未回款-保险欠款台数
@ApiModelProperty("保外未回款-保险欠款金额")
private BigDecimal out_Payment_insurance_debt; // 保外未回款-保险欠款金额
@ApiModelProperty("保内未回款-台数")
private Integer insurance_in_Payment_counts; // 保内未回款-台数
@ApiModelProperty("保内未回款-金额")
private BigDecimal insurance_in_Payment_amount; // 保内未回款-金额
@ApiModelProperty("保内未回款-已开票台数")
private Integer in_Payment_invoice_counts; // 保内未回款-已开票台数
@ApiModelProperty("保内未回款-已开票金额")
private BigDecimal in_Payment_invoice_amount; // 保内未回款-已开票金额
@ApiModelProperty("保内未回款-未开票台数")
private Integer in_Payment_no_invoice_counts; // 保内未回款-未开票台数
@ApiModelProperty("保内未回款-未开票金额")
private BigDecimal in_Payment_no_invoice_amount; // 保内未回款-未开票金额
@ApiModelProperty("代理库账户余额")
private BigDecimal proxy_library_balance; // 代理库账户余额
}

451
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportDetailsVo.java

@ -0,0 +1,451 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportVo.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo <br/>
* Description: 售后日报表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "售后日报表 视图数据详情", description = "售后日报表 视图数据详情")
public class AsDailyReportDetailsVo implements Vo {
/**
* 代理库账户余额
*/
private String account_balance;
/**
* 累计已提报未生效数量
*/
private String claimFormNotEffect;
/**
* 累计已提报未生效金额
*/
private String claimFormNotEffectMoney;
/**
* 累计已竣工未提报数量
*/
private String claimFormNotReported;
/**
* 累计已竣工未提报金额
*/
private String claimFormNotReportedMoney;
/**
* 客户欠款
*/
private String customer_debt;
/**
* 客户欠款金额
*/
private String customer_debt_money;
/**
* 保险欠款
*/
private String insurance_debt;
/**
* 保险欠款金额
*/
private String insurance_debt_money;
/**
* 旧件库存
*/
private String old_parts_stock;
/**
* 旧件库存保内
*/
private String old_parts_stock_in;
/**
* 旧件库存保外
*/
private String old_parts_stock_out;
/**
* 旧件流转本月入库
*/
private String old_parts_transfer_in_month;
/**
* 旧件流转本日入库
*/
private String old_parts_transfer_in_today;
/**
* 旧件流转本年入库
*/
private String old_parts_transfer_in_year;
/**
* 旧件流转本日出库
*/
private String old_parts_transfer_out_today;
/**
* 旧件流转本月出库
*/
private String old_parts_transfer_out_month;
/**
* 旧件流转本年出库
*/
private String old_parts_transfer_out_year;
/**
* 旧件流转本日出库返件
*/
private String old_parts_transfer_out_return_today;
/**
* 旧件流转本月出库返件
*/
private String old_parts_transfer_out_return_month;
/**
* 旧件流转本年出库返件
*/
private String old_parts_transfer_out_return_year;
/**
* 配件本月数量
*/
private String parts_month;
/**
* 配件本月销售额
*/
private String parts_month_money;
/**
* 配件库存
*/
private String parts_stock;
/**
* 配件库存正常
*/
private String parts_stock1;
/**
* 配件库存滞销
*/
private String parts_stock2;
/**
* 配件库存积压180天起
*/
private String parts_stock3;
/**
* 配件库存积压271天起
*/
private String parts_stock4;
/**
* 配件库存积压361天起
*/
private String parts_stock5;
/**
* 配件库存积压720天起
*/
private String parts_stock6;
/**
* 配件库存金额
*/
private String parts_stock_money;
/**
* 配件库存金额正常
*/
private String parts_stock_money1;
/**
* 配件库存金额滞销
*/
private String parts_stock_money2;
/**
* 配件库存金额积压180天起
*/
private String parts_stock_money3;
/**
* 配件库存金额积压271天起
*/
private String parts_stock_money4;
/**
* 配件库存金额积压361天起
*/
private String parts_stock_money5;
/**
* 配件库存金额积压720天起
*/
private String parts_stock_money6;
/**
* 配件本日数量
*/
private String parts_today;
/**
* 配件本日销售额
*/
private String parts_today_money;
/**
* 配件流转本月入库
*/
private String parts_transfer_in_month;
/**
* 配件流转本月入库金额
*/
private String parts_transfer_in_month_money;
/**
* 配件流转本日入库
*/
private String parts_transfer_in_today;
/**
* 配件流转本日入库金额
*/
private String parts_transfer_in_today_money;
/**
* 配件流转本年入库
*/
private String parts_transfer_in_year;
/**
* 配件流转本年入库金额
*/
private String parts_transfer_in_year_money;
/**
* 配件流转本月出库
*/
private String parts_transfer_out_month;
/**
* 配件流转本月出库金额
*/
private String parts_transfer_out_month_money;
/**
* 配件流转本日出库
*/
private String parts_transfer_out_today;
/**
* 配件流转本日出库金额
*/
private String parts_transfer_out_today_money;
/**
* 配件流转本年出库
*/
private String parts_transfer_out_year;
/**
* 配件流转本年出库金额
*/
private String parts_transfer_out_year_money;
/**
* 配件本年数量
*/
private String parts_year;
/**
* 配件本年销售额
*/
private String parts_year_money;
/**
* 采购本月
*/
private String procured_month;
/**
* 采购本月金额
*/
private String procured_month_money;
/**
* 采购本日
*/
private String procured_today;
/**
* 采购本日金额
*/
private String procured_today_money;
/**
* 采购本年
*/
private String procured_year;
/**
* 采购本年金额
*/
private String procured_year_money;
/**
* 维修业务本月
*/
private String repair_month;
/**
* 维修业务本月保内数量
*/
private String repair_month_in;
/**
* 维修业务本月保内金额
*/
private String repair_month_in_money;
/**
* 维修业务本月金额
*/
private String repair_month_money;
/**
* 维修业务本月保外数量
*/
private String repair_month_out;
/**
* 维修业务本月保外金额
*/
private String repair_month_out_money;
/**
* 本月开单
*/
private String repair_order_month;
/**
* 本月开单保内
*/
private String repair_order_month_in;
/**
* 本月开单保外
*/
private String repair_order_month_out;
/**
* 本日开单
*/
private String repair_order_today;
/**
* 本日开单保内
*/
private String repair_order_today_in;
/**
* 本日开单保外
*/
private String repair_order_today_out;
/**
* 全年开单
*/
private String repair_order_year;
/**
* 全年开单保内
*/
private String repair_order_year_in;
/**
* 全年开单保外
*/
private String repair_order_year_out;
/**
* 维修业务本日
*/
private String repair_today;
/**
* 维修业务本日保内数量
*/
private String repair_today_in;
/**
* 维修业务本日保内金额
*/
private String repair_today_in_money;
/**
* 维修业务本日金额
*/
private String repair_today_money;
/**
* 维修业务本日保外数量
*/
private String repair_today_out;
/**
* 维修业务本日保外金额
*/
private String repair_today_out_money;
/**
* 维修业务本年
*/
private String repair_year;
/**
* 维修业务本年保内数量
*/
private String repair_year_in;
/**
* 维修业务本年保内金额
*/
private String repair_year_in_money;
/**
* 维修业务本年金额
*/
private String repair_year_money;
/**
* 维修业务本年保外数量
*/
private String repair_year_out;
/**
* 维修业务本年保外金额
*/
private String repair_year_out_money;
/**
* 在修数量
*/
private String repairing;
/**
* 在修保内
*/
private String repairing_in;
/**
* 在修保外
*/
private String repairing_out;
/**
* 保内已开票
*/
private String three_guarantee_invoice;
/**
* 保内已开票金额
*/
private String three_guarantee_invoice_money;
/**
* 保内未开票
*/
private String three_guarantee_no_invoice;
/**
* 保内未开票金额
*/
private String three_guarantee_no_invoice_money;
/**
* 保内未回款
*/
private String three_guarantee_unpaid;
/**
* 保外未回款
*/
private String three_guarantee_unpaid2;
/**
* 保内未回款金额
*/
private String three_guarantee_unpaid_money;
/**
* 保外未回款金额
*/
private String three_guarantee_unpaid_money2;
}

271
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportDto.java

@ -0,0 +1,271 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportDto.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDto <br/>
* Description: 售后日报表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "售后日报表 数据传输对象", description = "售后日报表 数据传输对象")
public class AsDailyReportDto implements Dto {
private String sid; // sid
@ApiModelProperty("id")
private Long id; //
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("createTime")
private Date createTimeStart; //
private Date createTimeEnd; //
@ApiModelProperty("事业部sid")
private String busOrgSid; // 事业部sid
@ApiModelProperty("事业部名称")
private String busOrgName; // 事业部名称
@ApiModelProperty("分公司sid")
private String createOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String createOrgName; // 分公司名称
@ApiModelProperty("部门(服务站)sid")
private String useOrgSid; // 部门(服务站)sid
@ApiModelProperty("部门(服务站)")
private String useOrgName; // 部门(服务站)
@ApiModelProperty("维修开单-本日")
private Integer busrepairOrder_day; // 维修开单-本日
@ApiModelProperty("维修开单-本日保内")
private Integer busrepairOrder_day_inside; // 维修开单-本日保内
@ApiModelProperty("维修开单-本日保外")
private Integer busrepairOrder_day_out; // 维修开单-本日保外
@ApiModelProperty("维修开单-本月")
private Integer busrepairOrder_month; // 维修开单-本月
@ApiModelProperty("维修开单-本月保内")
private Integer busrepairOrder_month_inside; // 维修开单-本月保内
@ApiModelProperty("维修开单-本月保外")
private Integer busrepairOrder_month_out; // 维修开单-本月保外
@ApiModelProperty("维修开单-本年")
private Integer busrepairOrder_year; // 维修开单-本年
@ApiModelProperty("维修开单-本年保内")
private Integer busrepairOrder_year_inside; // 维修开单-本年保内
@ApiModelProperty("维修开单-本年保外")
private Integer busrepairOrder_year_out; // 维修开单-本年保外
@ApiModelProperty("在修车辆")
private Integer repair_veh; // 在修车辆
@ApiModelProperty("在修车辆-保内")
private Integer repair_veh_inside; // 在修车辆-保内
@ApiModelProperty("在修车辆-保外")
private Integer repair_veh_out; // 在修车辆-保外
@ApiModelProperty("索赔单-已竣工未提报数量")
private Integer claim_form_noReporting_num; // 索赔单-已竣工未提报数量
@ApiModelProperty("索赔单-已竣工未提报金额")
private BigDecimal claim_form_noReporting_amount; // 索赔单-已竣工未提报金额
@ApiModelProperty("索赔单-已提报未生效数量")
private Integer claim_form_reporting_num; // 索赔单-已提报未生效数量
@ApiModelProperty("索赔单-已提报未生效金额")
private BigDecimal claim_form_reporting_amount; // 索赔单-已提报未生效金额
@ApiModelProperty("维修业务-本日结算台数")
private Integer repair_bus_veh_day; // 维修业务-本日结算台数
@ApiModelProperty("维修业务-本日结算金额")
private BigDecimal repair_bus_veh_amount_day; // 维修业务-本日结算金额
@ApiModelProperty("维修业务-本日保内结算台数")
private Integer repair_bus_veh_inside_day; // 维修业务-本日保内结算台数
@ApiModelProperty("维修业务-本日保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_day; // 维修业务-本日保内结算金额
@ApiModelProperty("维修业务-本日保外结算台数")
private Integer repair_bus_veh_out_day; // 维修业务-本日保外结算台数
@ApiModelProperty("维修业务-本日保外结算金额")
private BigDecimal repair_bus_veh_out_amount_day; // 维修业务-本日保外结算金额
@ApiModelProperty("配件销售业务-本日结算数量")
private Integer sales_bus_veh_day; // 配件销售业务-本日结算数量
@ApiModelProperty("配件销售业务-本日结算金额")
private BigDecimal sales_bus_veh_amount_day; // 配件销售业务-本日结算金额
@ApiModelProperty("维修业务-本月结算台数")
private Integer repair_bus_veh_month; // 维修业务-本月结算台数
@ApiModelProperty("维修业务-本月结算金额")
private BigDecimal repair_bus_veh_amount_month; // 维修业务-本月结算金额
@ApiModelProperty("维修业务-本月保内结算台数")
private Integer repair_bus_veh_inside_month; // 维修业务-本月保内结算台数
@ApiModelProperty("维修业务-本月保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_month; // 维修业务-本月保内结算金额
@ApiModelProperty("维修业务-本月保外结算台数")
private Integer repair_bus_veh_out_month; // 维修业务-本月保外结算台数
@ApiModelProperty("维修业务-本月保外结算金额")
private BigDecimal repair_bus_veh_out_amount_month; // 维修业务-本月保外结算金额
@ApiModelProperty("配件销售业务-本月结算数量")
private Integer sales_bus_veh_month; // 配件销售业务-本月结算数量
@ApiModelProperty("配件销售业务-本月结算金额")
private BigDecimal sales_bus_veh_amount_month; // 配件销售业务-本月结算金额
@ApiModelProperty("维修业务-本年结算台数")
private Integer repair_bus_veh_year; // 维修业务-本年结算台数
@ApiModelProperty("维修业务-本年结算金额")
private BigDecimal repair_bus_veh_amount_year; // 维修业务-本年结算金额
@ApiModelProperty("维修业务-本年保内结算台数")
private Integer repair_bus_veh_inside_year; // 维修业务-本年保内结算台数
@ApiModelProperty("维修业务-本年保内结算金额")
private BigDecimal repair_bus_veh_inside_amount_year; // 维修业务-本年保内结算金额
@ApiModelProperty("维修业务-本年保外结算台数")
private Integer repair_bus_veh_out_year; // 维修业务-本年保外结算台数
@ApiModelProperty("维修业务-本年保外结算金额")
private BigDecimal repair_bus_veh_out_amount_year; // 维修业务-本年保外结算金额
@ApiModelProperty("配件销售业务-本年结算数量")
private Integer sales_bus_veh_year; // 配件销售业务-本年结算数量
@ApiModelProperty("配件销售业务-本年结算金额")
private BigDecimal sales_bus_veh_amount_year; // 配件销售业务-本年结算金额
@ApiModelProperty("采购订单-本日结算数量")
private Integer purchase_order_day; // 采购订单-本日结算数量
@ApiModelProperty("采购订单-本日结算金额")
private BigDecimal purchase_order_amount_day; // 采购订单-本日结算金额
@ApiModelProperty("采购订单-本月结算数量")
private Integer purchase_order_month; // 采购订单-本月结算数量
@ApiModelProperty("采购订单-本月结算金额")
private BigDecimal purchase_order_amount_month; // 采购订单-本月结算金额
@ApiModelProperty("采购订单-本年结算数量")
private Integer purchase_order_year; // 采购订单-本年结算数量
@ApiModelProperty("采购订单-本年结算金额")
private BigDecimal purchase_order_amount_year; // 采购订单-本年结算金额
@ApiModelProperty("配件库存-总数量")
private Integer fittings_counts; // 配件库存-总数量
@ApiModelProperty("配件库存-总金额")
private BigDecimal fittings_amount; // 配件库存-总金额
@ApiModelProperty("配件库存-正常(1-90天)数量")
private Integer fittings_normal; // 配件库存-正常(1-90天)数量
@ApiModelProperty("配件库存-正常(1-90天)金额")
private BigDecimal fittings_normal_amount; // 配件库存-正常(1-90天)金额
@ApiModelProperty("配件库存-滞销件(91-180天)数量")
private Integer fittings_unsalable; // 配件库存-滞销件(91-180天)数量
@ApiModelProperty("配件库存-滞销件(91-180天)金额")
private BigDecimal fittings_unsalable_amount; // 配件库存-滞销件(91-180天)金额
@ApiModelProperty("配件库存-积压件(181-270天)数量")
private Integer fittings_backlog_one; // 配件库存-积压件(181-270天)数量
@ApiModelProperty("配件库存-积压件(181-270天)金额")
private BigDecimal fittings_backlog_one_amount; // 配件库存-积压件(181-270天)金额
@ApiModelProperty("配件库存-积压件(271-360天)数量")
private Integer fittings_backlog_two; // 配件库存-积压件(271-360天)数量
@ApiModelProperty("配件库存-积压件(271-360天)金额")
private BigDecimal fittings_backlog_two_amount; // 配件库存-积压件(271-360天)金额
@ApiModelProperty("配件库存-积压件(361-720天)数量")
private Integer fittings_backlog_three; // 配件库存-积压件(361-720天)数量
@ApiModelProperty("配件库存-积压件(361-720天)金额")
private BigDecimal fittings_backlog_three_amount; // 配件库存-积压件(361-720天)金额
@ApiModelProperty("配件库存-积压件(720天以上)数量")
private Integer fittings_backlog_four; // 配件库存-积压件(720天以上)数量
@ApiModelProperty("配件库存-积压件(720天以上)金额")
private BigDecimal fittings_backlog_four_amount; // 配件库存-积压件(720天以上)金额
@ApiModelProperty("配件流转-本日入库数量")
private Integer fittings_in_counts_day; // 配件流转-本日入库数量
@ApiModelProperty("配件流转-本日入库金额")
private BigDecimal fittings_in_amount_day; // 配件流转-本日入库金额
@ApiModelProperty("配件流转-本月入库数量")
private Integer fittings_in_counts_month; // 配件流转-本月入库数量
@ApiModelProperty("配件流转-本月入库金额")
private BigDecimal fittings_in_amount_month; // 配件流转-本月入库金额
@ApiModelProperty("配件流转-本年入库数量")
private Integer fittings_in_counts_year; // 配件流转-本年入库数量
@ApiModelProperty("配件流转-本年入库金额")
private BigDecimal fittings_in_amount_year; // 配件流转-本年入库金额
@ApiModelProperty("配件流转-本日出库数量")
private Integer fittings_out_counts_day; // 配件流转-本日出库数量
@ApiModelProperty("配件流转-本日出库金额")
private BigDecimal fittings_out_amount_day; // 配件流转-本日出库金额
@ApiModelProperty("配件流转-本月出库数量")
private Integer fittings_out_counts_month; // 配件流转-本月出库数量
@ApiModelProperty("配件流转-本月出库金额")
private BigDecimal fittings_out_amount_month; // 配件流转-本月出库金额
@ApiModelProperty("配件流转-本年出库数量")
private Integer fittings_out_counts_year; // 配件流转-本年出库数量
@ApiModelProperty("配件流转-本年出库金额")
private BigDecimal fittings_out_amount_year; // 配件流转-本年出库金额
@ApiModelProperty("旧件库存-总数量")
private Integer old_fittings_all_counts; // 旧件库存-总数量
@ApiModelProperty("旧件库存-保内数量")
private Integer old_fittings_in_counts; // 旧件库存-保内数量
@ApiModelProperty("旧件库存-保外数量")
private Integer old_fittings_out_counts; // 旧件库存-保外数量
@ApiModelProperty("旧件流转-本日入库数量")
private Integer old_fittings_in_day; // 旧件流转-本日入库数量
@ApiModelProperty("旧件流转-本月入库数量")
private Integer old_fittings_in_month; // 旧件流转-本月入库数量
@ApiModelProperty("旧件流转-本年入库数量")
private Integer old_fittings_in_year; // 旧件流转-本年入库数量
@ApiModelProperty("旧件流转-本日出库数量")
private Integer old_fittings_out_day; // 旧件流转-本日出库数量
@ApiModelProperty("旧件流转-本月出库数量")
private Integer old_fittings_out_month; // 旧件流转-本月出库数量
@ApiModelProperty("旧件流转-本年出库数量")
private Integer old_fittings_out_year; // 旧件流转-本年出库数量
@ApiModelProperty("旧件流转-本日出库数量其中返件")
private Integer old_fittings_out_day_return; // 旧件流转-本日出库数量其中返件
@ApiModelProperty("旧件流转-本月出库数量其中返件")
private Integer old_fittings_out_month_return; // 旧件流转-本月出库数量其中返件
@ApiModelProperty("旧件流转-本年出库数量其中返件")
private Integer old_fittings_out_year_return; // 旧件流转-本年出库数量其中返件
@ApiModelProperty("保外未回款-台数")
private Integer insurance_out_Payment_counts; // 保外未回款-台数
@ApiModelProperty("保外未回款-金额")
private BigDecimal insurance_out_Payment_amount; // 保外未回款-金额
@ApiModelProperty("保外未回款-客户欠款台数")
private Integer out_Payment_customer_counts; // 保外未回款-客户欠款台数
@ApiModelProperty("保外未回款-客户欠款金额")
private BigDecimal out_Payment_customer_debt; // 保外未回款-客户欠款金额
@ApiModelProperty("保外未回款-保险欠款台数")
private Integer out_Payment_insurance_counts; // 保外未回款-保险欠款台数
@ApiModelProperty("保外未回款-保险欠款金额")
private BigDecimal out_Payment_insurance_debt; // 保外未回款-保险欠款金额
@ApiModelProperty("保内未回款-台数")
private Integer insurance_in_Payment_counts; // 保内未回款-台数
@ApiModelProperty("保内未回款-金额")
private BigDecimal insurance_in_Payment_amount; // 保内未回款-金额
@ApiModelProperty("保内未回款-已开票台数")
private Integer in_Payment_invoice_counts; // 保内未回款-已开票台数
@ApiModelProperty("保内未回款-已开票金额")
private BigDecimal in_Payment_invoice_amount; // 保内未回款-已开票金额
@ApiModelProperty("保内未回款-未开票台数")
private Integer in_Payment_no_invoice_counts; // 保内未回款-未开票台数
@ApiModelProperty("保内未回款-未开票金额")
private BigDecimal in_Payment_no_invoice_amount; // 保内未回款-未开票金额
@ApiModelProperty("代理库账户余额")
private BigDecimal proxy_library_balance; // 代理库账户余额
}

82
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportFeign.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportFeign.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportFeign <br/>
* Description: 售后日报表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "售后日报表")
@FeignClient(
contextId = "report-AsDailyReport",
name = "anrui-reportcenter",
path = "v1/ASDailyReport",
fallback = AsDailyReportFeignFallback.class)
public interface AsDailyReportFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/pageList1")
@ResponseBody
public ResultBean<PagerVo<AsDailyReportVo>> listPage(@RequestBody PagerQuery<AsDailyReportQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody AsDailyReportDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("售后日期初始化")
@GetMapping("/getReport")
public ResultBean<AsDailyReportDetailsVo> fetchDetailsBySid(@RequestParam("date") String date,
@RequestParam("userSid") String userSid,
@RequestParam("menuSid") String menuSid,
@RequestParam("orgPath") String orgPath
);
}

72
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportFeignFallback.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportFeignFallback <br/>
* Description: 售后日报表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AsDailyReportFeignFallback implements AsDailyReportFeign {
@Override
public ResultBean<PagerVo<AsDailyReportVo>> listPage(PagerQuery<AsDailyReportQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口report/asdailyreport/listPage无法访问");
}
@Override
public ResultBean save(AsDailyReportDto dto){
return ResultBean.fireFail().setMsg("接口report/asdailyreport/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口report/asdailyreport/delBySids无法访问");
}
@Override
public ResultBean<AsDailyReportDetailsVo> fetchDetailsBySid(String sid, String userSid, String menuSid, String orgPath) {
return null;
}
}

60
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportQuery.java

@ -0,0 +1,60 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportQuery.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportQuery <br/>
* Description: 售后日报表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "售后日报表 查询条件", description = "售后日报表 查询条件")
public class AsDailyReportQuery implements Query {
private String userSid;
private String orgPath;
private String menuSid;
}

125
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/asdailyreport/AsDailyReportVo.java

@ -0,0 +1,125 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.api.asdailyreport;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportVo.java <br/>
* Class: com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo <br/>
* Description: 售后日报表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "售后日报表 视图数据对象", description = "售后日报表 视图数据对象")
public class AsDailyReportVo implements Vo {
/**
* 日期
*/
private String date;
/**
* 本日开单
*/
private String todayOrder;
/**
* 在修车辆
*/
private String repairingCar;
/**
* 索赔未生效数量
*/
private String claimNotEffective;
/**
* 今日销售
*/
private String todaySale;
/**
* 本日结算
*/
private String todayPay;
/**
* 本日采购
*/
private String todayBuy;
/**
* 配件库存数量
*/
private String partsStock;
/**
* 配件本日入库数量
*/
private String partsTodayIn;
/**
* 配件本日出库数量
*/
private String partsTodayOut;
/**
* 旧件本日入库数量
*/
private String oldPartsTodayIn;
/**
* 旧件本日出库数量
*/
private String oldPartsTodayOut;
/**
* 旧件库存数量
*/
private String oldPartsStock;
/**
* 客户欠款
*/
private String customerArrears;
/**
* 保险欠款
*/
private String insuranceArrears;
/**
* 三包未回款
*/
private String threeGuaranteesUnpaid;
}

71
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportMapper.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.biz.asdailyreport;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReport;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo;
import java.util.List;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportMapper.java <br/>
* Class: com.yxt.anrui.reportcenter.biz.asdailyreport.AsDailyReportMapper <br/>
* Description: 售后日报表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsDailyReportMapper extends BaseMapper<AsDailyReport> {
//@Update("update as_daily_report set name=#{msg} where id=#{id}")
//IPage<AsDailyReportVo> voPage(IPage<AsDailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<AsDailyReport> qw);
IPage<AsDailyReportVo> selectPageVo(IPage<AsDailyReport> page, @Param(Constants.WRAPPER) Wrapper<AsDailyReport> qw);
List<AsDailyReportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsDailyReport> qw);
@Select("select * from as_daily_report")
List<AsDailyReportVo> selectListVo();
IPage<AsDailyReportVo> listPage(IPage<AsDailyReport> page, @Param(Constants.WRAPPER)QueryWrapper<AsDailyReport> qw);
AsDailyReportDetailsVo fetchDetailsVoBySid(@Param(Constants.WRAPPER) QueryWrapper<AsDailyReport> qw, @Param("date") String date);
}

158
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportMapper.xml

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.reportcenter.biz.asdailyreport.AsDailyReportMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo">
SELECT * FROM as_daily_report <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo">
SELECT * FROM as_daily_report <where> ${ew.sqlSegment} </where>
</select>
<select id="listPage" resultType="com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo">
SELECT
DATE_FORMAT( createTime, '%Y-%m-%d' ) `date`,
SUM( busrepairOrder_day ) todayOrder,
SUM( repair_veh ) repairingCar,
SUM( claim_form_reporting_num ) claimNotEffective,
0 + CAST( SUM( sales_bus_veh_amount_month ) AS CHAR ) todaySale,
0 + CAST( SUM( repair_bus_veh_amount_day ) AS CHAR ) todayPay,
0 + CAST( SUM( purchase_order_amount_day ) AS CHAR ) todayBuy,
SUM( fittings_counts ) partsStock,
SUM( fittings_in_counts_day ) partsTodayIn,
SUM( fittings_out_counts_day ) partsTodayOut,
SUM( old_fittings_in_day ) oldPartsTodayIn,
SUM( old_fittings_out_day ) oldPartsTodayOut,
SUM( old_fittings_all_counts ) oldPartsStock,
0 + CAST( SUM( out_Payment_customer_debt ) AS CHAR ) customerArrears,
0 + CAST( SUM( out_Payment_insurance_debt ) AS CHAR ) insuranceArrears,
0 + CAST( SUM( proxy_library_balance ) AS CHAR ) threeGuaranteesUnpaid
FROM
as_daily_report
<where>
${ew.sqlSegment}
</where>
GROUP BY
DATE_FORMAT(
createTime,
'%Y-%m-%d'
)
</select>
<select id="fetchDetailsVoBySid"
resultType="com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDetailsVo">
SELECT
*
FROM
(
SELECT
0 + CAST( SUM( proxy_library_balance ) AS CHAR ) account_balance,
SUM( claim_form_reporting_num ) claimFormNotEffect,
0 + CAST( SUM( claim_form_reporting_amount ) AS CHAR ) claimFormNotEffectMoney,
SUM( claim_form_noReporting_num ) claimFormNotReported,
0 + CAST( SUM( claim_form_noReporting_amount ) AS CHAR ) claimFormNotReportedMoney,
SUM( out_Payment_customer_counts ) customer_debt,
0 + CAST( SUM( out_Payment_customer_debt ) AS CHAR ) customer_debt_money,
SUM( out_Payment_insurance_counts ) insurance_debt,
0 + CAST( SUM( out_Payment_insurance_debt ) AS CHAR ) insurance_debt_money,
SUM( old_fittings_all_counts ) old_parts_stock,
SUM( old_fittings_in_counts ) old_parts_stock_in,
SUM( old_fittings_out_counts ) old_parts_stock_out,
SUM( old_fittings_in_day ) old_parts_transfer_in_month,
SUM( old_fittings_in_month ) old_parts_transfer_in_today,
SUM( old_fittings_in_year ) old_parts_transfer_in_year,
SUM( old_fittings_out_day ) old_parts_transfer_out_today,
SUM( old_fittings_out_month ) old_parts_transfer_out_month,
SUM( old_fittings_out_year ) old_parts_transfer_out_year,
SUM( old_fittings_out_day_return ) old_parts_transfer_out_return_today,
SUM( old_fittings_out_month_return ) old_parts_transfer_out_return_month,
SUM( old_fittings_out_year_return ) old_parts_transfer_out_return_year,
SUM( sales_bus_veh_month ) parts_month,
0 + CAST( SUM( sales_bus_veh_amount_month ) AS CHAR ) parts_month_money,
SUM( fittings_counts ) parts_stock,
SUM( fittings_normal ) parts_stock1,
SUM( fittings_unsalable ) parts_stock2,
SUM( fittings_backlog_one ) parts_stock3,
SUM( fittings_backlog_two ) parts_stock4,
SUM( fittings_backlog_three ) parts_stock5,
SUM( fittings_backlog_four ) parts_stock6,
0 + CAST( SUM( fittings_amount ) AS CHAR ) parts_stock_money,
0 + CAST( SUM( fittings_normal_amount ) AS CHAR ) parts_stock_money1,
0 + CAST( SUM( fittings_unsalable_amount ) AS CHAR ) parts_stock_money2,
0 + CAST( SUM( fittings_backlog_one_amount ) AS CHAR ) parts_stock_money3,
0 + CAST( SUM( fittings_backlog_two_amount ) AS CHAR ) parts_stock_money4,
0 + CAST( SUM( fittings_backlog_three_amount ) AS CHAR ) parts_stock_money5,
0 + CAST( SUM( fittings_backlog_four_amount ) AS CHAR ) parts_stock_money6,
SUM( sales_bus_veh_day ) parts_today,
0 + CAST( SUM( sales_bus_veh_amount_day ) AS CHAR ) parts_today_money,
SUM( fittings_in_counts_month ) parts_transfer_in_month,
0 + CAST( SUM( fittings_in_amount_month ) AS CHAR ) parts_transfer_in_month_money,
SUM( fittings_in_counts_day ) parts_transfer_in_today,
0 + CAST( SUM( fittings_in_amount_day ) AS CHAR ) parts_transfer_in_today_money,
SUM( fittings_in_counts_year ) parts_transfer_in_year,
0 + CAST( SUM( fittings_in_amount_year ) AS CHAR ) parts_transfer_in_year_money,
SUM( fittings_out_counts_month ) parts_transfer_out_month,
0 + CAST( SUM( fittings_out_amount_month ) AS CHAR ) parts_transfer_out_month_money,
SUM( fittings_out_counts_day ) parts_transfer_out_today,
0 + CAST( SUM( fittings_out_amount_day ) AS CHAR ) parts_transfer_out_today_money,
SUM( fittings_out_counts_year ) parts_transfer_out_year,
0 + CAST( SUM( fittings_out_amount_year ) AS CHAR ) parts_transfer_out_year_money,
SUM( sales_bus_veh_year ) parts_year,
0 + CAST( SUM( sales_bus_veh_amount_year ) AS CHAR ) parts_year_money,
SUM( purchase_order_month ) procured_month,
0 + CAST( SUM( purchase_order_amount_month ) AS CHAR ) procured_month_money,
SUM( purchase_order_day ) procured_today,
0 + CAST( SUM( purchase_order_amount_day ) AS CHAR ) procured_today_money,
SUM( purchase_order_year ) procured_year,
0 + CAST( SUM( purchase_order_amount_year ) AS CHAR ) procured_year_money,
SUM( repair_bus_veh_month ) repair_month,
SUM( repair_bus_veh_inside_month ) repair_month_in,
0 + CAST( SUM( repair_bus_veh_inside_amount_month ) AS CHAR ) repair_month_in_money,
0 + CAST( SUM( repair_bus_veh_amount_month ) AS CHAR ) repair_month_money,
SUM( repair_bus_veh_out_month ) repair_month_out,
0 + CAST( SUM( repair_bus_veh_out_amount_month ) AS CHAR ) repair_month_out_money,
SUM( busrepairOrder_month ) repair_order_month,
SUM( busrepairOrder_month_inside ) repair_order_month_in,
SUM( busrepairOrder_month_out ) repair_order_month_out,
SUM( busrepairOrder_day ) repair_order_today,
SUM( busrepairOrder_day_inside ) repair_order_today_in,
SUM( busrepairOrder_day_out ) repair_order_today_out,
SUM( busrepairOrder_year ) repair_order_year,
SUM( busrepairOrder_year_inside ) repair_order_year_in,
SUM( busrepairOrder_year_out ) repair_order_year_out,
SUM( repair_bus_veh_day ) repair_today,
SUM( repair_bus_veh_inside_day ) repair_today_in,
0 + CAST( SUM( repair_bus_veh_inside_amount_day ) AS CHAR ) repair_today_in_money,
0 + CAST( SUM( repair_bus_veh_amount_day ) AS CHAR ) repair_today_money,
SUM( repair_bus_veh_out_day ) repair_today_out,
0 + CAST( SUM( repair_bus_veh_out_amount_day ) AS CHAR ) repair_today_out_money,
SUM( repair_bus_veh_year ) repair_year,
SUM( repair_bus_veh_inside_year ) repair_year_in,
0 + CAST( SUM( repair_bus_veh_inside_amount_year ) AS CHAR ) repair_year_in_money,
0 + CAST( SUM( repair_bus_veh_amount_year ) AS CHAR ) repair_year_money,
SUM( repair_bus_veh_out_year ) repair_year_out,
0 + CAST( SUM( repair_bus_veh_out_amount_year ) AS CHAR ) repair_year_out_money,
SUM( repair_veh ) repairing,
SUM( repair_veh_inside ) repairing_in,
SUM( repair_veh_out ) repairing_out,
SUM( in_Payment_invoice_counts ) three_guarantee_invoice,
0 + CAST( SUM( in_Payment_invoice_amount ) AS CHAR ) three_guarantee_invoice_money,
SUM( in_Payment_no_invoice_counts ) three_guarantee_no_invoice,
0 + CAST( SUM( in_Payment_no_invoice_amount ) AS CHAR ) three_guarantee_no_invoice_money,
SUM( insurance_in_Payment_counts ) three_guarantee_unpaid,
SUM( insurance_out_Payment_counts ) three_guarantee_unpaid2,
0 + CAST( SUM( insurance_in_Payment_amount ) AS CHAR ) three_guarantee_unpaid_money,
0 + CAST( SUM( insurance_out_Payment_amount ) AS CHAR ) three_guarantee_unpaid_money2,
DATE_FORMAT( createTime, '%Y-%m-%d' ) `date`
FROM
as_daily_report
<where>
${ew.sqlSegment}
</where>
GROUP BY
DATE_FORMAT( createTime, '%Y-%m-%d' )
) a
WHERE
a.`date` = #{date}
</select>
</mapper>

96
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportRest.java

@ -0,0 +1,96 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.biz.asdailyreport;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReport;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportQuery;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDetailsVo;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDto;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportFeign;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportFeignFallback.java <br/>
* Class: com.yxt.anrui.reportcenter.biz.asdailyreport.AsDailyReportRest <br/>
* Description: 售后日报表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "售后日报表")
@RestController("com.yxt.anrui.reportcenter.biz.asdailyreport.AsDailyReportRest")
@RequestMapping("v1/ASDailyReport")
public class AsDailyReportRest implements AsDailyReportFeign {
@Autowired
private AsDailyReportService asDailyReportService;
@Override
public ResultBean<PagerVo<AsDailyReportVo>> listPage(@RequestBody PagerQuery<AsDailyReportQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<AsDailyReportVo> pv = asDailyReportService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AsDailyReportDto dto){
ResultBean rb = ResultBean.fireFail();
asDailyReportService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
asDailyReportService.delBySids(sids);
return rb.success();
}
@Override
public ResultBean<AsDailyReportDetailsVo> fetchDetailsBySid(String date, String userSid, String menuSid, String orgPath) {
return asDailyReportService.fetchDetailsVoBySid(date,userSid,menuSid,orgPath);
}
}

185
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/asdailyreport/AsDailyReportService.java

@ -0,0 +1,185 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.reportcenter.biz.asdailyreport;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReport;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportQuery;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportVo;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDetailsVo;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportDto;
import com.yxt.anrui.reportcenter.api.asdailyreport.AsDailyReportFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: report(售后报表) <br/>
* File: AsDailyReportService.java <br/>
* Class: com.yxt.anrui.reportcenter.biz.asdailyreport.AsDailyReportService <br/>
* Description: 售后日报表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-11-01 10:15:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsDailyReportService extends MybatisBaseService<AsDailyReportMapper, AsDailyReport> {
@Autowired
private SysUserFeign sysUserFeign;
private QueryWrapper<AsDailyReport> createQueryWrapper(AsDailyReportQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<AsDailyReport> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<AsDailyReportVo> listPageVo(PagerQuery<AsDailyReportQuery> pq) {
IPage<AsDailyReport> page = PagerUtil.queryToPage(pq);
AsDailyReportQuery pagerQuery = pq.getParams();
QueryWrapper<AsDailyReport> qw = new QueryWrapper<>();
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
//1集团
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.eq("busOrgSid", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.eq("createOrgSid", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.eq("useOrgSid", orgSidPath);
//4部门
} else if ("5".equals(orgLevelKey)) {
PagerVo<AsDailyReportVo> p = new PagerVo<>();
return p;
} else {
PagerVo<AsDailyReportVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsDailyReportVo> p = new PagerVo<>();
return p;
}
IPage<AsDailyReportVo> pagging = baseMapper.listPage(page, qw);
PagerVo<AsDailyReportVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(AsDailyReportDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(AsDailyReportDto dto){
AsDailyReport entity = new AsDailyReport();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(AsDailyReportDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
AsDailyReport entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ResultBean<AsDailyReportDetailsVo> fetchDetailsVoBySid(String date, String userSid, String menuSid, String orgPath){
ResultBean rb = ResultBean.fireFail();
AsDailyReportDetailsVo vo = new AsDailyReportDetailsVo();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(orgPath);
privilegeQuery.setMenuSid(menuSid);
privilegeQuery.setUserSid(userSid);
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
QueryWrapper<AsDailyReport> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgLevelKey = defaultIdReltBean.getData();
String orgSidPath = orgPath;
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
if ("1".equals(orgLevelKey)) {
//1集团
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.eq("busOrgSid", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.eq("createOrgSid", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.eq("useOrgSid", orgSidPath);
//4部门
}
vo = baseMapper.fetchDetailsVoBySid(qw,date);
}
return rb.success().setData(vo);
}
}

70
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@ -664,38 +664,52 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
private void pushAccrualVoucher(String businessSid) {
List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(businessSid);
if (!records.isEmpty()) {
GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanMonthlyAccrualRecord v : records) {
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();
if (null != planDetails) {
String useOrgSid = planDetails.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
if (null != organizationVo) {
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
String scheduleSid = planDetails.getScheduleSid();
LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
if (null != repaymentSchedule) {
if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
}
}
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
if (null != busSalesOrderVehicle) {
String customerNumber = "";
if (StringUtils.isNotBlank(busSalesOrderVehicle.getTemporaryNo())) {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
int index = 1000;
for (int i = 0; i < records.size(); i += 1000) {
if (i + 1000 > records.size()) {
index = records.size() - i;
}
List<LoanMonthlyAccrualRecord> newList = records.subList(i, i + index);
if (!newList.isEmpty()) {
GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanMonthlyAccrualRecord v : newList) {
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();
if (null != planDetails) {
String useOrgSid = planDetails.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
if (null != organizationVo) {
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
String scheduleSid = planDetails.getScheduleSid();
LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
if (null != repaymentSchedule) {
if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
}
}
voucherDetail.setCustomerCode(customerNumber);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
if (null != busSalesOrderVehicle) {
String customerNumber = "";
if (StringUtils.isNotBlank(busSalesOrderVehicle.getTemporaryNo())) {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
voucherDetail.setCustomerCode(customerNumber);
}
voucherDetail.setAmount(planDetails.getDueMoney());
voucherDetails.add(voucherDetail);
}
voucherDetail.setAmount(planDetails.getDueMoney());
voucherDetails.add(voucherDetail);
}
generalVoucher.setVoucherDetails(voucherDetails);
try {
finKingDeeFeign.saveAccrualVoucher(generalVoucher);
} catch (Exception e) {
e.printStackTrace();
}
}
}
generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveAccrualVoucher(generalVoucher);
}
}

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -581,7 +581,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
otherBankNo = scheduleDetails.getOtherBankNo();
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (int j = 0; j < vehicles.size(); j++) {
BusSalesOrderVehicle vehicle = vehicles.get(j);
@ -790,7 +790,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
bankContractNo = loancontractVo.getBankContractNo();
}
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (int j = 0; j < vehicles.size(); j++) {
BusSalesOrderVehicle vehicle = vehicles.get(j);
@ -969,7 +969,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
otherBankNo = scheduleDetails.getOtherBankNo();
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
@ -1145,7 +1145,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
bankContractNo = loancontractVo.getBankContractNo();
}
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
@ -1390,7 +1390,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
otherBankNo = scheduleDetails.getOtherBankNo();
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (int j = 0; j < vehicles.size(); j++) {
BusSalesOrderVehicle vehicle = vehicles.get(j);
@ -1598,7 +1598,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
bankContractNo = loancontractVo.getBankContractNo();
}
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (int j = 0; j < vehicles.size(); j++) {
BusSalesOrderVehicle vehicle = vehicles.get(j);
@ -1776,7 +1776,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
otherBankNo = scheduleDetails.getOtherBankNo();
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
@ -1951,7 +1951,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
bankContractNo = loancontractVo.getBankContractNo();
}
}
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue

@ -374,7 +374,7 @@ export default {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.$message({ showClose: true, type: 'success', message: res.msg })
this.handleReturn('true')
}
}).catch(() => {

2
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue

@ -376,7 +376,7 @@ export default {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.$message({ showClose: true, type: 'success', message: res.msg })
// ()
window.parent.postMessage({
cmd: 'returnHeight',

6
yxt-as-ui/src/api/storage/otherOutbound.js

@ -94,7 +94,7 @@ export default {
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/reject',
url: '/wms/v1/wmsotheroutapply/delegate',
method: 'post',
data: params,
headers: {
@ -149,7 +149,7 @@ export default {
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/wms/v1/wmsotheroutapply/getPreviousNodesForReject',
url: '/wms/v1/wmsotheroutapply/getNextNodesForSubmit',
method: 'get',
params: data
})
@ -157,7 +157,7 @@ export default {
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/wms/v1/wmsotheroutapply/getNextNodesForSubmit',
url: '/wms/v1/wmsotheroutapply/getPreviousNodesForReject',
method: 'get',
params: data
})

129
yxt-as-ui/src/components/publicPage/quickAddCustomer.vue

@ -294,6 +294,28 @@ import { getProvince, getCity, getCounty, typeValues } from '@/api/Common/dictco
export default {
name: 'CustomerManagementAdd',
data() {
var vehMark = (rule, value, callback) => {
if (value === '') {
callback(new Error('车牌号不能为空'))
} else {
if (value.length < 7) {
callback(new Error('车牌号长度不少于7位'))
} else {
callback()
}
}
}
var vinNo = (rule, value, callback) => {
if (value === '') {
callback(new Error('车架号不能为空'))
} else {
if (value.length !== 8) {
callback(new Error('车架号长度为8位'))
} else {
callback()
}
}
}
return {
viewTitle: '',
viewState: 1,
@ -372,13 +394,16 @@ export default {
brakepads_km: '',
brakepads_date: '',
carRemarks: '',
byRemarks: ''
byRemarks: '',
vehState: '',
saleOrgName: '',
saleDate: ''
},
rules: {
name: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
vehMark: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }],
vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }]
vehMark: [{ required: true, validator: vehMark, trigger: 'blur' }],
vinNo: [{ required: true, validator: vinNo, trigger: 'blur' }]
}
}
},
@ -465,45 +490,41 @@ export default {
}
return val
},
showAdd(value, sid) {
showAdd(value) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
if (sid !== '') {
this.viewTitle = '【快捷新增】客户信息'
req.quickAddInit({ sid: sid }).then((resp) => {
if (resp.success) {
this.formobj = resp.data
this.basics(value)
}
})
} else {
this.viewTitle = '【新增】客户信息'
this.basics(value)
}
},
//
basics(value) {
this.formobj.isOnRemind = '否'
this.formobj.isOnRemindKey = '0'
this.formobj.customerType = value.customerType
this.formobj.customerTypeKey = value.customerTypeKey
this.formobj.visitWay = value.visitWay
this.formobj.visitWayKey = value.visitWayKey
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
if (this.formobj.customerType === '个人') {
this.formobj.certificateType = '身份证'
this.formobj.certificateTypeKey = '01'
} else {
this.formobj.certificateType = '营业执照'
this.formobj.certificateTypeKey = '02'
}
typeValues({ psid: value.psid, type: 'customerClass' }).then((res) => {
this.viewTitle = '【新增】客户信息'
req.customerInit(value).then((res) => {
if (res.success) {
this.customerClass_list = res.data
this.formobj = res.data
typeValues({ type: 'customerType' }).then((resp) => {
if (resp.success) {
this.customerType_list = resp.data
this.customerType_list.forEach((e) => {
if (e.dictValue === this.formobj.customerType) {
typeValues({ psid: e.sid, type: 'customerClass' }).then((respsone) => {
if (respsone.success) {
this.customerClass_list = respsone.data
}
})
}
})
}
})
//
if (res.data.vehState !== '0') {
this.formobj.isOnRemind = '否'
this.formobj.isOnRemindKey = '0'
if (this.formobj.customerType === '个人') {
this.formobj.certificateType = '身份证'
this.formobj.certificateTypeKey = '01'
} else {
this.formobj.certificateType = '营业执照'
this.formobj.certificateTypeKey = '02'
}
}
}
})
},
@ -605,7 +626,39 @@ export default {
useOrgSid: '',
sid: '',
customerOrgName: '',
customerOrgSid: ''
customerOrgSid: '',
customerVehSid: '',
customerSid: '',
vehMark: '',
vinNo: '',
engineNo: '',
vehModelSid: '',
vehModel: '',
mileage: '',
lastMileage: '',
nextMaintainDate: '',
buyDate: '',
commercialInsuranceEndDate: '',
compulsoryInsuranceEndDate: '',
currentMileage: '',
monthKm: '',
filter_km: '',
filter_date: '',
engineoil_km: '',
engineoil_date: '',
gearoil_km: '',
gearoil_date: '',
treasurewheel_km: '',
treasurewheel_date: '',
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
brakepads_date: '',
carRemarks: '',
byRemarks: '',
vehState: '',
saleOrgName: '',
saleDate: ''
}
this.submitdisabled = false
this.$emit('doback')

89
yxt-as-ui/src/components/publicPage/selectCustomer.vue

@ -16,7 +16,7 @@
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入4位以上的车架号" clearable/>
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
@ -40,8 +40,7 @@
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" width="100" align="center">
<template slot-scope="scope">
@ -68,7 +67,7 @@
<!-- 快捷新增客户 -->
<quickAddCustomer ref="divQuickAdd" v-show="viewState == 3" @doback="resetState" @reloadlist="getList" />
<!-- 客户登记 -->
<el-dialog :visible.sync="dialogVisible" width="30%" :show-close="false">
<el-dialog :visible.sync="dialogVisible" width="40%" :show-close="false">
<el-form ref="form_obj" v-model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
@ -79,6 +78,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">客户类型</div>
<el-form-item>
@ -88,6 +89,17 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">车架号</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vinNo" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item><span style="color: red;font-weight: bold">若填写的车架号为集团销售车辆平台自动获取相应客户信息</span></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleConfirm()"> </el-button>
@ -115,15 +127,7 @@ export default {
data() {
return {
btndisabled: false,
isQuickAdd: false, //
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toQuickAdd',
btnLabel: '快捷新增客户'
},
{
type: 'primary',
size: 'small',
@ -144,7 +148,6 @@ export default {
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
@ -168,7 +171,11 @@ export default {
visitWayKey: '',
customerType: '', //
customerTypeKey: '',
psid: ''
psid: '',
vinNo: '',
userSid: '',
orgPath: '',
useOrgSid: ''
},
visitWay_list: [],
customerType_list: []
@ -202,9 +209,6 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toQuickAdd':
this.toQuickAdd()
break
case 'toAdd':
this.toAdd()
break
@ -215,15 +219,6 @@ export default {
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@ -267,30 +262,18 @@ export default {
this.listQuery.params.customerTypeKey = ''
this.getList()
},
toQuickAdd() {
if (this.sids.length === 1) {
this.dialogVisible = true
this.isQuickAdd = true
this.formobj = {
visitWay: '', //
visitWayKey: '',
customerType: '', //
customerTypeKey: '',
psid: ''
}
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
toAdd() {
this.dialogVisible = true
this.isQuickAdd = false
this.formobj = {
visitWay: '', //
visitWayKey: '',
customerType: '', //
customerTypeKey: '',
psid: ''
psid: '',
vinNo: '',
userSid: '',
orgPath: '',
useOrgSid: ''
}
},
visitWayChange(value) {
@ -307,17 +290,19 @@ export default {
}
},
handleConfirm() {
if (this.formobj.customerType !== '' && this.formobj.visitWay !== '') {
this.dialogVisible = false
if (this.isQuickAdd) {
this.viewState = 3
this.$refs['divQuickAdd'].showAdd(this.formobj, this.sids[0])
} else {
this.viewState = 3
this.$refs['divQuickAdd'].showAdd(this.formobj, '')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
if (this.formobj.customerType !== '' && this.formobj.visitWay !== '' && this.formobj.vinNo !== '') {
if (this.formobj.vinNo.length !== 8 && this.formobj.vinNo.length !== 17) {
this.$message({ showClose: true, message: '车架号长度为8位或17位', type: 'error' })
return
}
this.dialogVisible = false
this.viewState = 3
this.$refs['divQuickAdd'].showAdd(this.formobj)
} else {
this.$message({ showClose: true, message: '请填写联络方式和客户类型', type: 'warning' })
this.$message({ showClose: true, message: '请填写联络方式、客户类型、车架号的信息', type: 'error' })
}
},
handleAffirm(row) {

25
yxt-as-ui/src/router/index.js

@ -1383,11 +1383,34 @@ export const constantRoutes = [{
},
// 欠款月结客户备案 -- 已办
{
path: '/qiankuanyuejieFlow/maintenanceEnterpriseYiBan',
path: '/workFlow/maintenanceEnterpriseYiBan',
component: () =>
import('@/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue'),
name: 'MaintenanceEnterpriseYiBan'
},
// 其他出库 -- 编辑
{
path: '/qitachukuFlow/otherOutboundEdit',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundEdit.vue'),
name: 'OtherOutboundEdit'
},
// 其他出库 -- 待办
{
path: '/qitachukuFlow/otherOutboundDaiBan',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue'),
name: 'OtherOutboundDaiBan'
},
// 其他出库 -- 已办
{
path: '/qitachukuFlow/otherOutboundYiBan',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue'),
name: 'OtherOutboundYiBan'
},
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]

2
yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingInfo.vue

@ -39,7 +39,7 @@
<el-table :key="tableKey" :data="formobj.asServiceAccommDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="postName" label="职称名称" align="center" />
<el-table-column prop="commRatio" label="权重" align="center" />
<el-table-column prop="commRatio" label="提成比例(%)" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
</el-form>

3
yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue

@ -234,7 +234,8 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false

10
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@ -1015,15 +1015,23 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.waitorName = window.sessionStorage.getItem('name')
this.formobj.waitorSid = window.sessionStorage.getItem('userSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
day: nowDate.getDate(),
hours: nowDate.getHours(),
minutes: nowDate.getMinutes(),
seconds: nowDate.getSeconds()
}
this.formobj.createDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.formobj.entryTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) + ' ' + date.hours + ':' + (date.minutes >= 10 ? date.minutes : '0' + date.minutes) + ':' + (date.seconds >= 10 ? date.seconds : '0' + date.seconds)
this.formobj.estimatedFinishTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) + ' ' + date.hours + ':' + (date.minutes >= 10 ? date.minutes : '0' + date.minutes) + ':' + (date.seconds >= 10 ? date.seconds : '0' + date.seconds)
this.formobj.isSpecialSign = '0'
this.formobj.isGoOut = '2'
this.formobj.nodeCode = '1'
this.formobj.nodeName = '登记'

2
yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@ -102,7 +102,7 @@
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeValue" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeKey" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-option v-for="item in manufacturersOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>

3
yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue

@ -61,7 +61,8 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toEdit(scope.row)"
:disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>

2
yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue

@ -130,6 +130,7 @@
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": [
@ -334,6 +335,7 @@
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": []

2
yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@ -101,7 +101,7 @@
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeValue" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeKey" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-option v-for="item in manufacturersOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>

2
yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue

@ -42,7 +42,7 @@
<el-table :key="tableKey" :data="formobj.asServiceAccommDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="postName" label="职称名称" align="center" />
<el-table-column prop="commRatio" label="权重" align="center" />
<el-table-column prop="commRatio" label="提成比例(%)" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
</el-form>

2
yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue

@ -39,7 +39,7 @@
<el-table :key="tableKey" :data="formobj.asServiceAccommDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="postName" label="职称名称" align="center" />
<el-table-column prop="commRatio" label="权重" align="center" />
<el-table-column prop="commRatio" label="提成比例(%)" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
</el-form>

438
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue

@ -0,0 +1,438 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>其他出库详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" prop="outCount" align="center" width="120" />
<el-table-column label="金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import {
selectStaffListss
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
indexMethod(index) {
return index + 1
},
showInfo(sid) {
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
resetState() {
this.viewState = 1
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({
showClose: true,
type: 'error',
message: '请选择加签人员'
})
return
}
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.first_row {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}
</style>

445
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundEdit.vue

@ -0,0 +1,445 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}其他出库</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 业务类型</div>
<el-form-item prop="busTypeKey"><el-select v-model="formobj.busTypeKey" filterable clearable
placeholder="请选择" class="addinputInfo addinputw" @change="busTypeSelect">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputInfo addinputw"
clearable /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">选择商品</el-button>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;"
ref="dataTable">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
v-model="scope.row.outCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" prop="amount" align="center" width="150" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import {
getCurrentDate
} from '@/utils/index.js'
import chooseproducts from './relation/chooseproducts'
import {
getOrgSidByPath,
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
chooseproducts,
},
data() {
return {
viewState: 1,
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": [
]
},
busTypeList: [],
rules: {
busTypeKey: [{
required: true,
message: '请选择业务类型',
trigger: 'change'
}],
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
init() {
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_ck'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.otheroutDetailList.push({
"sid": "",
"mainSid": "",
"goodsID": e.goodsID,
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
"unit": e.unit,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"inCost": e.taxPrice,
// "count": e.count,
"outCount": 0,
"amount": 0
})
})
}
},
resetState() {
this.viewState = 1
},
seleMaintenance() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.deptSid)
},
doGoods(row) {
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.otheroutDetailList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.otheroutDetailList.splice(index, 1)
})
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.otheroutDetailList.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.otheroutDetailList.length; i++) {
var item = this.formobj.otheroutDetailList[i]
if (item.goodsSkuSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
if (item.outCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '出库数量不能为空或0'
})
return
}
}
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": []
}
this.submitdisabled = false
this.$emit('doback')
},
showInfo(sid) {
this.title = "【修改】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
busTypeSelect(val) {
const choose = this.busTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>busTypeSelect', choose)
this.formobj.busTypeKey = choose[0].dictKey
this.formobj.busTypeValue = choose[0].dictValue
},
commodityComputeYHAndXSJE(row, val) {
// if (Number(row.outCount) > Number(row.count)) {
// row.outCount = row.count
// }
row.amount = (Number(row.outCount) * Number(row.inCost)).toFixed(2)
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

191
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue

@ -0,0 +1,191 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>其他出库详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" prop="outCount" align="center" width="120" />
<el-table-column label="金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
indexMethod(index) {
return index + 1
},
showInfo(sid) {
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

168
yxt-as-ui/src/views/workFlow/qitachukuFlow/relation/chooseproducts.vue

@ -0,0 +1,168 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
</el-form-item>
<!-- <el-form-item label="供应商" class="searchlist">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品列表</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<!-- <el-table-column prop="count" label="库存" align="center" /> -->
<!-- <el-table-column prop="manufacturerName" label="供应商" align="center" /> -->
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/otherOutbound.js'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
deptSid: '',
goodsSkuTitle: '',
goodsSkuCode: '',
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.sourceBillBySid(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

4
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java

@ -113,4 +113,8 @@ public class AsCustomerVehicleDetails{
private String carRemarks;
@ApiModelProperty("保养备注")
private String byRemarks;
private String vehState;
private String saleOrgName;
private String saleDate;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/QuickAddCustomer.java

@ -179,7 +179,9 @@ public class QuickAddCustomer implements Dto {
@ApiModelProperty("保养备注")
private String byRemarks;
private String vehState;
private String saleOrgName;
private String saleDate;
}

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -58,6 +58,7 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -413,6 +414,11 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
if (StringUtils.isNotBlank(bill.getCustomerOrg())) {
billDto.setCustomerOrg(bill.getCustomerOrg());
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = sdf.format(new Date());
billDto.setEntryTime(format);
billDto.setEstimatedFinishTime(format);
billDto.setIsSpecialSign("0");
if (!dto.getSitemVos().isEmpty()) {
List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
for (AsbillSitemVo sitemVo : dto.getSitemVos()) {

21
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@ -33,6 +33,8 @@ import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
import com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceService;
import com.yxt.anrui.as.feign.crm.CrmCustomerTempDto;
import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign;
import com.yxt.anrui.as.feign.yxtcrm.CrmCustomerDto;
import com.yxt.anrui.as.feign.yxtcrm.YxtCrmCustomerTempFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -65,7 +67,8 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
private AsCustomervehMaintenanceService asCustomervehMaintenanceService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private YxtCrmCustomerTempFeign yxtCrmCustomerTempFeign;
private QueryWrapper<AsCustomerVehicle> createQueryWrapper(AsCustomerVehicleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -255,14 +258,26 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
public ResultBean quickAddSave(QuickAddCustomer dto) {
ResultBean rb = ResultBean.fireFail();
CrmCustomerTempDto tempDto = new CrmCustomerTempDto();
CrmCustomerDto tempDto = new CrmCustomerDto();
BeanUtil.copyProperties(dto, tempDto);
ResultBean save = crmCustomerTempFeign.save(tempDto);
ResultBean save = yxtCrmCustomerTempFeign.saveForQuickVeh(tempDto);
if (save.getSuccess()) {
String sid = (String) save.getData();
dto.setCustomerSid(sid);
AsCustomerVehicleDetails vehicleDetails = new AsCustomerVehicleDetails();
BeanUtil.copyProperties(dto, vehicleDetails);
if (dto.getVehState().equals("0")) {
if (StringUtils.isNotBlank(dto.getVinNo())) {
vehicleDetails.setVinNo(dto.getVinNo());
}
if (StringUtils.isNotBlank(dto.getSaleOrgName())) {
vehicleDetails.setSaleOrgName(dto.getSaleOrgName());
}
if (StringUtils.isNotBlank(dto.getSaleDate())) {
vehicleDetails.setSaleDate(dto.getSaleDate());
}
vehicleDetails.setVehState("0");
}
saveCustomerVeh(vehicleDetails);
} else {
return rb.setMsg(save.getMsg());

1
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@ -270,6 +270,7 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
qw.eq("a.isDelete", 0);
qw.eq("a.isEnable", 1);
qw.eq("a.state", 2);
qw.eq("a.useOrgSid", query.getUseOrgSid());
qw.orderByAsc("a.sortNo");
IPage<AsServiceItem> page = PagerUtil.queryToPage(pq);
IPage<AsServiceItemVo> pagging = baseMapper.selectPageVo(page, qw);

236
yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/CrmCustomerDto.java

@ -0,0 +1,236 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.feign.yxtcrm;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* Project: crm(crm) <br/>
* File: CrmCustomerDto.java <br/>
* Class: com.yxt.crm.api.crmcustomer.CrmCustomerDto <br/>
* Description: 客户 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-15 17:06:09 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户 数据传输对象", description = "客户 数据传输对象")
public class CrmCustomerDto implements Dto {
private static final long serialVersionUID = 793474187074718535L;
@ApiModelProperty(value = "当前登录用户的sid")
private String userSid;
@ApiModelProperty(value = "客户类型(1个人/2企业)", required = true)
@NotBlank(message = "客户类型为必选项")
private String customerType;
@ApiModelProperty(value = "客户类型key", required = true)
@NotBlank(message = "客户类型为必选项")
private String customerTypeKey;
@ApiModelProperty(value = "见面方式key", required = true)
@NotBlank(message = "见面方式为必选项")
private String visitWayKey;
@ApiModelProperty(value = "见面方式(到店/电话/拜访)", required = true)
@NotBlank(message = "见面方式为必选项")
private String visitWay;
@ApiModelProperty(value = "客户名称", required = true)
@NotBlank(message = "客户名称为必填项")
private String name;
@ApiModelProperty("联系电话")
@NotBlank(message = "联系电话为必填项")
private String mobile;
@ApiModelProperty("微信号码")
private String weixin;
@ApiModelProperty("公司名称:个人客户时显示")
private String companyName;
@ApiModelProperty("行政区划代码(省)")
private String address_province;
@ApiModelProperty("行政区划代码(市)")
private String address_city;
@ApiModelProperty("行政区划代码(县)")
private String address_county;
@ApiModelProperty("客户地址:省")
private String province;
@ApiModelProperty("客户地址:市")
private String city;
@ApiModelProperty("客户地址:县")
private String county;
@ApiModelProperty("客户地址:详细地址")
private String address;
@ApiModelProperty("客户级别(意向客户/准客户/成交客户/集团内销/黑名单客户)")
private String level;
@ApiModelProperty("客户级别key")
private String levelKey;
@ApiModelProperty("是否开启提醒(1开启,0不开启)")
private String isOnRemindkey;
@ApiModelProperty("是否开启提醒(1开启,0不开启)")
private String isOnRemind;
@ApiModelProperty("提醒日期")
private String remind_day;
@ApiModelProperty("提醒备注")
private String remind_remark;
//更多信息
@ApiModelProperty("客户生日:个人客户时显示")
private String birthday;
@ApiModelProperty("性别:个人客户时显示")
private String sex;
@ApiModelProperty("性别key:个人客户时")
private String sexKey;
@ApiModelProperty("证件类型key")
private String certificateTypeKey;
@ApiModelProperty("证件类型(个人为身份证/企业为营业执照)")
private String certificateType;
@ApiModelProperty("证件号码(个人为身份证号/企业为统一社会信用代码)")
private String IDNumber;
@ApiModelProperty("证件有效期")
private String endDate;
@ApiModelProperty("电子邮箱")
private String e_mail;
@ApiModelProperty(value = "联系人")
private String contacts;
@ApiModelProperty("紧急联系人")
private String emergencyContact;
@ApiModelProperty("紧急联系电话")
private String emergencyMobile;
@ApiModelProperty("客户来源(公司资源/自主开发/交接客户/转介绍客户/集团内销)")
private String source;
@ApiModelProperty("客户来源key")
private String sourceKey;
@ApiModelProperty("客户分类(个人:司机/个体老板/其他。企业:企业型客户/一级经销商/二级经销商/终端物流客户)")
private String customerClass;
@ApiModelProperty("客户分类key")
private String customerClassKey;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty("业务人员sid")
private String staffSid;
// //运营信息
// @ApiModelProperty(value = "运营信息")
// private CrmBusinessDto crmBusinessDto = new CrmBusinessDto();
// //见证材料集合
// @ApiModelProperty(value = "见证材料的集合,编辑保存时无此字段")
// private List<PcCrmVisitAppendixDto> crmVisitAppendixDtoList = new ArrayList<>();
private String orgPath;
private String useOrgSid;
private String customerOrgSid;
private String customerOrgName;
private String vinNo;
private String vehState;
private String saleOrgName;
private String saleDate;
private String sid;
//--------------------车辆信息----------------------
private String customerVehSid; // 客户车辆信息sid
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private String mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private String lastMileage; // 上次保养里程
@ApiModelProperty("下次保养日期")
private String nextMaintainDate; // 下次保养日期
@ApiModelProperty("购车日期")
private String buyDate; // 购车日期
@ApiModelProperty("商业险到期日期")
private String commercialInsuranceEndDate; // 商业险到期日期
@ApiModelProperty("交强险到期日期")
private String compulsoryInsuranceEndDate; // 交强险到期日期
@ApiModelProperty("行驶里程")
private String currentMileage; // 行驶里程
@ApiModelProperty("每月公里")
private String MonthKm; // 每月公里
@ApiModelProperty("滤芯到期公里")
private String filter_km; // 滤芯到期公里
@ApiModelProperty("滤芯到期日期")
private String filter_date; // 滤芯到期日期
@ApiModelProperty("机油到期公里")
private String engineoil_km; // 机油到期公里
@ApiModelProperty("机油到期日期")
private String engineoil_date; // 机油到期日期
@ApiModelProperty("齿轮油到期公里")
private String gearoil_km; // 齿轮油到期公里
@ApiModelProperty("齿轮油到期日期")
private String gearoil_date; // 齿轮油到期日期
@ApiModelProperty("宝轮到期公里")
private String treasurewheel_km; // 宝轮到期公里
@ApiModelProperty("宝轮到期日期")
private String treasurewheel_date; // 宝轮到期日期
@ApiModelProperty("风扇皮带到期公里")
private String fanbelt_km; // 风扇皮带到期公里
@ApiModelProperty("风扇皮带到期日期")
private String fanbelt_date; // 风扇皮带到期日期
@ApiModelProperty("刹车片到期公里")
private String brakepads_km; // 刹车片到期公里
@ApiModelProperty("刹车片到期日期")
private String brakepads_date; // 刹车片到期日期
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("保养备注")
private String byRemarks;
}

36
yxt-as/src/main/java/com/yxt/anrui/as/feign/yxtcrm/YxtCrmCustomerTempFeign.java

@ -0,0 +1,36 @@
package com.yxt.anrui.as.feign.yxtcrm;
import com.yxt.anrui.as.feign.crm.CrmCustomerTemp;
import com.yxt.anrui.as.feign.crm.CrmCustomerTempDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* @author Fan
* @description
* @date 2024/7/19 10:10
*/
@Api(tags = "潜在客户信息")
@FeignClient(
contextId = "anrui-yxt-CrmCustomer",
name = "yxt-crm",
path = "/apiadmin/v1/crmcustomer"
)
public interface YxtCrmCustomerTempFeign {
/**
* pc端潜在客户新增保存
*
* @param dto 客户信息及运行信息数据传输对象
* @return
*/
@ApiOperation("新增保存")
@PostMapping("/saveForQuickVeh")
public ResultBean<String> saveForQuickVeh(@Valid @RequestBody CrmCustomerDto dto);
}

12
yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java

@ -93,6 +93,18 @@ public class CrmCustomerRest {
return crmCustomerService.saveCrmCustomer(dto);
}
/**
* pc端潜在客户新增保存
*
* @param dto 客户信息及运行信息数据传输对象
* @return
*/
@ApiOperation("新增保存")
@PostMapping("/saveForQuickVeh")
public ResultBean<String> saveForQuickVeh(@Valid @RequestBody CrmCustomerDto dto) {
return crmCustomerService.saveForQuickVeh(dto);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")

62
yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java

@ -173,4 +173,66 @@ public class CrmCustomerDto implements Dto {
private String saleDate;
private String sid;
//--------------------车辆信息----------------------
private String customerVehSid; // 客户车辆信息sid
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private String mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private String lastMileage; // 上次保养里程
@ApiModelProperty("下次保养日期")
private String nextMaintainDate; // 下次保养日期
@ApiModelProperty("购车日期")
private String buyDate; // 购车日期
@ApiModelProperty("商业险到期日期")
private String commercialInsuranceEndDate; // 商业险到期日期
@ApiModelProperty("交强险到期日期")
private String compulsoryInsuranceEndDate; // 交强险到期日期
@ApiModelProperty("行驶里程")
private String currentMileage; // 行驶里程
@ApiModelProperty("每月公里")
private String MonthKm; // 每月公里
@ApiModelProperty("滤芯到期公里")
private String filter_km; // 滤芯到期公里
@ApiModelProperty("滤芯到期日期")
private String filter_date; // 滤芯到期日期
@ApiModelProperty("机油到期公里")
private String engineoil_km; // 机油到期公里
@ApiModelProperty("机油到期日期")
private String engineoil_date; // 机油到期日期
@ApiModelProperty("齿轮油到期公里")
private String gearoil_km; // 齿轮油到期公里
@ApiModelProperty("齿轮油到期日期")
private String gearoil_date; // 齿轮油到期日期
@ApiModelProperty("宝轮到期公里")
private String treasurewheel_km; // 宝轮到期公里
@ApiModelProperty("宝轮到期日期")
private String treasurewheel_date; // 宝轮到期日期
@ApiModelProperty("风扇皮带到期公里")
private String fanbelt_km; // 风扇皮带到期公里
@ApiModelProperty("风扇皮带到期日期")
private String fanbelt_date; // 风扇皮带到期日期
@ApiModelProperty("刹车片到期公里")
private String brakepads_km; // 刹车片到期公里
@ApiModelProperty("刹车片到期日期")
private String brakepads_date; // 刹车片到期日期
@ApiModelProperty("车辆备注")
private String carRemarks;
@ApiModelProperty("保养备注")
private String byRemarks;
}

100
yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java

@ -636,7 +636,6 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
if (null != customerTemp) {
BeanUtils.copyProperties(customerTemp,vo,"isDesignatedEnterprise","filingIndate","sid");
vo.setVehState("0");
vo.setVinNo(vinNo);
vo.setSaleOrgName(order.getUseOrgName());
vo.setSaleDate(DateUtil.formatDate(order.getCreateDate()));
}
@ -644,6 +643,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
}
}
}
vo.setVinNo(query.getVinNo());
vo.setUserSid(query.getUserSid());
vo.setUseOrgSid(query.getUseOrgSid());
vo.setOrgPath(query.getOrgPath());
@ -653,4 +653,102 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
vo.setCustomerTypeKey(query.getCustomerTypeKey());
return vo;
}
public ResultBean<String> saveForQuickVeh(CrmCustomerDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (dto.getVehState().equals("0")) {
CrmCustomer crmCustomerTemp = new CrmCustomer();
BeanUtil.copyProperties(dto,crmCustomerTemp,"sid");
String orgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
} else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
}
crmCustomerTemp.setCreateOrgSid(orgSid);
ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
if (resultBean.getSuccess() && resultBean.getData() != null) {
String key = resultBean.getData().toString();
crmCustomerTemp.setFollow_state_key(key);
crmCustomerTemp.setFollow_state(dictCommonFeign.selectBykey(key, DictCommonType.FOLLOW_STATE).getData().getDictValue());
}
//客户编码
String customerNo = getPrefix(crmCustomerTemp.getStaffSid(), crmCustomerTemp.getName(), crmCustomerTemp.getMobile());
crmCustomerTemp.setCustomerNo(customerNo);
if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
crmCustomerTemp.setUseOrgSid(dto.getUseOrgSid());
}
save(crmCustomerTemp);
} else {
//手机号
String mobile = dto.getMobile();
//微信号
String weixin = dto.getWeixin();
if ("1".equals(dto.getCustomerType())) {
/* if (!mobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
return rb.setMsg("手机号格式不正确");
}*/
/*if (StringUtils.isNotBlank(dto.getIDNumber())) {
if (!weixin.matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
return rb.setMsg("证件号码格式不正确");
}
}*/
} else {
/*if (StringUtils.isNotBlank(dto.getIDNumber())) {
if (dto.getIDNumber().length() != 9 && dto.getIDNumber().length() != 18) {
return rb.setMsg("证件号码格式不正确");
}
}*/
}
if (StringUtils.isNotBlank(weixin)) {
if (!weixin.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weixin.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
return rb.setMsg("微信号格式不正确");
}
}
String email = dto.getE_mail();
if (StringUtils.isNotBlank(email)) {
if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")) {
return rb.setMsg("邮箱格式不正确");
}
}
String emergencyMobile = dto.getEmergencyMobile();
if (StringUtils.isNotBlank(emergencyMobile)) {
if (!emergencyMobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
return rb.setMsg("紧急联系电话格式不正确");
}
}
//根据用户sid获取业务员信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
if (sysUserVo == null) {
return rb.setMsg("该用户不存在");
}
String staffSid = sysUserVo.getStaffSid();
String name = dto.getName();
//生成客户编码:分公司简称+部门编码+手机号+姓名首字母大写拼写
String customerNo = getPrefix(staffSid, name, mobile);
//查询该客户编码是否存在
CrmCustomer crmCustomerTemp = baseMapper.selectByCustomerNo(customerNo);
if (crmCustomerTemp != null) {//存在
//查询是否是当前用户客户
if (!dto.getUserSid().equals(crmCustomerTemp.getCreateBySid())) {
String staffName = "";
SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
if (sysCrmVo != null) {
staffName = sysCrmVo.getName();
return rb.setCode(HttpStatusEnum.CRM_ERROR_NOTBELONG.getCode()).setMsg("为" + staffName + "销售专员客户");
}
} else {
// 返回潜在客户sid,跳转维护信息页面
return rb.setCode(HttpStatusEnum.CRM_ERROR_EXIST.getCode()).setMsg(HttpStatusEnum.CRM_ERROR_EXIST.getMsg()).setData(crmCustomerTemp.getSid());
}
} else {//不存在
// 新增
CrmCustomer customerTemp = saveCrmCustomerTemp(dto, sysUserVo);
sid = customerTemp.getSid();
}
}
return rb.success().setData(sid);
}
}

Loading…
Cancel
Save