Browse Source

欠款开票

master
God 2 years ago
parent
commit
589853104c
  1. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java
  2. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  3. 133
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
  4. 137
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  5. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
  6. 27
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java
  7. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java
  8. 38
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  9. 88
      工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.fin.api.finbillapplication;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -41,6 +42,9 @@ public class AppBillApplicationIInfoVo implements Vo {
@ApiModelProperty("车辆集合")
private List<AppVinListVo> vinList;
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
@ApiModelProperty("开票状态")
private String billState;

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -225,6 +225,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
FinBillTrailer finBillTrailer = new FinBillTrailer();
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(finBillApplication.getSid());
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
}
}
finBillTrailerService.save(finBillTrailer);
}
//附件信息
@ -373,7 +380,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
vo.setFinBillVehicles(finBillVehicleVos);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
if (finBillTrailerVos != null) {
if (finBillTrailerVos != null && finBillTrailerVos.size() > 0) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();

133
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java

@ -11,115 +11,64 @@ import java.util.List;
public class BillApplicationIInfoDto implements Dto {
private static final long serialVersionUID = -3912119646277339550L;
@ApiModelProperty("业务sid")
private String sid;
@ApiModelProperty("用户sid")
@JsonProperty("userSid")
private String userSid;
@ApiModelProperty("合同编号")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("开票总价")
@JsonProperty("invoiceTotal")
private String totalBillMoney;
@ApiModelProperty("单台开票价")
@JsonProperty("invoiceMoney")
private String oneBillMoney;
@ApiModelProperty("客户名称")
@JsonProperty("customer")
private String customerName;
@ApiModelProperty(value = "销售类型value")
private String saleType;
@ApiModelProperty("部门-人员名")
private String publishInfo;
@ApiModelProperty(value = "销售部门名称")
private String sellerDept;
@ApiModelProperty(value = "销售专员名称")
private String sellerName;
@ApiModelProperty("申请日期")
@JsonProperty("date")
private String applyDate;
@ApiModelProperty("备注")
private String remarks;
private String date;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty(value = "开票单位名称")
private String invoicingUnit;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty("单台开票价")
private String invoiceMoney;
@ApiModelProperty("车辆集合")
private List<VinListDto> vinList;
@ApiModelProperty("开票总价")
private String invoiceTotal;
@ApiModelProperty("开票状态")
@JsonProperty("invoiceState")
private String billState; // 开票状态
private String invoiceState;
@ApiModelProperty("开票状态")
@JsonProperty("invoiceStateKey")
private String billStateKey;// 开票状态key
private String invoiceStateKey;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
@ApiModelProperty("证件")
private List<String> idCardImages;
@ApiModelProperty("客户开票申请书")
private List<String> customerInvoiceApplyImages;
@ApiModelProperty("车辆登记合同")
private List<String> registerContractImages;
@ApiModelProperty("开票信息确认书")
@ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("流程实列id")
@JsonProperty("procInsId")
private String procInstSid;
private String procInsId;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String contractSid;
@ApiModelProperty("发起人姓名")
private String createByName;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
@ApiModelProperty("是否可以编辑开票价")
private Boolean isCanEdit; // 是否可以编辑开票价
}

137
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -13,117 +13,62 @@ public class BillApplicationIInfoVo implements Vo {
@ApiModelProperty("业务sid")
private String sid;
@ApiModelProperty("用户sid")
@JsonProperty("userSid")
private String createBySid;
@ApiModelProperty("合同编号")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("开票总价")
@JsonProperty("invoiceTotal")
private String totalBillMoney;
@ApiModelProperty("单台开票价")
@JsonProperty("invoiceMoney")
private String oneBillMoney;
@ApiModelProperty("客户名称")
@JsonProperty("customer")
private String customerName;
@ApiModelProperty(value = "销售类型value")
private String saleType;
@ApiModelProperty("部门-人员名")
private String publishInfo;
@ApiModelProperty(value = "销售部门名称")
private String sellerDept;
@ApiModelProperty(value = "销售专员名称")
private String sellerName;
@ApiModelProperty("申请日期")
@JsonProperty("date")
private String applyDate;
@ApiModelProperty("备注")
private String remarks;
private String date;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty(value = "开票单位名称")
private String invoicingUnit;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty("单台开票价")
private String invoiceMoney;
@ApiModelProperty("车辆集合")
private List<VinListVo> vinList;
@ApiModelProperty("开票总价")
private String invoiceTotal;
@ApiModelProperty("开票状态")
@JsonProperty("invoiceState")
private String billState;
private String invoiceState;
@ApiModelProperty("开票状态")
@JsonProperty("invoiceStateKey")
private String billStateKey;
private String invoiceStateKey;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
@ApiModelProperty("证件")
private List<String> idCardImages;
@ApiModelProperty("客户开票申请书")
private List<String> customerInvoiceApplyImages;
@ApiModelProperty("车辆登记合同")
private List<String> registerContractImages;
@ApiModelProperty("开票信息确认书")
@ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages;
@ApiModelProperty("任务id")
@JsonProperty("")
private String taskId;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("流程实列id")
@JsonProperty("procInsId")
private String procInstId;
private String procInsId;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String contractSid;
@ApiModelProperty("是否能填写开票价")
private Boolean canEdit;
@ApiModelProperty("发起人姓名")
private String createByName;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
@ApiModelProperty("是否可以编辑开票价")
private Boolean isCanEdit; // 是否可以编辑开票价
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java

@ -48,10 +48,6 @@ import lombok.Data;
@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象")
public class FinBillTrailerVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("主车车架号")
private String vinNo; // 主车车架号
@ApiModelProperty("挂车车架号")
@ -60,8 +56,6 @@ public class FinBillTrailerVo implements Vo {
private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billTypeValue; // 开票类型value
@ApiModelProperty("开票名称sid")
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")

27
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java

@ -10,28 +10,17 @@ public class VinListDto implements Dto {
private static final long serialVersionUID = 1941205415631089700L;
@ApiModelProperty("车架号")
@JsonProperty("vin")
private String VIN;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票名称")
private String invoiceNameKey;
private String vin;
@ApiModelProperty("开票类型")
@JsonProperty("invoiceType")
private String billTypeValue;
private String invoiceTypeKey;
@ApiModelProperty("开票类型")
@JsonProperty("invoiceTypeKey")
private String billTypeKey;
private String invoiceType;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票信息")
private String invoiceInfo; // 开票信息
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
private String certificateState; // 合格证状态value
}

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@ -11,27 +11,17 @@ public class VinListVo implements Vo {
private static final long serialVersionUID = -8613016702728614645L;
@ApiModelProperty("车架号")
@JsonProperty("vin")
private String VIN;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票名称")
private String invoiceNameKey;
private String vin;
@ApiModelProperty("开票类型")
@JsonProperty("invoiceType")
private String billTypeValue;
private String invoiceTypeKey;
@ApiModelProperty("开票类型")
@JsonProperty("invoiceTypeKey")
private String billTypeKey;
private String invoiceType;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票信息")
private String invoiceInfo; // 开票信息
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
private String certificateState; // 合格证状态value
}

38
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
import com.yxt.anrui.fin.api.finbillapplication.*;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@ -58,6 +60,8 @@ public class InvoicedService {
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
@ -80,19 +84,20 @@ public class InvoicedService {
}
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
vo.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
//车辆信息
List<VinListVo> vinListVos = new ArrayList<>();
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
VinListVo vinListVo = new VinListVo();
vinListVo.setVIN(finBillVehicle.getVinNo());
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateStateValue(finBillVehicle.getCertificateStateValue());
vinListVo.setBillTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setBillTypeValue(finBillVehicle.getBillTypeValue());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setOpenTickRemarks(finBillVehicle.getOpenTickRemarks());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
}
vo.setVinList(vinListVos);
@ -129,6 +134,14 @@ public class InvoicedService {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}
}
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
vo.setIsCanEdit(false);
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}else {
vo.setIsCanEdit(true);
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo);
}
@ -136,18 +149,21 @@ public class InvoicedService {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
String publishInfo = dto.getPublishInfo();
finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-")));
finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-")));
//开票车辆信息
List<VinListDto> vinList = dto.getVinList();
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
for (VinListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVIN());
finBillVehicleDto.setVinNo(vinListDto.getVin());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateStateValue());
finBillVehicleDto.setBillTypeKey(vinListDto.getBillTypeKey());
finBillVehicleDto.setBillTypeValue(vinListDto.getBillTypeValue());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getOpenTickRemarks());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
finBillVehicleDtos.add(finBillVehicleDto);
}
finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);

88
工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl

@ -2506,50 +2506,6 @@
</#if>
</#list>
</w:tbl>
<#list photoPath64 as photo>
<w:p wsp:rsidR="00B25CE6" wsp:rsidRDefault="00195CBF">
<w:r wsp:rsidRPr="00956103">
<w:rPr>
<w:noProof/>
</w:rPr>
<w:pict>
<v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t"
path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
<v:stroke joinstyle="miter"/>
<v:formulas>
<v:f eqn="if lineDrawn pixelLineWidth 0"/>
<v:f eqn="sum @0 1 0"/>
<v:f eqn="sum 0 0 @1"/>
<v:f eqn="prod @2 1 2"/>
<v:f eqn="prod @3 21600 pixelWidth"/>
<v:f eqn="prod @3 21600 pixelHeight"/>
<v:f eqn="sum @0 0 1"/>
<v:f eqn="prod @6 1 2"/>
<v:f eqn="prod @7 21600 pixelWidth"/>
<v:f eqn="sum @8 21600 0"/>
<v:f eqn="prod @7 21600 pixelHeight"/>
<v:f eqn="sum @10 21600 0"/>
</v:formulas>
<v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
<o:lock v:ext="edit" aspectratio="t"/>
</v:shapetype>
<w:binData w:name="wordml://${photo_index}.png" xml:space="preserve">${photo}</w:binData>
<v:shape id="${photo_index}" o:spid="_x0000_i1025" type="#_x0000_t75" alt="1"
style="width:450pt;height:750pt;visibility:visible;mso-wrap-style:square">
<v:imagedata src="wordml://${photo_index}.png" o:title="1"/>
</v:shape>
</w:pict>
</w:r>
</w:p>
</#list>
<w:p wsp:rsidR="000E03BD" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="000E03BD" wsp:rsidP="000E03BD">
<w:pPr>
<w:rPr>
<w:vanish/>
</w:rPr>
</w:pPr>
</w:p>
<w:tbl>
<w:tblPr>
<w:tblW w:w="0" w:type="auto"/>
@ -2697,6 +2653,50 @@
</w:tc>
</w:tr>
</w:tbl>
<#list photoPath64 as photo>
<w:p wsp:rsidR="00B25CE6" wsp:rsidRDefault="00195CBF">
<w:r wsp:rsidRPr="00956103">
<w:rPr>
<w:noProof/>
</w:rPr>
<w:pict>
<v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t"
path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
<v:stroke joinstyle="miter"/>
<v:formulas>
<v:f eqn="if lineDrawn pixelLineWidth 0"/>
<v:f eqn="sum @0 1 0"/>
<v:f eqn="sum 0 0 @1"/>
<v:f eqn="prod @2 1 2"/>
<v:f eqn="prod @3 21600 pixelWidth"/>
<v:f eqn="prod @3 21600 pixelHeight"/>
<v:f eqn="sum @0 0 1"/>
<v:f eqn="prod @6 1 2"/>
<v:f eqn="prod @7 21600 pixelWidth"/>
<v:f eqn="sum @8 21600 0"/>
<v:f eqn="prod @7 21600 pixelHeight"/>
<v:f eqn="sum @10 21600 0"/>
</v:formulas>
<v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
<o:lock v:ext="edit" aspectratio="t"/>
</v:shapetype>
<w:binData w:name="wordml://${photo_index}.png" xml:space="preserve">${photo}</w:binData>
<v:shape id="${photo_index}" o:spid="_x0000_i1025" type="#_x0000_t75" alt="1"
style="width:400pt;height:650pt;visibility:visible;mso-wrap-style:square">
<v:imagedata src="wordml://${photo_index}.png" o:title="1"/>
</v:shape>
</w:pict>
</w:r>
</w:p>
</#list>
<w:p wsp:rsidR="000E03BD" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="000E03BD" wsp:rsidP="000E03BD">
<w:pPr>
<w:rPr>
<w:vanish/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRDefault="00F15DA9"/>
<w:sectPr wsp:rsidR="00F15DA9">
<w:pgSz w:w="11906" w:h="16838"/>

Loading…
Cancel
Save