Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 weeks ago
parent
commit
e586b56546
  1. 47
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  2. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java
  5. 18
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java
  6. 116
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
  7. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
  8. 37
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  9. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java
  10. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml
  11. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java
  12. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
  13. 22
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml
  14. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
  15. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java
  16. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml
  17. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java
  18. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
  19. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
  20. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  21. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sms/SmsFeign.java
  22. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
  23. 64
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyEveDetailsVo.java
  24. 68
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTopDetailsVo.java
  25. 70
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTrailerDetailsVo.java
  26. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml

47
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@ -30,7 +30,6 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh;
@ -48,9 +47,6 @@ import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
@ -66,7 +62,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -74,29 +69,14 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApplyService.java <br/>
* Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyService <br/>
* Description: 调车开票申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-11 15:30:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseShuntingInvoicingApplyMapper, BaseShuntingInvoicingApply> {
@ -123,13 +103,6 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
@Autowired
private BaseVehicleService baseVehicleService;
private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseShuntingInvoicingApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseShuntingInvoicingApplyVo> listPageVo(PagerQuery<BaseShuntingInvoicingApplyQuery> pq) {
BaseShuntingInvoicingApplyQuery query = pq.getParams();
QueryWrapper<BaseShuntingInvoicingApply> qw = new QueryWrapper<>();
@ -271,15 +244,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
public ResultBean submitSunInv(SubmitBaseShuntingInvoicingApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(dto.getSid());
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVeh.getPurchaseSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();
if (finCompanyInvoicingDetailsVo == null){
return rb.setMsg("调入分公司企业开票信息不存在");
}
}
int r = submitBusinessData(dto, baseShuntingInvoicingApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
@ -293,6 +258,15 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
baseShuntingInvoicingApply = fetchBySid(businessSid);
List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVeh.getPurchaseSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();
if (finCompanyInvoicingDetailsVo == null){
return rb.setMsg("调入分公司企业开票信息不存在");
}
}
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
@ -300,8 +274,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//用户的部门全路径sid
BaseShuntingInvoicingApply baseShuntingInvoicingApply1 = fetchBySid(businessSid);
bv.setOrgSidPath(baseShuntingInvoicingApply1.getOrgSidPath());
bv.setOrgSidPath(baseShuntingInvoicingApply.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java

@ -25,6 +25,7 @@ public class AppFinPaymentApplyVo implements Vo {
//申请人
private String name;
//款项类别
private String costTypeKey;
private String costTypeValue;
//付款单位名称
private String payCompany;

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java

@ -40,6 +40,8 @@ public class FinPaymentapplyEve extends BaseEntity {
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("平仓款sid")
private String eveSid;
@ApiModelProperty("平仓款名称")
private String costTitleValue; // 平仓款名称
@ApiModelProperty("融资付款开通日期")

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java

@ -26,11 +26,9 @@
package com.yxt.anrui.fin.api.finpaymentapplyeve;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ -43,6 +41,8 @@ public class FinPaymentapplyEveDetailsVo implements Vo {
private String remarks;
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("平仓款sid")
private String eveSid;
@ApiModelProperty("平仓款名称")
private String costTitleValue; // 平仓款名称
@ApiModelProperty("融资付款开通日期")

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java

@ -25,28 +25,12 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplyeve;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-fin(付款申请平仓) <br/>
* File: FinPaymentapplyEveDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto <br/>
* Description: 付款申请-平仓 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-01-20 11:20:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款申请-平仓 数据传输对象", description = "付款申请-平仓 数据传输对象")
public class FinPaymentapplyEveDto implements Dto {
@ -57,6 +41,8 @@ public class FinPaymentapplyEveDto implements Dto {
private String remarks;
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("平仓款sid")
private String eveSid;
@ApiModelProperty("平仓款名称")
private String costTitleValue; // 平仓款名称
@ApiModelProperty("融资付款开通日期")

116
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@ -96,37 +96,37 @@
<select id="getSelectVinsList" resultType="com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo">
SELECT DISTINCT
bo.`sid` AS busSalesOrderSid,
bo.`payTypeKey` AS saleTypeKey,
bo.`payType` AS saleType,
bo.`contractNo` AS contractId,
bo.`staffSid`,
bo.`staffName` AS sellerName,
bo.`orgSid` AS staffDeptSid,
bo.`orgName` AS sellerDept,
bo.`customerSid`,
bo.`customerName` AS NAME,
bv.`linkNo` AS vin,
bv.`linkSid` AS vinSid,
bc.`certificateState` AS certificateStateKey,
bc.`certificateStateValue` AS certificateState,
bo.`purchaseSystemSid`,
bm.`modelName`,
bm.`modelSid`,
bo.`oneBillMoney` AS kpMoney,
bo.sid AS busSalesOrderSid,
bo.payTypeKey AS saleTypeKey,
bo.payType AS saleType,
bo.contractNo AS contractId,
bo.staffSid,
bo.staffName AS sellerName,
bo.orgSid AS staffDeptSid,
bo.orgName AS sellerDept,
bo.customerSid,
bo.customerName AS NAME,
bv.linkNo AS vin,
bv.linkSid AS vinSid,
bc.certificateState AS certificateStateKey,
bc.certificateStateValue AS certificateState,
bo.purchaseSystemSid,
bm.modelName,
bm.modelSid,
bo.oneBillMoney AS kpMoney,
bo.billingTypeKey AS invoiceTypeKey,
bo.billingType AS invoiceType,
bv.borrowerSid
FROM
anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo
ON bv.`salesOrderSid` = bo.`sid`
anrui_buscenter.bus_sales_order_vehicle bv
JOIN anrui_buscenter.bus_sales_order bo
ON bv.salesOrderSid = bo.sid
JOIN anrui_base.base_vehicle_state bs
ON bv.`sid` = bs.`busSid`
JOIN anrui_base.`base_vehicle_certificate` bc
ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid`
ON bv.sid = bs.busSid
JOIN anrui_base.base_vehicle_certificate bc
ON bv.linkSid = bc.vehicleSid
JOIN anrui_buscenter.bus_sales_order_model bm
ON bv.salesOrderSid = bm.salesOrderSid
<where>
${ew.sqlSegment}
</where>
@ -153,45 +153,45 @@
<select id="selectByContractNos" resultType="com.yxt.anrui.fin.api.finbillapplication.BillApplicationIInfoVoss">
SELECT DISTINCT
bo.`sid` AS busSalesOrderSid,
bo.`payTypeKey` AS saleTypeKey,
bo.`payType` AS saleType,
bo.`contractNo` AS contractId,
bo.`staffSid`,
bo.`staffName` AS sellerName,
bo.`orgSid` AS staffDeptSid,
bo.`orgName` AS sellerDept,
bo.`customerSid`,
bo.`customerName` AS NAME,
bo.`purchaseSystemSid`,
bm.`modelName`,
bm.`modelSid`,
if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney
FROM anrui_buscenter.`bus_sales_order` bo
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bo.`sid` = bm.`salesOrderSid`
bo.sid AS busSalesOrderSid,
bo.payTypeKey AS saleTypeKey,
bo.payType AS saleType,
bo.contractNo AS contractId,
bo.staffSid,
bo.staffName AS sellerName,
bo.orgSid AS staffDeptSid,
bo.orgName AS sellerDept,
bo.customerSid,
bo.customerName AS NAME,
bo.purchaseSystemSid,
bm.modelName,
bm.modelSid,
if(bo.payTypeKey =1,bo.oneBillMoney,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney
FROM anrui_buscenter.bus_sales_order bo
JOIN anrui_buscenter.bus_sales_order_model bm
ON bo.sid = bm.salesOrderSid
where bo.contractNo = #{contractId}
</select>
<select id="selectByBus" resultType="com.yxt.anrui.fin.api.finbillapplication.VinListVos">
SELECT DISTINCT
RIGHT(bv.`linkNo`, 8) AS vin,
bv.`linkSid` AS vinSid,
bc.`certificateState` AS certificateStateKey,
bc.`certificateStateValue` AS certificateState,
lr.`capCarefulResult` AS xSState
RIGHT(bv.linkNo, 8) AS vin,
bv.linkSid AS vinSid,
bc.certificateState AS certificateStateKey,
bc.certificateStateValue AS certificateState,
lr.capCarefulResult AS xSState
FROM
anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo
ON bv.`salesOrderSid` = bo.`sid`
anrui_buscenter.bus_sales_order_vehicle bv
JOIN anrui_buscenter.bus_sales_order bo
ON bv.salesOrderSid = bo.sid
JOIN anrui_base.base_vehicle_state bs
ON bv.`sid` = bs.`busSid`
JOIN anrui_base.`base_vehicle_certificate` bc
ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid`
LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
ON bv.`loanContractSid` = lr.`loanContractSid`
ON bv.sid = bs.busSid
JOIN anrui_base.base_vehicle_certificate bc
ON bv.linkSid = bc.vehicleSid
JOIN anrui_buscenter.bus_sales_order_model bm
ON bv.salesOrderSid = bm.salesOrderSid
LEFT JOIN anrui_riskcenter.loan_capital_credit_result lr
ON bv.loanContractSid = lr.loanContractSid
where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
</select>

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@ -129,6 +129,7 @@
select DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
fp.createBySid,
fp.name,
fp.costTypeKey,
fp.costTypeValue,
fp.payCompany,
fp.remarks,

37
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -507,6 +507,12 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
}
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
if ("004".equals(finPaymentapply.getCostTypeKey())) {
List<FinPaymentapplyEveDto> eveList = dto.getEveList();
for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) {
finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDto.getEveSid(), 2);
}
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -699,9 +705,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//备注
finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
//本次付款说明
if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getRemarks())){
if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getRemarks())) {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailVo.getActualPay() + "/" + finPaymentapplyDetailVo.getRemarks());
}else {
} else {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailVo.getActualPay());
}
finPaymentrecordService.saveDto(finPaymentrecordDto);
@ -733,9 +739,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//备注
finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
//本次付款说明
if (StringUtils.isNotBlank(finPaymentapplyDetailsBelowDetailsVo.getRemarks())){
if (StringUtils.isNotBlank(finPaymentapplyDetailsBelowDetailsVo.getRemarks())) {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowDetailsVo.getRemarks());
}else {
} else {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany());
}
finPaymentrecordService.saveDto(finPaymentrecordDto);
@ -772,12 +778,13 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//备注
finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
//本次付款说明
if (StringUtils.isNotBlank(finPaymentapplyEveDetailsVo.getRemarks())){
if (StringUtils.isNotBlank(finPaymentapplyEveDetailsVo.getRemarks())) {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyEveDetailsVo.getRemarks());
}else {
} else {
finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany());
}
finPaymentrecordService.saveDto(finPaymentrecordDto);
finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDetailsVo.getEveSid(), 3);
}
}
List<FinPaymentapplyVehicleVo> vehicleList = vo.getVehicleList();
@ -1060,6 +1067,12 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
if ("004".equals(finPaymentapply.getCostTypeKey())){
List<FinPaymentapplyEveDetailsVo> finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(query.getBusinessSid());
for (FinPaymentapplyEveDetailsVo finPaymentapplyEveDetailsVo : finPaymentapplyEveDetailsVos) {
finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDetailsVo.getEveSid(),1);
}
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
@ -1071,6 +1084,12 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
if ("004".equals(finPaymentapply.getCostTypeKey())){
List<FinPaymentapplyEveDetailsVo> finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(query.getBusinessSid());
for (FinPaymentapplyEveDetailsVo finPaymentapplyEveDetailsVo : finPaymentapplyEveDetailsVos) {
finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDetailsVo.getEveSid(),1);
}
}
return rb.success().setData(resultBean.getData());
}
}
@ -1119,6 +1138,12 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
List<AppFinPaymentapplyVehicleVo> carList = finPaymentapplyVehicleService.getCarList(sid);
vo.setCarList(carList);
}
List<FinPaymentapplyEveDetailsVo> finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(sid);
List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
vo.setEveList(finPaymentapplyEveDetailsVos);
vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
vo.setTopList(finPaymentapplyTopDetailsVos);
return rb.success().setData(vo);
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java

@ -47,6 +47,4 @@ public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPayment
@Update("update fin_paymentapply_details_below set openDate = #{openDate} where sid = #{sid}")
void updateOpenDate(@Param("sid") String sid, @Param("openDate") String openDate);
BigDecimal fetchBzj(String applySid);
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml

@ -15,7 +15,7 @@
db.bank,
db.receivingAccount
FROM
fin_paymentapply_details_below db
fin_paymentapply_details_below db
LEFT JOIN fin_paymentapply_details d
ON db.detailSid = d.sid
LEFT JOIN fin_paymentapply a
@ -23,15 +23,4 @@
WHERE db.costTitleKey = '015'
AND a.useOrgSid = #{useOrgSid}
</select>
<select id="fetchBzj" resultType="java.math.BigDecimal">
SELECT
fb.payAccount
FROM
fin_paymentapply_details_below fb
LEFT JOIN fin_paymentapply_details fd
ON fb.detailSid = fb.sid
WHERE fd.applySid = #{applySid}
AND fb.costTitleKey = '015'
</select>
</mapper>

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java

@ -57,8 +57,4 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPa
public void updateOpenDate(String sid, String openDate) {
baseMapper.updateOpenDate(sid, openDate);
}
public BigDecimal fetchBzj(String applySid) {
return baseMapper.fetchBzj(applySid);
}
}

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
import org.apache.ibatis.annotations.Update;
import java.math.BigDecimal;
import java.util.List;
@ -49,4 +50,13 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaym
@Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_details_below_eve WHERE detailSid = #{detailSid}")
BigDecimal selExePayByMainSid(String detailSid);
@Update("update fin_paymentapply_details_below_eve set state = #{state} where sid = #{eveSid}")
void updateState(@Param("eveSid") String eveSid,@Param("state") int state);
String fetchDetailsSid(String eveSid);
BigDecimal fetchExePriceTotal(String bzjSid);
List<String> fetchEveSidList(String bzjSid);
}

22
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@ -15,4 +15,26 @@
ON fe.useOrgSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
<select id="fetchDetailsSid" resultType="java.lang.String">
SELECT
fe.detailSid
FROM
fin_paymentapply_details_below_eve fe
LEFT JOIN fin_paymentapply_eve pe
ON pe.eveSid = fe.sid
WHERE pe.eveSid = #{eveSid}
</select>
<select id="fetchExePriceTotal" resultType="java.math.BigDecimal">
SELECT
SUM(exePayPrice)
FROM
fin_paymentapply_details_below_eve
WHERE detailSid = #{bzjSid}
</select>
<select id="fetchEveSidList" resultType="java.lang.String">
SELECT sid FROM fin_paymentapply_details_below_eve WHERE detailSid = #{bzjSid}
</select>
</mapper>

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@ -131,9 +131,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
FinPaymentapplyDetailsBelowEveListQuery query = pq.getParams();
QueryWrapper<FinPaymentapplyDetailsBelowEve> qw = new QueryWrapper<>();
qw.eq("fe.useOrgSid", query.getUseOrgSid());
/*if (StringUtils.isNotBlank(query.getPayCompany())) {
qw.like("fe.payCompany", query.getPayCompany());
}*/
qw.eq("fe.payCompanySid", query.getPayCompanySid());
qw.eq("fe.state", 1);
qw.orderByDesc("fe.createTime");
IPage<FinPaymentapplyDetailsBelowEve> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentapplyDetailsBelowEveVo> pagging = baseMapper.selectPageVo(page, qw);
@ -180,4 +179,20 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
public BigDecimal selExePayByMainSid(String detailSid) {
return baseMapper.selExePayByMainSid(detailSid);
}
public void updateState(String eveSid, int state) {
baseMapper.updateState(eveSid,state);
}
public String fetchDetailsSid(String eveSid) {
return baseMapper.fetchDetailsSid(eveSid);
}
public BigDecimal fetchExePriceTotal(String bzjSid) {
return baseMapper.fetchExePriceTotal(bzjSid);
}
public List<String> fetchEveSidList(String bzjSid) {
return baseMapper.fetchEveSidList(bzjSid);
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java

@ -30,6 +30,7 @@ import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal;
@ -46,4 +47,6 @@ public interface FinPaymentapplyEveMapper extends BaseMapper<FinPaymentapplyEve>
@Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_eve WHERE applySid = #{applySid}")
BigDecimal fetchExePriceByMainSid(String applySid);
List<String> selPayEveSidList(@Param("eveSidList") List<String> eveSidList);
}

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml

@ -1,5 +1,10 @@
<?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.fin.biz.finpaymentapplyeve.FinPaymentapplyEveMapper">
<select id="selPayEveSidList" resultType="java.lang.String">
SELECT sid FROM fin_paymentapply_eve WHERE eveSid IN
<foreach collection="eveSidList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper>

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java

@ -56,4 +56,8 @@ public class FinPaymentapplyEveService extends MybatisBaseService<FinPaymentappl
public BigDecimal fetchExePriceByMainSid(String applySid) {
return baseMapper.fetchExePriceByMainSid(applySid);
}
public List<String> selPayEveSidList(List<String> eveSidList) {
return baseMapper.selPayEveSidList(eveSidList);
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java

@ -34,7 +34,6 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal;
import java.util.List;
@ -56,5 +55,5 @@ public interface FinPaymentrecordMapper extends BaseMapper<FinPaymentrecord> {
String selectBatchNum(@Param("s") String s);
BigDecimal selPayPrice(String applySid);
BigDecimal selPayPriceTotal(@Param("payEveSidList") List<String> payEveSidList);
}

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@ -67,6 +67,7 @@
#{item}
</foreach>
</select>
<select id="selectBatchNum" resultType="java.lang.String">
select RIGHT (batchNumber, 4)
from fin_paymentrecord
@ -75,11 +76,13 @@
limit 1
</select>
<select id="selPayPrice" resultType="java.math.BigDecimal">
<select id="selPayPriceTotal" resultType="java.math.BigDecimal">
SELECT SUM(cost)
FROM fin_paymentrecord
WHERE applySid = #{applySid}
AND state = 2
AND (costTitleKey = '' OR costTitleKey IS NULL)
WHERE state = 2
AND busSid IN
<foreach collection="payEveSidList" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -1695,14 +1695,27 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
} else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款
//查询平仓总付款金额
FinPaymentapplyEve finPaymentapplyEve = finPaymentapplyEveService.fetchBySid(finPaymentrecord.getBusSid());
BigDecimal exePayPriceTotal = finPaymentapplyEveService.fetchExePriceByMainSid(finPaymentapplyEve.getApplySid());
//查询银行保证金sid
String bzjSid = finPaymentapplyDetailsBelowEveService.fetchDetailsSid(finPaymentapplyEve.getEveSid());
//通过银行保证金查询关联平仓款总额
BigDecimal exePayPriceTotal = finPaymentapplyDetailsBelowEveService.fetchExePriceTotal(bzjSid);
if (exePayPriceTotal == null){
exePayPriceTotal = BigDecimal.ZERO;
}
//查询保证金
BigDecimal bzj = finPaymentapplyDetailsBelowService.fetchBzj(finPaymentapplyEve.getApplySid());
BigDecimal bzj = finPaymentapplyDetailsBelowService.fetchBySid(bzjSid).getPayAccount();
if (bzj == null){
bzj = BigDecimal.ZERO;
}
//查询银行保证金下的平仓sid
List<String> eveSidList = finPaymentapplyDetailsBelowEveService.fetchEveSidList(bzjSid);
//查询融资付款平仓sid
List<String> payEveSidList = finPaymentapplyEveService.selPayEveSidList(eveSidList);
//查询已付款平仓款金额
BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
BigDecimal payPriceTotal = baseMapper.selPayPriceTotal(payEveSidList);
if (payPriceTotal == null){
payPriceTotal = BigDecimal.ZERO;
}
if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
//借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
@ -1733,7 +1746,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoDf.setSubjectNo("1009.03");
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoDf.setBank(key);
voucherResultDetailDtoDf.setCredit(payPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//贷方2
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sms/SmsFeign.java

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
path = "v1/sms",
fallback = SmsFeignFallback.class)
public interface SmsFeign {
static String msgSign="【安瑞集团】";
static String msgSign="【河北安瑞集团】";
// private static String msgtitle="河北省计量业务应用平台提醒:";
static String MSG_NEWPWD="用户,您好!您的新密码为:";
static String MSG_VERIFY = "用户,您好!您注册的单位已审核通过,管理员的密码为:";

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java

@ -38,6 +38,8 @@ public class PaymentApplyVo implements Vo {
@ApiModelProperty("款项范围")
private String costRangeValue;
//款项类别
@JsonProperty("paymentTypeKey")
private String costTypeKey;
@JsonProperty("paymentType")
private String costTypeValue;
//付款单位名称
@ -65,4 +67,8 @@ public class PaymentApplyVo implements Vo {
private List<PaymentApplyDetailsVo> paymentList = new ArrayList<>();
//车辆列表
private List<PaymentApplyVehicleVo> carList = new ArrayList<>();
private List<PaymentapplyEveDetailsVo> eveList = new ArrayList<>();
private List<PaymentapplyTrailerDetailsVo> trailerList = new ArrayList<>();
private List<PaymentapplyTopDetailsVo> topList = new ArrayList<>();
}

64
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyEveDetailsVo.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.paymentapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "付款申请-平仓 视图数据详情", description = "付款申请-平仓 视图数据详情")
public class PaymentapplyEveDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("平仓款名称")
private String costTitleValue; // 平仓款名称
@ApiModelProperty("融资付款开通日期")
private String openDate; // 融资付款开通日期
@ApiModelProperty("期数")
private String period; // 期数
@ApiModelProperty("付款方式Key")
private String payWayKey; // 付款方式Key
@ApiModelProperty("付款方式Value")
private String payWayValue; // 付款方式Value
@ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
@ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
@ApiModelProperty("开户行")
private String bank; // 开户行
@ApiModelProperty("平仓付款金额")
private BigDecimal exePayPrice; // 平仓付款金额
}

68
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTopDetailsVo.java

@ -0,0 +1,68 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.paymentapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情")
public class PaymentapplyTopDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("上装名称")
private String installNameValue; // 上装名称
@ApiModelProperty("货箱内部尺寸")
private String size; // 货箱内部尺寸
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("上装sid")
private String topSid; // 上装sid
@ApiModelProperty("箱体颜色")
private String color; // 箱体颜色
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("车型别名")
private String vehModel; // 车型别名
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("销售订单号")
private String saleOrderNo; // 销售订单号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("销售类型")
private String payType; // 销售类型
}

70
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentapplyTrailerDetailsVo.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.paymentapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情")
public class PaymentapplyTrailerDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("付款申请sid")
private String applySid; // 付款申请sid
@ApiModelProperty("挂车名称")
private String trailerTypeValue; // 挂车名称
@ApiModelProperty("外观尺寸")
private String size; // 外观尺寸
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("挂车sid")
private String trailerSid; // 挂车sid
@ApiModelProperty("箱体颜色")
private String color; // 箱体颜色
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("车型别名")
private String vehModel; // 车型别名
@ApiModelProperty("主车车架号")
private String zcVinNo; // 主车车架号
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("销售订单号")
private String saleOrderNo; // 销售订单号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("销售类型")
private String payType; // 销售类型
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml

@ -225,9 +225,9 @@
FROM
wms_inventory_record wir
LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库'
@ -278,9 +278,9 @@
FROM
wms_inventory_record wir
LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库'

Loading…
Cancel
Save