Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 months ago
parent
commit
ea28a1dcde
  1. 37
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApply.java
  2. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java
  3. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  4. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml
  5. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  6. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  7. 18
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  8. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java
  9. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java
  10. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml
  11. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java
  12. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java
  13. 70
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java
  14. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  15. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java
  16. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java
  17. 81
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java
  18. 62
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskGeneralVoucher.java
  19. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java
  20. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
  21. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java
  22. 65
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
  23. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  24. 31
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java
  25. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

37
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApply.java

@ -31,52 +31,39 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApply.java <br/>
* Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply <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
*/
@Data
@ApiModel(value = "调车开票申请表", description = "调车开票申请表")
@TableName("base_shunting_invoicing_apply")
public class BaseShuntingInvoicingApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("调车类型key")
private String shuntingTypeKey; // 调车类型key
@ApiModelProperty("调车类型value")
private String shuntingTypeValue; // 调车类型value
@ApiModelProperty("调出分公司sid")
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty("调出分公司名称")
@ApiModelProperty("调出分公司名称")
private String callOutOrgName; // 调出分公司名称
@ApiModelProperty("调入分公司sid")
@ApiModelProperty("调入分公司sid")
private String callInOrgSid; // 调入分公司sid
@ApiModelProperty("调入分公司名称")
@ApiModelProperty("调入分公司名称")
private String callInOrgName; // 调入分公司名称
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")

18
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@ -32,7 +32,6 @@ import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoic
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
@ -43,23 +42,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest <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
*/
@Api(tags = "调车开票申请表")
@RestController("com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyRest")
@RestController
@RequestMapping("v1/baseshuntinginvoicingapply")
public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingApplyFeign {

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

@ -3420,6 +3420,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
.or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())
.or().eq("bv.vehicleState", VehicleState.StockEnum.RETURN_STOCK.getCode())
);
qw.orderByDesc("bv.createTime");
}
return qw;
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml

@ -25,7 +25,7 @@
</select>
<select id="listPageForRepay"
resultType="com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForRepayVo">
SELECT
SELECT DISTINCT
bs.sid AS orderSid,
bs.orgName AS orgName,
bs.staffName AS staffName,
@ -47,6 +47,8 @@
FROM
bus_sales_order_loancontract AS co
LEFT JOIN bus_sales_order AS bs ON co.salesOrderSid = bs.sid
LEFT JOIN bus_sales_order_vehicle as v ON co.sid = v.loanContractSid
LEFT JOIN anrui_base.base_vehicle_state as bvs ON v.sid = bvs.busSid
<where>${ew.sqlSegment}</where>
</select>

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@ -36,11 +36,8 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.PushOtherDocument;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
@ -51,7 +48,6 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@ -62,29 +58,22 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@ -378,13 +367,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
qw.ne("co.state", 0);
qw.eq("co.isDelete", 0);
qw.eq("co.busNo", "305");
qw.ne("bvs.busState","602");
qw.orderByDesc("co.createTime");
IPage<BusLoancontractForRepayVo> pagging = baseMapper.listPageForRepay(page, qw);
List<BusLoancontractForRepayVo> records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (BusLoancontractForRepayVo record : records) {
// record.setHandleBtn(false);
if (StringUtils.isNotBlank(record.getSalesOrderSid())) {
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
busSalesOrderVehicles.removeAll(Collections.singleton(null));
@ -506,18 +495,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
record.setAmountAll(mainAmount.toString());
}
}
// record.setBuilded("是");
// List<LoanRepaymentHistory> histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData();
// if (histories.isEmpty() || histories == null) {
// record.setHandleBtn(true);
// }
}
// else {
// record.setBuilded("否");
// if (StringUtils.isNotBlank(record.getBankContractNo())) {
// record.setHandleBtn(true);
// }
// }
}
}
}

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

@ -171,7 +171,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
List<BusSalesOrderVehicle> selectListByOrderSidAndXdConSid(@Param("saleOrderSid") String saleOrderSid,@Param("loanContractSid") String loanContractSid);
@Select("select * from bus_sales_order_vehicle where loanContractSid = #{loanContractSid}")
List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid);
@Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}")

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

@ -377,11 +377,13 @@
</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 bv.*
FROM bus_sales_order_vehicle as bv
LEFT JOIN anrui_base.base_vehicle_state as bvs ON bv.sid = bvs.busSid
WHERE bv.salesOrderSid = #{saleOrderSid}
AND bv.borrowerSid = #{borrowerSid}
AND bv.loanContractSid = #{loanContractSid}
AND bvs.busState != '602'
</select>
<select id="selectVinNos" resultType="java.lang.String">
@ -434,4 +436,10 @@
ORDER BY o.createTime DESC
LIMIT 1
</select>
<select id="selByLoanContractSid"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.* from bus_sales_order_vehicle as bv
LEFT JOIN anrui_base.base_vehicle_state as bvs ON bv.sid = bvs.busSid
where bv.loanContractSid = #{loanContractSid} AND bvs.busState != '602'
</select>
</mapper>

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java

@ -4,8 +4,10 @@ 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.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@Api(tags = "金蝶数据推送-临时表")
@FeignClient(
@ -20,6 +22,11 @@ public interface FinTempTimePushFeign {
@ApiOperation("测试推送凭证")
@PostMapping("/test")
public void test();
public ResultBean test();
@ApiOperation("根据业务sid删除")
@DeleteMapping("/delByBusSid")
public ResultBean delByBusSid(@RequestParam("busSid") String busSid);
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java

@ -40,4 +40,6 @@ public interface FinTempTimePushMapper extends BaseMapper<FinTempTimePush> {
void delBySid(@Param("sid") String sid);
int delByBusSid(@Param("busSid") String busSid);
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml

@ -5,6 +5,10 @@
DELETE FROM fin_temp_time_push
WHERE sid =#{sid}
</delete>
<delete id="delByBusSid">
DELETE FROM fin_temp_time_push
WHERE busSid =#{busSid}
</delete>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java

@ -50,7 +50,12 @@ public class FinTempTimePushRest implements FinTempTimePushFeign {
}
@Override
public void test() {
timingPushService.monthlyAccrualVoucher();
public ResultBean test() {
return timingPushService.monthlyAccrualVoucher();
}
@Override
public ResultBean delByBusSid(String busSid) {
return finTempTimePushService.delByBusSid(busSid);
}
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java

@ -53,4 +53,10 @@ public class FinTempTimePushService extends MybatisBaseService<FinTempTimePushMa
public void delBySid(String sid) {
baseMapper.delBySid(sid);
}
public ResultBean delByBusSid(String busSid) {
ResultBean rb = ResultBean.fireFail();
int i = baseMapper.delByBusSid(busSid);
return rb.success();
}
}

70
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java

@ -1,11 +1,20 @@
package com.yxt.anrui.fin.biz.fintemptimepush;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeFeignRest;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign;
import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.core.result.ResultBean;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -15,26 +24,69 @@ import java.util.List;
* @date 2023/11/7 14:02
*/
@Component
@Slf4j
public class TimingPushService {
@Autowired
private LoanMonthlyAccrualApplyFeign loanMonthlyAccrualApplyFeign;
@Autowired
private FinTempTimePushService finTempTimePushService;
@Autowired
private FinKingDeeFeignRest finKingDeeFeignRest;
@Autowired
private VoucherService voucherService;
/**
* 定时推送月还计提凭证
*/
@Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ?") //每月2-10号 3点推送
// @Scheduled(cron = "0 0/3 * * * ?") //每3分钟推送
public void monthlyAccrualVoucher() {
// @Scheduled(cron = "0 0/10 * * * ?") //每3分钟推送
public ResultBean monthlyAccrualVoucher() {
ResultBean rb = ResultBean.fireFail();
List<FinTempTimePush> list = finTempTimePushService.selListByBusType("月还计提");
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (FinTempTimePush f : list) {
loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
finTempTimePushService.delBySid(f.getSid());
}
}
if (!list.isEmpty()) {
for (FinTempTimePush f : list) {
List<RskGeneralVoucher> vouchers = loanMonthlyAccrualApplyFeign.rePushVoucher2(f.getBusSid()).getData();
if (!vouchers.isEmpty()) {
for (RskGeneralVoucher voucher : vouchers) {
Voucher newVoucher = new Voucher();
List<Voucher.VoucherResultDetailDto> resultDetails = new ArrayList<>();
if (StringUtils.isNotBlank(voucher.getUseOrgCode())) {
newVoucher.setAccountBook(voucher.getUseOrgCode());
newVoucher.setVoucherNo(voucher.getUseOrgCode());
}
String formatDate = voucher.getBussDate();
String[] split = formatDate.split("-");
String month = split[1];
int m = Integer.parseInt(month);
List<RskGeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
if (!voucherDetails.isEmpty()) {
for (RskGeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto1.setSummary(m + "月计提月还");
dto2.setSummary(m + "月计提月还");
dto1.setSubjectNo("1201.02.01");
dto2.setSubjectNo("1201.01.00");
dto1.setDimensionDept(voucherDetail.getDeptCode());
dto1.setDimensionCustom(voucherDetail.getCustomerCode());
dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
resultDetails.add(dto1);
resultDetails.add(dto2);
}
newVoucher.setResultDetails(resultDetails);
}
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
voucherService.saveVoucher(newVoucher);
}
}
// loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
finTempTimePushService.delBySid(f.getSid());
}
}
return rb.success();
}
}

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

@ -2,7 +2,6 @@ package com.yxt.anrui.fin.biz.kingdee.voucher;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.base.utils.StringUtils;
@ -48,12 +47,6 @@ 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("凭证保存失败!");
@ -61,14 +54,6 @@ public class VoucherService extends FinKingDeeService {
}
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()) {
// log.info("凭证提交失败!");
// return rb.setMsg("凭证提交失败!");
// }
// log.info("凭证提交成功!");
} catch (Exception e) {
e.printStackTrace();
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java

@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -54,6 +55,11 @@ public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyF
return null;
}
@Override
public ResultBean<List<RskGeneralVoucher>> rePushVoucher2(String sid) {
return null;
}
@Override
public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
return null;

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -66,6 +67,11 @@ public interface LoanMonthlyAccrualApplyFeign {
@PostMapping("/rePushVoucher")
public ResultBean rePushVoucher(@RequestParam("sid") String sid);
@ApiOperation("重推凭证")
@PostMapping("/rePushVoucher2")
public ResultBean<List<RskGeneralVoucher>> rePushVoucher2(@RequestParam("sid") String sid);
//---------------------------流程---------------------------------------
@ApiOperation("提交")

81
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java

@ -33,94 +33,81 @@ import lombok.Data;
import java.util.Date;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApply.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApply <br/>
* Description: 车辆交回事前报备申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆交回事前报备申请", description = "车辆交回事前报备申请")
@TableName("loan_restore_report_apply")
public class LoanRestoreReportApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人")
@ApiModelProperty("创建人")
private String createByName; // 创建人
@ApiModelProperty("申请编号")
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("申请部门sid")
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid;
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum; // 车牌号
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String custName; // 客户名称
@ApiModelProperty("贷款人")
@ApiModelProperty("贷款人")
private String borrName; // 贷款人
@ApiModelProperty("贷款合同编号")
@ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方")
@ApiModelProperty("资方")
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
@ApiModelProperty("资方合同编号")
private String bankContractNo; // 资方合同编号
@ApiModelProperty("已还金额")
@ApiModelProperty("已还金额")
private String alRepaidMoney; // 已还金额
@ApiModelProperty("当前逾期金额")
@ApiModelProperty("当前逾期金额")
private String currentBeMoney; // 当前逾期金额
@ApiModelProperty("其中资金占用费")
@ApiModelProperty("其中资金占用费")
private String wheFundOccMoney; // 其中资金占用费
@ApiModelProperty("未到期金额")
@ApiModelProperty("未到期金额")
private String unexpiredMoney; // 未到期金额
@ApiModelProperty("总期数")
@ApiModelProperty("总期数")
private String nper; // 总期数
@ApiModelProperty("当前期数")
@ApiModelProperty("当前期数")
private String currentPeriod; // 当前期数
@ApiModelProperty("已还金额换算期数")
@ApiModelProperty("已还金额换算期数")
private String alRepaidMoneyConPeriod; // 已还金额换算期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("交回方式key")
@ApiModelProperty("交回方式key")
private String restoreTypeKey; // 交回方式key
@ApiModelProperty("交回方式value")
@ApiModelProperty("交回方式value")
private String restoreTypeValue; // 交回方式value
@ApiModelProperty("预交回日期")
@ApiModelProperty("预交回日期")
private String restoreDate; // 预交回日期
@ApiModelProperty("经办人sid")
@ApiModelProperty("经办人sid")
private String operatorSid; // 经办人sid
@ApiModelProperty("经办人姓名")
@ApiModelProperty("经办人姓名")
private String operatorName; // 经办人姓名
@ApiModelProperty("涉及相关费用")
@ApiModelProperty("涉及相关费用")
private String involveCorrMoney; // 涉及相关费用
@ApiModelProperty("费用说明")
@ApiModelProperty("费用说明")
private String costRemarks; // 费用说明
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径")
@ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
@ApiModelProperty("任务id")
private String taskId; // 任务id
}

62
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskGeneralVoucher.java

@ -0,0 +1,62 @@
package com.yxt.anrui.riskcenter.api.loanvoucher;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @author Fan
* @description
* @date 2023/12/19 11:16
*/
@Data
@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
public class RskGeneralVoucher {
@ApiModelProperty("分公司编码")
@NotBlank(message = "分公司编码不能为空")
public String useOrgCode;
@ApiModelProperty("业务日期")
public String bussDate;
@ApiModelProperty("凭证明细")
public List<RskGeneralVoucher.GeneralVoucherDetail> voucherDetails;
@Data
public static class GeneralVoucherDetail {
public String timeFlag; //应用于资金占用费计提凭证摘要标识 0代表上月 1代表本月
public String type;
@ApiModelProperty("场景编码")
public String sceneCode;
@ApiModelProperty("资方简称")
@NotBlank(message = "资方简称不能为空")
public String bankName;
@ApiModelProperty("数据日期")
public Date dataTime;
@ApiModelProperty("部门编码")
@NotBlank(message = "部门编码不能为空")
public String deptCode;
@ApiModelProperty("部门名称")
public String deptName;
@ApiModelProperty("客户编码")
@NotBlank(message = "客户编码不能为空")
public String customerCode;
@ApiModelProperty("客户名称")
public String customerName;
@ApiModelProperty("金额")
@NotBlank(message = "金额不能为空")
public BigDecimal amount;
@ApiModelProperty("核算维度厂商(供应商)")
public String manufacturer;
@ApiModelProperty("核算维度物料")
public String material;
@ApiModelProperty("备注")
public String remarks;
@ApiModelProperty("采购系统sid")
public String purchaseSystemSid;
}
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.java

@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyPlanRecord;
@ -29,4 +27,5 @@ public interface LoanMonthlyAccrualApplyMapper extends BaseMapper<LoanMonthlyAcc
int updateFlowFiled(Map<String, Object> map);
void delFinTempTimePushByBusSid(@Param("businessSid") String businessSid);
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml

@ -16,6 +16,9 @@
</if>
WHERE sid = #{sid}
</update>
<delete id="delFinTempTimePushByBusSid">
DELETE FROM anrui_fin.fin_temp_time_push WHERE busSid = #{businessSid}
</delete>
<select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyVo">
SELECT

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java

@ -5,6 +5,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -84,6 +85,13 @@ public class LoanMonthlyAccrualApplyRest implements LoanMonthlyAccrualApplyFeign
return rb.success();
}
@Override
public ResultBean<List<RskGeneralVoucher>> rePushVoucher2(String sid) {
ResultBean rb = ResultBean.fireFail();
List<RskGeneralVoucher> voucher = loanMonthlyAccrualApplyService.rePushVoucher2(sid);
return rb.success().setData(voucher);
}
@Override
public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
return loanMonthlyAccrualApplyService.submitRecordApplication(dto);

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

@ -45,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
import com.yxt.anrui.riskcenter.api.loanvoucher.RskGeneralVoucher;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecordService;
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
@ -86,6 +87,8 @@ import static java.util.Comparator.comparing;
**/
@Service
public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonthlyAccrualApplyMapper, LoanMonthlyAccrualApply> {
@Autowired
private DocPdfComponent docPdfComponent;
@Autowired
@ -731,9 +734,12 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
}
}
}
// finTempTimePushFeign.delByBusSid(businessSid);
baseMapper.delFinTempTimePushByBusSid(businessSid);
}
public ResultBean revokeProcess(AccrualTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
@ -1231,4 +1237,63 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
public void rePushVoucher(String sid) {
pushAccrualVoucher(sid);
}
public List<RskGeneralVoucher> rePushVoucher2(String sid) {
List<RskGeneralVoucher> list = new ArrayList<>();
LoanMonthlyAccrualApply apply = fetchBySid(sid);
List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(sid);
int index = 0;
int indexFinal = 0;
if (!records.isEmpty()) {
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey("月还计提", "WithholdMax").getData();
if (null != dictCommonVo) {
String dictValue = dictCommonVo.getDictValue();
int i = Integer.parseInt(dictValue);
index = i;
indexFinal = i;
}
for (int i = 0; i < records.size(); i += indexFinal) {
if (i + indexFinal > records.size()) {
index = records.size() - i;
}
List<LoanMonthlyAccrualRecord> newList = records.subList(i, i + index);
if (!newList.isEmpty()) {
RskGeneralVoucher generalVoucher = new RskGeneralVoucher();
generalVoucher.setBussDate(DateUtil.formatDate(apply.getClosingDate()));
List<RskGeneralVoucher.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());
}
RskGeneralVoucher.GeneralVoucherDetail voucherDetail = new RskGeneralVoucher.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();
}
voucherDetail.setCustomerCode(customerNumber);
}
voucherDetail.setAmount(planDetails.getDueMoney());
voucherDetails.add(voucherDetail);
}
}
generalVoucher.setVoucherDetails(voucherDetails);
list.add(generalVoucher);
}
}
}
return list;
}
}

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

@ -180,8 +180,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
vo.setLoanContractNo(loancontract.getLoanContractNo());
}
// 贷款人车辆台数
if (null != (loancontract.getVehCount())) {
vo.setVehCount(loancontract.getVehCount().toString());
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selbyContractSid(salesOrderSid).getData();
if (!vehicles.isEmpty()) {
vo.setVehCount(String.valueOf(vehicles.size()));
}
// 贷款人
if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {

31
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java

@ -25,43 +25,26 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
* File: ScmApplyInboundVehQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery <br/>
* Description: 车辆入库单车辆查询. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-28 15:55:31 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
public class ScmApplyInboundVehQueryMaterial {
@ApiModelProperty("序号")
private String id; // 序号
@ApiModelProperty("物料编号")
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组名称")
@ApiModelProperty("物料分组名称")
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型value")
@ApiModelProperty("车辆类型value")
private String vehicleType; // 车辆类型value
@ApiModelProperty("计量单位")
@ApiModelProperty("计量单位")
private String iunit; // 计量单位
@ApiModelProperty("数量")
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("结算金额")
@ApiModelProperty("结算金额")
private String settleMoney; // 结算金额
@ApiModelProperty("仓库名称")
@ApiModelProperty("仓库名称")
private String localName; // 仓库名称
}

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@ -206,8 +206,16 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
id = id + 1;
BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney());
tPrice = tPrice.add(settleMoney);
//主车物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 2).equals("SZ")) {
//上装物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 10));
} else if (scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 1).equals("G")) {
//挂车物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 9));
} else {
//主车物料编码
scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
}
scmApplyInboundVehQueryMaterial.setId(String.valueOf(id));
scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName());
scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
@ -246,12 +254,12 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
String downNum = scmApplyInboundQuery.getDownNum();
if (StringUtils.isBlank(downNum)){
if (StringUtils.isBlank(downNum)) {
downNum = "1";
}else {
} else {
downNum = String.valueOf((Integer.parseInt(downNum) + 1));
}
baseMapper.updateDown(cgrkdSid,downNum);
baseMapper.updateDown(cgrkdSid, downNum);
return rb.success().setData(pdfPath);
}

Loading…
Cancel
Save