diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinCustNameAndPhone.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinCustNameAndPhone.java new file mode 100644 index 0000000000..ab513d7fa7 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinCustNameAndPhone.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.fin.api.finfundscarriedforwardapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FinCustNameAndPhone { + + @ApiModelProperty("付款人姓名") + private String draweeName; + @ApiModelProperty("付款人联系电话") + private String draweeMobile; + @ApiModelProperty("业务员sid") + private String staffSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java new file mode 100644 index 0000000000..8a186ac345 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.fin.api.finfundscarriedforwardapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TzDto { + + @ApiModelProperty("业务sud") + private String busSid; + @ApiModelProperty("调账类型") + private String tzType; + @ApiModelProperty("合同编号") + private String conNo; + @ApiModelProperty("客户sid") + private String custSid; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("客户编码") + private String custNo; + @ApiModelProperty("物料编码") + private String vinNo; + @ApiModelProperty("调出金额") + private Integer dcje = 0; + @ApiModelProperty("调入金额") + private Integer drje = 0; + + public TzDto(String busSid, String zc, String conNo, String name, String custNo, String vinNo, int i) { + + } +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZC.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZC.java deleted file mode 100644 index e1e60a2632..0000000000 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZC.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.anrui.fin.api.finfundscarriedforwardapply; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ZC { - - @ApiModelProperty("调账类型") - private String zc; - @ApiModelProperty("合同编号") - private String conNo; - @ApiModelProperty("客户名称") - private String name; - @ApiModelProperty("物料编码") - private String vinNo; - @ApiModelProperty("调出金额") - private String dcje; - @ApiModelProperty("调入金额") - private String drje; - @ApiModelProperty("调出前余额") - private String dcqye; - @ApiModelProperty("调出后余额") - private String dchye; -} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZR.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZR.java deleted file mode 100644 index aa6e1f8e3a..0000000000 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/ZR.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.anrui.fin.api.finfundscarriedforwardapply; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ZR { - - @ApiModelProperty("调账类型") - private String zr; - @ApiModelProperty("合同编号") - private String conNo; - @ApiModelProperty("客户名称") - private String name; - @ApiModelProperty("物料编码") - private String vinNo; - @ApiModelProperty("调出金额") - private String dcje; - @ApiModelProperty("调入金额") - private String drje; - @ApiModelProperty("调出前余额") - private String dcqye; - @ApiModelProperty("调出后余额") - private String dchye; -} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java index 465c2d72a7..3a665cd530 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java @@ -15,6 +15,8 @@ import java.util.List; @Data public class OtherReceivable { + @ApiModelProperty("单据编号") + public String billNo; @ApiModelProperty("单据类型") public String billType = "QTYSD01_SYS"; @ApiModelProperty("往来单位类型") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 726a99f597..87f012c889 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -201,13 +201,13 @@ - + SELECT bd.`draweeName`, + bd.draweeMobile, + ffa.`staffSid` FROM fin_funds_carried_forward_veh ffv + LEFT JOIN fin_funds_carried_forward_apply ffa + ON ffv.`mainSid` = ffa.`sid` + LEFT JOIN fin_selected_receivables_detailed fsrd + ON ffv.`busSid` = fsrd.`sid` LEFT JOIN fin_collection_confirmation fcc - ON ffv.`busSid` = fcc.`sid` + ON fsrd.`collSid` = fcc.`sid` + AND fcc.`pushMessgae` = 1 LEFT JOIN anrui_buscenter.`bus_deposit` bd ON fcc.`busSid` = bd.`billSid` - WHERE ffv.`mainSid` = #{sid} - GROUP BY bd.`draweeMobile` - - - - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java index 721e7dd228..b5897781f1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinCustNameAndPhone; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -162,15 +163,7 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService fetchByMainSidAndGroupCustPhone(String sid) { - return baseMapper.fetchByMainSidAndGroupCustPhone(sid); - } - - public List fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) { - return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid); - } - - public List fetchJzMoneyByCustSidAndMainSid(String custSid, String sid) { - return baseMapper.fetchJzMoneyByCustSidAndMainSid(custSid,sid); + public List fetchNameAndPhoneByBusSid(String busSid) { + return baseMapper.fetchNameAndPhoneByBusSid(busSid); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index e23da0bbed..ff50224259 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -161,4 +161,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectPageLists(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + FinSelectedReceivablesDetailed fetchYeBySid(String busSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index d8c33850db..ccfc30c0b6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -487,4 +487,21 @@ WHERE fsr.`contractNo` = #{ysCustNo} AND fsr.`collSid` = #{sid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index dd497f100d..5140c6d1a2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -622,4 +622,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) { return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid); } + + public FinSelectedReceivablesDetailed fetchYeBySid(String busSid) { + return baseMapper.fetchYeBySid(busSid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java index e4b3f64dea..dd450efe67 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java @@ -27,6 +27,11 @@ public class OtherReceivableBillService extends FinKingDeeService { //业务表的主表数据集合 Map map_fEntityModel_=new HashMap<>(); //物料的数组集合 + //单据编号 + if(otherReceivable.getBillNo()==null){ + return rb.setMsg("单据编号不能为空"); + } + map_fEntityModel_.put("FBillNo",otherReceivable.getBillNo()); //业务日期 if(otherReceivable.getBussDate()==null){ return rb.setMsg("业务日期不能为空"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json index 37cc654b5d..d1ec9e70ad 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json @@ -3,7 +3,7 @@ "FBillTypeID": { "FNUMBER": "QTYSD01_SYS" }, - "FBillNo": "", + "FBillNo": "@KD_FBillNo", "FDATE": "@KD_FDATE", "FENDDATE_H": "1900-01-01", "FISINIT": "false", diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java index 643aff62d2..1e3a7ca81c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java @@ -67,4 +67,8 @@ public class LoanPreloanCreditApplyVo implements Vo { private String zffkjg; @ApiModelProperty("申诉结果") private String ssjg; + @ApiModelProperty("是否可以办理") + private Boolean isEdit; + @ApiModelProperty("是否可以删除") + private Boolean isDelete; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index baec720838..3d5e7f2c4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -141,6 +141,16 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanPreloanCreditApplyVo record : pagging.getRecords()) { + String state = record.getState(); + if ("1".equals(state)){ + record.setIsEdit(true); + record.setIsDelete(true); + }else { + record.setIsEdit(false); + record.setIsDelete(false); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -224,6 +234,16 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanPreloanCreditApplyVo record : pagging.getRecords()) { + String state = record.getState(); + if ("0".equals(state)){ + record.setIsEdit(true); + record.setIsDelete(false); + }else { + record.setIsEdit(false); + record.setIsDelete(false); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl index 60c3b5ecae..173b1ef07d 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl +++ b/工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl @@ -75,7 +75,6 @@ - @@ -86,15 +85,13 @@ - - - - - - - - - + + + + + + + @@ -106,7 +103,6 @@ - @@ -121,14 +117,13 @@ - + - @@ -178,7 +173,6 @@ - @@ -193,14 +187,13 @@ - + - @@ -247,7 +240,6 @@ - @@ -256,19 +248,20 @@ + - + + - @@ -314,14 +307,13 @@ - + - @@ -367,14 +359,13 @@ - + - @@ -420,61 +411,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 物料编码 - - - - - - + @@ -482,166 +419,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 调出金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 调入金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 调出前余额 - - - - - - - - - - - - - @@ -652,442 +429,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 调出后余额 - - - - - <#list zcList as zc> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.zc!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.conNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.vinNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.dcje!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.drje!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.dcqye!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zc.dchye!} - - - - - - <#list zrList as zr> + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 调出金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 调入金额 + + + + + <#list tzList as tz> @@ -1098,7 +578,6 @@ - @@ -1107,19 +586,20 @@ + - + + - @@ -1155,20 +635,19 @@ - ${zr.zr!} + ${tz.tzType!} - + - @@ -1199,20 +678,19 @@ - ${zr.conNo!} + ${tz.conNo!} - + - @@ -1230,6 +708,7 @@ + @@ -1243,13 +722,13 @@ - ${zr.name!} + ${tz.name!} - + @@ -1257,7 +736,6 @@ - @@ -1275,6 +753,7 @@ + @@ -1288,21 +767,19 @@ - ${zr.vinNo!} + ${tz.vinNo!} - - + - @@ -1338,124 +815,25 @@ - ${zr.dcje!} + ${tz.dcje!} - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zr.drje!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${zr.dcqye!} - - - - - - - - - - - - - - - - - - @@ -1480,7 +858,7 @@ - ${zr.dchye!} + ${tz.drje!} @@ -1496,7 +874,6 @@ - @@ -1517,7 +894,6 @@ - @@ -1571,7 +947,6 @@ - @@ -1611,14 +986,12 @@ - - @@ -1662,14 +1035,13 @@ - + - @@ -1731,7 +1103,7 @@ - + @@ -1745,14 +1117,14 @@ xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"> 1 - 65 - 260 + 45 + 140 0 0 - 2 + 0 false false - 260 + 140 WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA 0 @@ -1768,7 +1140,7 @@ 2023-07-10T06:09:57Z God 文档存本地丢失不负责 - 2023-07-10T06:34:23Z + 2023-07-21T00:59:39Z @@ -1781,7 +1153,7 @@ 2052-11.1.0.14309 - 90FD13DE91554DE7BE7213573AD98205_13 + 7D19BE92512D49FCAB02D5921C488073_13 @@ -1873,11 +1245,11 @@ xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14"> - + @@ -1915,14 +1287,20 @@ + + - - - - + + + + + + + + + - @@ -2336,6 +1714,7 @@ + @@ -2350,7 +1729,7 @@ - + @@ -2360,39 +1739,39 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -2471,131 +1850,160 @@ - - - + + - + - - - + + - - - + + - + - - - + + - + - - - + + - - - + + - + - + - + + + + - - + - - + - - + + + + + + + - + + + + + + + - + - + + + + + + + + + + + + - - - - - - - - - - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc index 3a10aca0ec..7773da139b 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc +++ b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转(调账申请).doc @@ -1,6 +1,9 @@ |调账申请 | |${saleDate!} | -|调账类|合同编号 |客户 |物料编码 | -|型 | |名称 | | +|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 | +|${tz.tzTyp|${tz.conNo|${tz.name!|${tz.vinNo|${tz.dcje!|${tz.drje!| +|e!} |!} |} |!} |} |} | +|申请人|${makeName!} |审核 |${spName!} | +|: | |人: | |