yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
God 2 years ago
parent
f2bcb6ff65
commit
21e118b036
8 changed files with 246 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
  2. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
  5. 102
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  6. 3
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  7. 7
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  8. 236
      工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
View File

@ -72,5 +72,4 @@ public class BusSalesOrderPrice extends BaseEntity {
@ApiModelProperty("计划提车地点") @ApiModelProperty("计划提车地点")
private String plannedPickUpLocationKey; private String plannedPickUpLocationKey;
} }

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -6079,7 +6079,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} }
} }
if (StringUtils.isNotBlank(vinNo)){ if (StringUtils.isNotBlank(vinNo)){
dataMap.put("vinNo",vinNo); //TODO dataMap.put("vinNo",vinNo.substring(0,vinNo.length() - 1));
dataMap.put("isxsVinNo","是");
}else {
dataMap.put("isxsVinNo","否");
} }
//销售指导价 //销售指导价
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid()); BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
@ -6092,9 +6095,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrder.getIsInsurance().equals("0")) { if (busSalesOrder.getIsInsurance().equals("0")) {
dataMap.put("isrb", "否，" + busSalesOrderInsuranceDetailsVo.getRemarks() + "。"); dataMap.put("isrb", "否，" + busSalesOrderInsuranceDetailsVo.getRemarks() + "。");
} else { } else {
dataMap.put("isrb", "是，" + busSalesOrderInsuranceDetailsVo.getInsuranceName() + "，" + "单台预估金额" + busSalesOrderInsuranceDetailsVo.getInsuranceCarMoney() + "元，" + "入保期数" + busSalesOrderInsuranceDetailsVo.getInsuranceNum() + "。"); dataMap.put("isrb", "是，" + busSalesOrderInsuranceDetailsVo.getInsuranceName() + "，" + "单台预估金额" + busSalesOrderInsuranceDetailsVo.getInsuranceCarMoney() + "元，" + "入保期数" + busSalesOrderInsuranceDetailsVo.getInsuranceNum() + "。");
} }
//订金结转
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(busSalesOrder.getSid());
String depositTypeKey = busSalesOrderDeposit.getDepositTypeKey();
if ("02".equals(depositTypeKey)){
String djjz = "由[" + "" + "]编号为" + "" + "简易订单订金转入" + "" + "元。";
dataMap.put("djjz", djjz);
dataMap.put("isxsDjjz", "是");
}else {
dataMap.put("isxsDjjz", "否");
}
//是否赠送客户物品 //是否赠送客户物品
List<AppOrderDiscountListVo> appOrderDiscountListVos = busSalesOrderDiscountService.selectDiscount(busSalesOrder.getSid()); List<AppOrderDiscountListVo> appOrderDiscountListVos = busSalesOrderDiscountService.selectDiscount(busSalesOrder.getSid());
if (appOrderDiscountListVos.size() == 0) { if (appOrderDiscountListVos.size() == 0) {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
View File

@ -86,4 +86,6 @@ public class FinBillApplicationQuery implements Query {
@ApiModelProperty("移动端查询条件") @ApiModelProperty("移动端查询条件")
private String name; private String name;
private String menuUrl;
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
View File

@ -97,4 +97,6 @@ public class FinBillApplicationVo implements Vo {
@ApiModelProperty("车架号拼接") @ApiModelProperty("车架号拼接")
private String vinNo; private String vinNo;
@ApiModelProperty("销售订单sid")
private String orderSid;
} }

102
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@ -100,6 +101,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
@ -265,7 +267,96 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) { public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) {
FinBillApplicationQuery query = pq.getParams(); FinBillApplicationQuery query = pq.getParams();
QueryWrapper<FinBillApplication> qw = createQueryWrapper(query); QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(useOrgSid);
}
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuUrl())){
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getCreateBySid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("fba.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fba.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fba.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fba.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("fba.createBySid",query.getCreateBySid());
}else{
PagerVo<FinBillApplicationVo> p = new PagerVo<>();
return p;
}
}else{
PagerVo<FinBillApplicationVo> p = new PagerVo<>();
return p;
}
}else {
qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
}
qw.and(wrapper -> wrapper.eq("fba.billStateKey", "001").or().eq("fba.billStateKey", "002"));
if ("1".equals(query.getType())) {
qw.eq("fba.nodeState", "待提交");
} else if ("2".equals(query.getType())) {
qw.ne("fba.nodeState", "待提交");
}
if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("fba.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getOpenTickUnitName())) {
qw.like("fba.openTickUnitName", query.getOpenTickUnitName());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("fba.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("fba.modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getBillStateKey())) {
qw.eq("fba.billStateKey", query.getBillStateKey());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("fba.createByName", query.getCreateByName());
}
//移动端条件
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("fba.customerName", query.getName()).or().like("fba.contractNo", query.getName()));
}
String applyStartDate = query.getApplyStartDate();
String applyEndDate = query.getApplyEndDate();
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
);
String returnedMoneyStartDate = query.getReturnedMoneyStartDate();
String returnedMoneyEndDate = query.getReturnedMoneyEndDate();
qw.apply(StringUtils.isNotEmpty(returnedMoneyStartDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') >= date_format('" + returnedMoneyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(returnedMoneyEndDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') <= date_format('" + returnedMoneyEndDate + "','%Y-%m-%d')"
);
qw.orderByDesc("fba.createTime");
IPage<FinBillApplication> page = PagerUtil.queryToPage(pq); IPage<FinBillApplication> page = PagerUtil.queryToPage(pq);
IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw); IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
for (FinBillApplicationVo record : pagging.getRecords()) { for (FinBillApplicationVo record : pagging.getRecords()) {
@ -277,6 +368,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
vinNos = vinNos + vinNo + ","; vinNos = vinNos + vinNo + ",";
} }
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
String contractNo = record.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
record.setOrderSid(busSalesOrder.getSid());
} }
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
@ -2424,6 +2518,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
vinNos = vinNos + vinNo + ","; vinNos = vinNos + vinNo + ",";
} }
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
String contractNo = record.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
record.setOrderSid(busSalesOrder.getSid());
} }
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
@ -2489,6 +2586,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
vinNos = vinNos + vinNo + ","; vinNos = vinNos + vinNo + ",";
} }
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
String contractNo = record.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
record.setOrderSid(busSalesOrder.getSid());
} }
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;

3
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -15,7 +15,8 @@ public enum ProcDefEnum {
//FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"), //FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"), FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"), //QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"), //QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),
//QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"), //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),

7
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -427,7 +427,7 @@ public class AppBusAdvanceGinvoiceapplyService {
public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) { public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
//开票车辆信息 //开票车辆信息
List<AppCarListDto> vinList = dto.getVinList(); List<AppCarListDto> vinList = dto.getVinList();
if (vinList == null) { if (vinList.isEmpty()) {
return new ResultBean().fail().setMsg("请选择车辆信息"); return new ResultBean().fail().setMsg("请选择车辆信息");
} }
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
@ -633,6 +633,10 @@ public class AppBusAdvanceGinvoiceapplyService {
public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) { public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
List<AppCarListDto> vinList = dto.getVinList();
if (vinList.isEmpty()) {
return new ResultBean().fail().setMsg("请选择车辆信息");
}
SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto(); SubmitFinBillApplicationDto submitAdvanceInvoiceDto = new SubmitFinBillApplicationDto();
BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs"); BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto, "arrearsCollectionAppendxs");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@ -664,7 +668,6 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setDeptName(split[0]); submitAdvanceInvoiceDto.setDeptName(split[0]);
submitAdvanceInvoiceDto.setCreateByName(split[1]); submitAdvanceInvoiceDto.setCreateByName(split[1]);
//开票车辆信息 //开票车辆信息
List<AppCarListDto> vinList = dto.getVinList();
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>(); List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
for (AppCarListDto vinListDto : vinList) { for (AppCarListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();

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

@ -1267,64 +1267,66 @@
</w:p> </w:p>
</w:tc> </w:tc>
</w:tr> </w:tr>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD"> <#if (isxsVinNo == "是")>
<w:tc> <w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tcPr> <w:tc>
<w:tcW w:w="1929" w:type="dxa"/> <w:tcPr>
<w:gridSpan w:val="3"/> <w:tcW w:w="1929" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/> <w:gridSpan w:val="3"/>
</w:tcPr> <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000" </w:tcPr>
wsp:rsidP="000E03BD"> <w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
<w:pPr> wsp:rsidP="000E03BD">
<w:jc w:val="right"/> <w:pPr>
<w:rPr> <w:jc w:val="right"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
</w:pPr> </w:rPr>
<w:r wsp:rsidRPr="000E03BD"> </w:pPr>
<w:rPr> <w:r wsp:rsidRPr="000E03BD">
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
<w:t>车架号</w:t> </w:rPr>
</w:r> <w:t>车架号</w:t>
</w:p> </w:r>
</w:tc> </w:p>
<w:tc> </w:tc>
<w:tcPr> <w:tc>
<w:tcW w:w="6593" w:type="dxa"/> <w:tcPr>
<w:gridSpan w:val="13"/> <w:tcW w:w="6593" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/> <w:gridSpan w:val="13"/>
</w:tcPr> <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000" </w:tcPr>
wsp:rsidP="000E03BD"> <w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
<w:pPr> wsp:rsidP="000E03BD">
<w:jc w:val="left"/> <w:pPr>
<w:rPr> <w:jc w:val="left"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
</w:pPr> </w:rPr>
<w:r wsp:rsidRPr="000E03BD"> </w:pPr>
<w:rPr> <w:r wsp:rsidRPr="000E03BD">
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
<w:t>${vinNo!}</w:t> </w:rPr>
</w:r> <w:t>${vinNo!}</w:t>
</w:p> </w:r>
</w:tc> </w:p>
</w:tr> </w:tc>
</w:tr>
</#if>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD"> <w:tr wsp:rsidR="00000000" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc> <w:tc>
<w:tcPr> <w:tcPr>
@ -1497,64 +1499,66 @@
</w:p> </w:p>
</w:tc> </w:tc>
</w:tr> </w:tr>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD"> <#if (isxsDjjz == "是")>
<w:tc> <w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tcPr> <w:tc>
<w:tcW w:w="1929" w:type="dxa"/> <w:tcPr>
<w:gridSpan w:val="3"/> <w:tcW w:w="1929" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/> <w:gridSpan w:val="3"/>
</w:tcPr> <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000" </w:tcPr>
wsp:rsidP="000E03BD"> <w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
<w:pPr> wsp:rsidP="000E03BD">
<w:jc w:val="right"/> <w:pPr>
<w:rPr> <w:jc w:val="right"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
</w:pPr> </w:rPr>
<w:r wsp:rsidRPr="000E03BD"> </w:pPr>
<w:rPr> <w:r wsp:rsidRPr="000E03BD">
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
<w:t>订金结转</w:t> </w:rPr>
</w:r> <w:t>订金结转</w:t>
</w:p> </w:r>
</w:tc> </w:p>
<w:tc> </w:tc>
<w:tcPr> <w:tc>
<w:tcW w:w="6593" w:type="dxa"/> <w:tcPr>
<w:gridSpan w:val="13"/> <w:tcW w:w="6593" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/> <w:gridSpan w:val="13"/>
</w:tcPr> <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000" </w:tcPr>
wsp:rsidP="000E03BD"> <w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
<w:pPr> wsp:rsidP="000E03BD">
<w:jc w:val="left"/> <w:pPr>
<w:rPr> <w:jc w:val="left"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
</w:pPr> </w:rPr>
<w:r wsp:rsidRPr="000E03BD"> </w:pPr>
<w:rPr> <w:r wsp:rsidRPr="000E03BD">
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/> <w:rPr>
<wx:font wx:val="宋体"/> <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<w:sz w:val="15"/> <wx:font wx:val="宋体"/>
<w:sz-cs w:val="15"/> <w:sz w:val="15"/>
</w:rPr> <w:sz-cs w:val="15"/>
<w:t>${djjz!}</w:t> </w:rPr>
</w:r> <w:t>${djjz!}</w:t>
</w:p> </w:r>
</w:tc> </w:p>
</w:tr> </w:tc>
</w:tr>
</#if>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD"> <w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc> <w:tc>
<w:tcPr> <w:tcPr>

Write Preview
Loading…
Cancel
Save