diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java index b3b61ceb87..74d9042543 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java @@ -14,4 +14,5 @@ public class BusApplyVo implements Vo { private String name; private String num; private String code; + private String bankName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 7d514c452b..b6d53e1a01 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -64,7 +64,7 @@ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index df94dda8a3..050f3e66c1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2075,8 +2075,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bo.staffSid", sysUserVo.getStaffSid()); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getApprovalContractList(page, qw); + IPage iPage = baseMapper.getApprovalContractList(page, qw, params.getName()); for (AppRovalContractPageVo record : iPage.getRecords()) { String busSid = record.getBusSid(); CommonContractVo commonContract = commonContractFeign.getContractBySalesOrderSid(busSid).getData(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java new file mode 100644 index 0000000000..f1fd6c70f9 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AddInvoicedApplyDto implements Dto { + private static final long serialVersionUID = -2942692578331132685L; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("申请日期") + private String applyDate; + + @ApiModelProperty("开票类型key") + private String billTypeKey; + + @ApiModelProperty("开票类型value") + private String billTypeValue; + + @ApiModelProperty("分公司sid") + private String useOrgSid; + + @ApiModelProperty("创建人sid") + private String createBySid; + + @ApiModelProperty("车辆集合") + private List vinList; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 64b4863ab1..69478f319a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -54,6 +54,8 @@ public class FinBillApplication extends BaseEntity { @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("合同sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 9e38190af5..28bae3ab83 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -156,4 +156,9 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody AppBillApplicationIInfoDto dto); + @ApiOperation("提前开票推送接口") + @PostMapping("/addInvoicedApply") + @ResponseBody + public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index de84953e1f..ae64c0e854 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -125,4 +125,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) { return null; } + + @Override + public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index 1e5ca7b161..0f66f3efda 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -91,6 +91,8 @@ public class FinPaymentrecord extends BaseEntity { private String costTitleValue; @ApiModelProperty("收款银行账号") private String receiveBankAccount; + @ApiModelProperty("收款银行名称") + private String receiveBank; @ApiModelProperty("收款单位名称") private String receiveCompany; @ApiModelProperty(value = "金额") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 035845b935..96846a42b3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -70,6 +70,8 @@ public class FinPaymentrecordDto implements Dto { private String costTitleValue; @ApiModelProperty("收款银行账号") private String receiveBankAccount; + @ApiModelProperty("收款银行名称") + private String receiveBank; @ApiModelProperty("收款单位名称") private String receiveCompany; @ApiModelProperty(value = "金额") @@ -83,5 +85,6 @@ public class FinPaymentrecordDto implements Dto { private String payCode; @ApiModelProperty("创建人sid") private String createBySid; - + @ApiModelProperty("备注信息") + private String remarks; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java index 0605aa63c1..257577f210 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java @@ -70,6 +70,8 @@ public class FinPaymentrecordVo implements Vo { private String costTypeValue; @ApiModelProperty(value = "款项名称") private String costTitleValue; + @ApiModelProperty("收款银行名称") + private String receiveBank; @ApiModelProperty(value = "收款单位名称") private String receiveCompany; @ApiModelProperty(value = "收款账号") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 0d274848a8..5a2372bd2b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -155,4 +155,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) { return finBillApplicationService.saveInvoicedApplyInfo(dto); } + + @Override + public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) { + return finBillApplicationService.addInvoicedApply(dto); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 749a0babbd..7cd332b246 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -78,6 +78,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -968,8 +969,8 @@ public class FinBillApplicationService extends MybatisBaseService iPage = baseMapper.getInvoicedApplyList(page, qw); List records = iPage.getRecords(); for (AppBillApplicationPageVo record : records) { - String contractSid = record.getContractSid(); - SysUserVo data = sysUserFeign.fetchBySid(contractSid).getData(); + String createBySid = record.getCreateBySid(); + SysUserVo data = sysUserFeign.fetchBySid(createBySid).getData(); record.setApplyName(data.getName()); } return iPage; @@ -1118,6 +1119,22 @@ public class FinBillApplicationService extends MybatisBaseService vinList = dto.getVinList(); + for (AppVinListDto appVinListDto : vinList) { + FinBillVehicle finBillVehicle = new FinBillVehicle(); + BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid"); + finBillVehicle.setBillAppSid(finBillApplication.getSid()); + finBillVehicleService.save(finBillVehicle); + } + finBillApplication.setNum(vinList.size()); + save(finBillApplication); + return rb.success(); + } + /* public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index fac18a24e4..123870f420 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -20,6 +20,7 @@ fp.costTypeValue, fp.receiveCompany, fp.receiveBankAccount, + fp.receiveBank, fp.cost, fp.payFile FROM fin_paymentrecord fp diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index fd6f27f72d..d9d66e1e6a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.fin.biz.finpaymentrecord; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; @@ -59,9 +60,11 @@ import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.WordConvertUtils; +import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -72,6 +75,7 @@ import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; +import java.text.NumberFormat; import java.util.*; import java.util.stream.Collectors; @@ -90,6 +94,7 @@ import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader; * @version 1.0 * @since 1.0 */ +@Slf4j @Service public class FinPaymentrecordService extends MybatisBaseService { @@ -343,61 +348,78 @@ public class FinPaymentrecordService extends MybatisBaseService sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(sysUserVo.getStaffSid()).getData(); StringBuilder deptName = new StringBuilder(); for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { - String orgName = sysStaffOrgVo.getOrgName(); - deptName.append(orgName).append(" "); + //部门名称 + String deptOrgName = sysStaffOrgVo.getOrgName(); + String deptOrgSid = sysStaffOrgVo.getOrgSid(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(deptOrgSid).getData(); + String psid = sysOrganizationVo.getPsid(); + SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(psid).getData(); + String orgName = sysOrganizationVo1.getName(); + String psid1 = sysOrganizationVo1.getPsid(); + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(psid1).getData(); + String pname = sysOrganizationVo2.getName(); + deptName.append(pname).append("-").append(orgName).append("-").append(deptOrgName).append(" "); } - //获取分公司名称 - SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(finPaymentrecord.getCreateOrgSid()).getData(); - String createOrgName = sysOrganization.getName(); //获取审批编号 BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData(); BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData(); - if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) { - dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode()); - //获取审批记录 - FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData(); - List flowList = flowRecordVo.getFlowList(); - List finPaymentrecordSourceLCVos = new ArrayList<>(); - for (FlowTask flowTask : flowList) { - FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); - finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); - finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd")); - finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); - } - dataMap.put("lcList", finPaymentrecordSourceLCVos); - //获取附件名称（文档类型） - CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract(); - if (contract != null) { - dataMap.put("fileName", contract.getFileName()); + if (baseOutsourcingApplicationDetailsVo != null) { + if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) { + dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode()); + //获取审批记录 + FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData(); + List flowList = flowRecordVo.getFlowList(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (FlowTask flowTask : flowList) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); + finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + dataMap.put("lcList", finPaymentrecordSourceLCVos); + //获取附件名称（文档类型） + CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract(); + if (contract != null) { + dataMap.put("fileName", contract.getFileName()); + } } - } else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) { - dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode()); - //获取审批记录 - FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData(); - List flowList = flowRecordVo.getFlowList(); - List finPaymentrecordSourceLCVos = new ArrayList<>(); - for (FlowTask flowTask : flowList) { - FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); - finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); - finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd")); - finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + if (busVehicleApplyDetailsVo != null) { + if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) { + dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode()); + //获取审批记录 + FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData(); + List flowList = flowRecordVo.getFlowList(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (FlowTask flowTask : flowList) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName()); + finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + dataMap.put("lcList", finPaymentrecordSourceLCVos); } - dataMap.put("lcList", finPaymentrecordSourceLCVos); } - dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(),"yyyy-MM-dd")); + dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(), "yyyy-MM-dd")); dataMap.put("createByName", createByName); dataMap.put("createByDeptName", deptName); dataMap.put("createOrgName", createOrgName); dataMap.put("remarks", finPaymentrecord.getRemarks()); dataMap.put("receiveCompany", finPaymentrecord.getReceiveCompany()); + dataMap.put("receiveBank", finPaymentrecord.getReceiveBank()); dataMap.put("receiveBankAccount", finPaymentrecord.getReceiveBankAccount()); - dataMap.put("cost", finPaymentrecord.getCost()); + Double aDouble = Double.valueOf(finPaymentrecord.getCost()); + String s = upperCase2(aDouble); + dataMap.put("cost", finPaymentrecord.getCost() + " " + "(" + s + ")"); dataMap.put("payRemark", finPaymentrecord.getPayRemark()); //获取图片路径 // String photoPath = "file://D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg"; @@ -405,19 +427,27 @@ public class FinPaymentrecordService extends MybatisBaseService 1) { + point = split[1]; + if (point.length() == 1) { + point = point.concat("0"); + } + } else { + point = "0"; + } + //大于12位就直接返回。 + int moneyLen = strMoney.length(); + if (money == 0) { + return "零圆整"; + } + if (moneyLen > 12) { + return "金额：" + money + "元，超出大写转换范围。最大金额：999999999999.99元"; + } + //整数(integer)部分处理。 + if (!"0".equals(strMoney)) { + for (int i = 0; i < moneyLen; i++) { + String strNum = strMoney.charAt(i) + ""; + int singleNum = Integer.parseInt(strNum); + String upSingleNum = upNum[singleNum]; + //上一为不等于0的情况 + if (!"零".equals(lastUpNum)) { + if (!"零".equals(upSingleNum)) { + result = result.concat(upSingleNum).concat(danwei[moneyLen - i - 1]); + } else + //为零但是在万、亿位上要加单位 (moneyLen-i)==9 指的是单位：亿。 (moneyLen-i)==5指的是单位：万 + if ((moneyLen - i) == 5 || (moneyLen - i) == 9) { + lastUpNum = ""; + } else { + result = result.concat(upSingleNum); + } + } + //上一位为0的情况 + if ("零".equals(lastUpNum) && !"零".equals(upSingleNum)) { + result = result.concat(upSingleNum).concat(danwei[moneyLen - i - 1]); + } + //捕捉上一位数（lastUpNum）为零的情况做优化。 + if ((moneyLen - i) == 5 || (moneyLen - i) == 9) { + //排除加单位时前面为"零"的情况。如：两百零万 + if ("零".equals(lastUpNum) || "null".equals(lastUpNum)) { + result = result.substring(0, result.length() - 1); + } + if (!result.endsWith("亿")) { + result = result.concat(danwei[moneyLen - i - 1]); + } + lastUpNum = ""; + } else { + //把当前大写数字复制给 lastUpNum 用于下次判断 + lastUpNum = upSingleNum; + } + } + //对几万元整和几亿元整(result:五万零或者五亿零零)做优化。 + result = result.replaceAll("零零", "零"); + if (result.endsWith("零")) { + String substring = result.substring(0, result.length() - 1); + result = substring; + } + result = result.concat("圆"); + result = result.replaceAll("圆圆", "圆"); + result = result.replaceAll("万万", "万"); + + } + + //小数(point)部分处理 + if ("0".equals(point)) { + result = result + "整"; + } else { + //去 整 +// if(result.endsWith("整")){ +// result = result.substring(0,result.length()-1); +// } + if ((point.charAt(0) + "").equals("0")) { + result = result.concat(upNum[Integer.parseInt(point.charAt(1) + "")] + "分"); + } else if ((point.charAt(1) + "").equals("0")) { + result = result.concat(upNum[Integer.parseInt(point.charAt(0) + "")] + "角"); + } else { + result = result.concat(upNum[Integer.parseInt(point.charAt(0) + "")] + "角").concat(upNum[Integer.parseInt(point.charAt(1) + "")] + "分"); + } + } + return result; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index d69e07b19b..5fc2617bd8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -92,6 +92,7 @@ public class STKInStockService extends FinKingDeeService { log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); if(responseStatus!=null){//不存在该物料 //新增物料 + f.setFLot(""); bdMaterial(stkInStock, f); }else{ //存在该物料 //分配物料 diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl index 826894dca2..a3402e6f1a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl +++ b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl @@ -1,46 +1,59 @@ - + - + - + + pkg:contentType="application/vnd.openxmlformats-package.relationships+xml" pkg:padding="256"> - - - + + + + + - + xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"> - + - - - + + - - + + - + - + + 预付款申请 + + - + + + - - - + - + 河北安瑞汽车租赁集团有限公司 + + + + + + + + + + + + + - - - 河北安瑞汽车租赁集团有限公司 创建时间：${createTime!} + 创建时间： + + + ${createTime!} + + - - - + - - - - - - + + + + + + - - - - - + - - + + + - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 审批编号 @@ -163,68 +163,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${applyCode!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 创建人 @@ -232,137 +196,73 @@ - - + + + - - - - - - - - - - - - - - - + + ${createByName!} - - - - - - - - - - - - - - - + - + - - + + - - - + + - - - + - + 创建 + + - - - 创建人部门 + 人部门 + - - + + + - - - - - - - - - - - - - - - + + ${createByDeptName!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 费用所属公司 @@ -370,68 +270,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${createOrgName!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 付款用途 @@ -439,69 +303,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${remarks!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - - + - - 收款单位 @@ -509,69 +336,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${receiveCompany!} - - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 开户行 @@ -579,67 +369,32 @@ - - + + + - - - - - - - - - - - - - - - + + + ${receiveBank!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 收款账号 @@ -647,68 +402,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${receiveBankAccount!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 金额（元） @@ -716,68 +435,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${cost!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 备注 @@ -785,68 +468,32 @@ - - + + + - - - - - - - - - - - - - - - + + ${payRemark!} - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - + - - 附件 @@ -854,864 +501,248 @@ - - + + + - - - - - - - - - - - - - - - + + ${fileName!} - - - - - - - - - - - - - - - + - + - - + + + - + - - - - - - + - - 审批流程 - - - - - - - <#list lcList as lc> - - - - - - - - - - - - - - - -${lc.name!} ${lc.comment!}     ${lc.spsj!} - - - - + <#list lcList as lc> + <#if (lc_index==0)> + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + <#list lcList as lc> + <#if (lc_index>0)> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + - - - - - - - - - - + + - - + + - - - - - 1 - 73 - 108 - 0 - 0 - 4 - false - false - 122 - WPS Office_11.1.0.12598_F1E327BC-269C-435d-A152-05C5408002CA - 0 - - - - + - - 2014-10-29T12:08:00Z - God - 功夫熊猫 - 2022-11-02T08:31:00Z - + + + + + + + + + + + + + + + + - + - - - 2052-11.1.0.12598 - - - 046113D258F44AE9B09038F928168180 - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1991,7 +1022,1175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2052-11.1.0.12598 + + + 046113D258F44AE9B09038F928168180 + + + + + + + + God + Windows 用户 + 2 + 2022-11-13T02:11:00Z + 2022-11-13T02:11:00Z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 64 + 367 + Microsoft Office Word + 0 + 3 + 1 + false + Organization + false + 430 + false + false + 14.0000 + + + \ No newline at end of file