预付款申请增加查询条件；调整查询列表字段；SAP回执后抄送任务

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js

@@ -116,7 +116,14 @@ var tableArray = [
                         back: {
                             EBELN: "ebeln",
                             EBELP: "ebelp",
-                            ZEKPO_ITEM: "zekpoItem",
+                            MATNR: "matnr",
+                            TXZ01: "txz01",
+                            MENGE: "menge",
+                            TEXT1: "text1",
+                            MEINS: "meins",
+                            KBETR: "kbetr",
+                            MWSKZ: "mwskz",
+                            KWETR: "kwetr",
                             WAERS: "waers",
                             KURSF: "kursf",
                             KZWI1: "kzwi1",
@@ -126,8 +133,33 @@ var tableArray = [
                 }
             },
             {
-                display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
+                display: "物料编码", name: "matnr", width: 130, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "物料名称", name: "txz01", width: 200, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "数量", name: "menge", width: 100, minwidth: 120, type: "string", align: "left",
+                editor: {
+                    mask: 'nnnnnnnnn.nn',
+                    type: 'text'
+                }
+            },
+            {
+                display: "单位", name: "meins", width: 100, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "含税单价", name: "kbetr", width: 100, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "税码", name: "mwskz", width: 100, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "税额", name: "kwetr", width: 100, minwidth: 120, type: "string", align: "left",
             },
+            /*{
+                display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
+            },*/
             {
                 display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
             },
@@ -153,6 +185,9 @@ var tableArray = [
                     return item.kzwi11 = money;
                 }
             },
+            {
+                display: "文本", name: "text1", width: 120, minwidth: 120, type: "money", align: "left",hide:true,
+            },
         ]
     },
     {
@@ -489,6 +524,41 @@ function loadGrid(obj) {
             return false;//阻止默认事件
         },
         onAfterEdit:function (item) {
+            if (item.column.name == "menge"){
+                var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
+                var kbetr = item.record.kbetr;
+                var value = item.value;
+                if (MathUtil.compare(value,item.record.text1) > 0){
+                    Public.tip("数量不能大于原数量")
+                    value = item.record.text1;
+                    var money = 0;
+                    if (item.record.waers === "CNY"){
+                        money=MathUtil.mul(value,kbetr);
+                    }else {
+                        money=MathUtil.mul(MathUtil.mul(value,kbetr),item.record.kursf);
+                    }
+                    _grid.updateRow(item.record,{
+                        menge:value,
+                        kzwi1:MathUtil.mul(value,kbetr),
+                        kzwi11:money,
+                    })
+                    totalGrid();
+                }else {
+                    var money = 0;
+                    if (item.record.waers === "CNY"){
+                        money=MathUtil.mul(value,kbetr);
+                    }else {
+                        money=MathUtil.mul(MathUtil.mul(value,kbetr),item.record.kursf);
+                    }
+                    _grid.updateRow(item.record,{
+                        kzwi1:MathUtil.mul(value,kbetr),
+                        kzwi11:money,
+                    })
+                    totalGrid();
+                }
+
+            }
+
             if(item.column.name == "waers"
                 || item.column.name == "kursf"
                 || item.column.name == "kzwi1"

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePaymentList.js

@@ -19,25 +19,117 @@ function loadGrid() {
     });
     gridManager = UICtrl.grid("#advancePaymentListGrid", {
         columns: [
-            {display: "EP付款申请类别", name: "zepFtype", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "EP流程单号", name: "zepNo", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "付款凭证编号", name: "belnr1", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "付款凭证财年", name: "gjahr1", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "付款状态", name: "zpayStaus", width: 120, minwidth: 120, type: "string", align: "left"},
             {display: "EP付款申请类别名称", name: "zepFtypename", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "公司代码", name: "bukrs", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "公司代码名称", name: "butxt", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "EP部门代码", name: "zepDepart", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "公司代码", name: "bukrs", width: 80, minWidth: 60, type: "string", align: "left"},
+            {display: "公司代码名称", name: "butxt", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "EP部门名称", name: "zepDepartname", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "EP流程申请人代码", name: "zepAppli", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "EP流程申请人", name: "zepAppliname", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "付款申请创建日期", name: "zepFcrdate", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "EP流程单号", name: "zepNo", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "付款申请内容", name: "zepTxt", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "EP流程申请人", name: "zepAppliname", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "付款申请内容", name: "zepTxt", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "申请总金额", name: "zepFtamount1", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
+            {
+                display: "计划内外付款标识", name: "zepPlan", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "计划内外标识名称",
+                name: "zepPlanname",
+                width: 120,
+                minwidth: 120,
+                type: "string",
+                align: "left",
+            },
+            {
+                display: "BP标识", name: "zepBptype", width: 100, minwidth: 120, type: "string", align: "left"
+            },
+            {
+                display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "BP账号名称", name: "koinh", width: 200, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "采购订单号", name: "ebeln", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "采购订单行", name: "ebelp", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
+            },
+            {
+                display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "money", align: "left",
+            },
+            {
+                display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "原因代码", name: "rstgrName", width: 200, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "含税金额（审批）",
+                name: "zepPtdamount1",
+                width: 120,
+                minwidth: 120,
+                type: "money",
+                align: "left",
+            },
+            {
+                display: "含税金额（审批-本位币）",
+                name: "zepPtdamount",
+                width: 120,
+                minwidth: 120,
+                type: "money",
+                align: "left",
+            },
+            {display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
+            {
+                display: "付款方式", name: "zlschTextView", width: 150, minwidth: 120, type: "string", align: "left",
+            },
+            {
+                display: "直联付款标识", name: "zepBank", width: 120, minwidth: 120, type: "string", align: "left",
+            },
+            {display: "记账凭证编号", name: "belnr", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "记账凭证财年", name: "gjahr", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "记账过账日期", name: "budat", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "记账凭证日期", name: "bldat", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "返回状态", name: "msgty", width: 120, minwidth: 120, type: "string", align: "left"},
+            {display: "返回消息", name: "msgtx", width: 300, minwidth: 120, type: "string", align: "left"}
 
         ],
         dataAction: "server",
-        url: web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementList.ajax',
+        url: web_app.name + '/sapCostReimbursement/slicedAdvancePaymentList.ajax',
         parms:{zepFtype:"D"},
         pageSize: 20,
         usePager: true,
+        sortName: "fillinDate",
+        sortOrder: "desc",
         toolbar: toolbarOptions,
         width: "100%",
         height: "100%",
@@ -46,7 +138,7 @@ function loadGrid() {
         fixedCellHeight: true,
         selectRowButtonOnly: true,
         onDblClickRow: function (data, rowindex, rowobj) {
-            doView(data.id,data.zepFtype);
+            doView(data.bizId,data.zepFtype);
         }
 
     });

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePaymentList.jsp

@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
 <head>
-    <x:base include="layout,dialog,grid,tree,combox,commonTree"/>
+    <x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
     <x:script src='/biz/topsun/sap/costReimbursement/advancePaymentList.js'/>
 </head>
 <body>
@@ -12,7 +12,27 @@
         <div position="center" title="预付款申请查询">
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                    <div class="hg-form-row">
+                        <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                        <x:inputC name="belnr1" required="false" label="付款凭证编号" labelCol="1"/>
+                        <x:inputC name="koinh" required="false" label="供应商名称" labelCol="1"/>
+                        <x:inputC name="zpayStaus" required="false" label="付款状态" labelCol="1"/>
+                    </div>
+                    <div class="hg-form-row">
+                        <x:inputC name="zepFtamount1Begin" required="false" label="申请总金额起" labelCol="1"/>
+                        <x:inputC name="zepFtamount1End" required="false" label="申请总金额止" labelCol="1"/>
+                        <x:inputC name="fillinDateBegin" required="false" label="创建日期起" labelCol="1" wrapper="dateTime"/>
+                        <x:inputC name="fillinDateEnd" required="false" label="创建日期止" labelCol="1" wrapper="dateTime"/>
+                    </div>
+                    <div class="hg-form-row">
+                        <x:selectC name="zlsch" required="false" label="结账方式" labelCol="1" dictionary="zlsch"/>
+                        <x:inputC name="personMemberName" required="false" label="创建人" labelCol="1"/>
+                        <x:inputC name="finishedDateBegin" required="false" label="终审日期起" labelCol="1" wrapper="dateTime"/>
+                        <x:inputC name="finishedDateEnd" required="false" label="终审日期止" labelCol="1" wrapper="dateTime"/>
+                    </div>
+                    <div class="hg-form-row">
+                        <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
+                    </div>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -122,7 +122,6 @@ function bindEvent(){
         getParam: function (item) {
         },
         onChange: function (value, data) {
-            debugger;
             var name1 = $("#name1").val();
             if (data.nameOrg1 != name1) {
                 //如果选择的是其他公司，清空所选物料数据

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -23,7 +23,7 @@ function initItemGrid() {
                 title: "添加采购信息记录",
                 url: web_app.name + '/sapPurchaseInfoRecord/addSapPurchaseInfoRecordDetail.load',
                 param: {
-                    id:  $('#id').val
+                    id:  $('#id').val()
                 },
                 width:1200,
                 height:860,

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/SapCostReimbursementApplication.java

@@ -35,4 +35,6 @@ public interface SapCostReimbursementApplication {
     Integer checkzyl06(String zyl06);
 
     Map<String, Object> queryKostlByPersonCode(String personCode);
+
+    Map<String, Object> slicedAdvancePaymentList(SapCostReimbursementQueryRequest queryRequest);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java

@@ -91,6 +91,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
         List<SapCostReimbursementDetail> CRDetailAll = getBizEntities(SapCostReimbursementDetail.class, "CRDetail");
         for (SapCostReimbursementDetail item : CRDetailAll) {
             item.setReimbursementBaseInfoId(sapCostReimbursement.getId());
+            item.setZpayStaus("未支付");
             costReimbursementDetailRepository.save(item);
         }
         return sapCostReimbursement.getId();
@@ -330,14 +331,20 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
         for (SapCostReimbursementDetail sapCostReimbursementDetail : detailList) {
             sapCostReimbursementDetail.setBelnr1(paymentReceiptVo.getBelnr1());
             sapCostReimbursementDetail.setGjahr1(paymentReceiptVo.getGjahr1());
-            sapCostReimbursementDetail.setZpayStaus("已支付");
+            if ("X".equals(paymentReceiptVo.getZflag())){
+                sapCostReimbursementDetail.setZpayStaus("已冲销");
+            }else {
+                sapCostReimbursementDetail.setZpayStaus("已支付");
+            }
             costReimbursementDetailRepository.save(sapCostReimbursementDetail);
         }
+        reimbursement.setFinishedDate(new Date());
+        costReimbursementRepository.save(reimbursement);
         //
-        this.endTask(reimbursement);
+        //this.endTask(reimbursement);
         //在接收到SAP回执消息后，修改任务标题和当前时间，让申请人能看到该任务
         //this.updateActRuTaskExtension(reimbursement.getId());
-        //this.makeACopyFor(reimbursement);
+        this.makeACopyFor(reimbursement);
     }
 
     @Override
@@ -372,6 +379,14 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
         return this.sqlExecutorDao.queryToMap(sql, personCode);
     }
 
+    @Override
+    public Map<String, Object> slicedAdvancePaymentList(SapCostReimbursementQueryRequest queryRequest) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedAdvancePaymentList");
+        QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        model.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
+        return this.sqlExecutorDao.executeSlicedQuery(model);
+    }
+
     public void makeACopyFor(SapCostReimbursement reimbursement) {
         // 流程结束给申请人发送抄送
         List<String> executorIds = new ArrayList<>(1);
@@ -379,7 +394,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
         String taskId = this.baseTask.queryTaskByBizId(reimbursement.getId());
         Operator operator = operatorApplication.createOperatorByPersonMemberId(reimbursement.getPersonMemberId());
         ThreadLocalUtil.putOperator(operator);
-        this.workflowService.makeACopyFor(taskId, executorIds,"付款完成、sap回执："+reimbursement.getZepFtypename()+"-"+reimbursement.getBillCode());
+        this.workflowService.makeACopyFor(taskId, executorIds,"SAP付款回执："+reimbursement.getZepFtypename()+"-"+reimbursement.getBillCode());
     }
 
     public void updateActRuTaskExtension(String bizId){

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.costReimbursement.controller;
 
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+import com.huigou.topsun.common.BillStatus;
 import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementApplication;
 import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementDetailApplication;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
@@ -41,7 +42,6 @@ public class SapCostReimbursementController extends CommonController {
 
 
     public String forwardCostReimbursementList(){
-        SDO sdo = this.getSDO();
         return forward("costReimbursementList");
     }
     public String forwardPayApplyNoPOList(){
@@ -49,6 +49,7 @@ public class SapCostReimbursementController extends CommonController {
     }
 
     public String forwardAdvancePaymentList(){
+        this.putAttribute("statusKindsList", BillStatus.getValidMap());
         return forward("advancePaymentList");
     }
 
@@ -117,6 +118,17 @@ public class SapCostReimbursementController extends CommonController {
         return toResult(map);
     }
 
+    /**
+     * 预付款列表查询
+     * @return
+     */
+    public String slicedAdvancePaymentList(){
+        SDO sdo = this.getSDO();
+        SapCostReimbursementQueryRequest queryRequest = sdo.toQueryRequest(SapCostReimbursementQueryRequest.class);
+        Map<String, Object> map = costReimbursementApplication.slicedAdvancePaymentList(queryRequest);
+        return toResult(map);
+    }
+
 
     public String slicedSapCostReimbursementDetailList(){
         SDO sdo = this.getSDO();

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursement.java

@@ -232,6 +232,12 @@ public class SapCostReimbursement extends FlowBillAbstractEntity {
     private String text1;
 
 
+    /**
+     * 审批完成时间
+     */
+    @Column(name = "finished_date")
+    private Date finishedDate;
+
     @Override
     protected String getCodeRuleId() {
         return "sapCostReimbursement";

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursementDetail.java

@@ -418,4 +418,34 @@ public class SapCostReimbursementDetail implements Serializable {
     @Column(name = "text1")
     private String text1;
 
+    /**
+     * 物料编码
+     */
+    @Column(name = "matnr")
+    private String matnr;
+
+    /**
+     * 物料描述
+     */
+    @Column(name = "txz01")
+    private String txz01;
+
+    /**
+     * 数量
+     */
+    @Column(name = "menge")
+    private BigDecimal menge;
+
+    /**
+     * 单位
+     */
+    @Column(name = "meins")
+    private String meins;
+
+    /**
+     * 含税单价
+     */
+    @Column(name = "kbetr")
+    private BigDecimal kbetr;
+
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/query/SapCostReimbursementQueryRequest.java

@@ -115,7 +115,31 @@ public class SapCostReimbursementQueryRequest extends QueryAbstractRequest {
      * 填报日期
      */
     private Date fillinDate;
+    private Date fillinDateBegin;
+    private Date fillinDateEnd;
+
+
 
     private String reimbursementBaseInfoId;
 
+    private String statusKind;
+
+    private BigDecimal zepFtamount1Begin;
+
+    private BigDecimal zepFtamount1End;
+
+    private String personMemberName;
+
+    private Date finishedDateBegin;
+    private Date finishedDateEnd;
+
+    private String koinh;
+
+    private String zpayStaus;
+
+    private String zlsch;
+
+    private String belnr1;
+
+
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/vo/PaymentReceiptVo.java

@@ -25,4 +25,10 @@ public class PaymentReceiptVo implements Serializable {
      */
     @JsonProperty("GJAHR1")
     private String gjahr1;
+
+    /**
+     * 冲销标识如果传的值是X那么BPM对应就显示已冲销
+     */
+    @JsonProperty("ZFLAG")
+    private String zflag;
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -206,6 +206,10 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
         nonProdApplyDept.setTextDescription(baseInfo.getTextDescription());
 
         nonProdApplyDept.setBaseUnitName(baseInfo.getBaseUnitName());
+        if (StringUtil.isNotBlank(baseInfo.getBaseUnit())){
+            nonProdApplyDept.setMeins(baseInfo.getBaseUnit());
+            nonProdApplyDept.setMeinsName(baseInfo.getBaseUnitName());
+        }
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapPaymentApplicationImpl.java

 package com.huigou.topsun.sap.sapApplication.application.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -148,6 +149,11 @@ public class SapPaymentApplicationImpl implements SapPaymentApplication {
         } catch (IOException e) {
             throw new RuntimeException("查询供应商采购订单信息出错”。");
         }
+        if (CollectionUtil.isNotEmpty(mapList)) {
+            mapList.forEach(map -> {
+                map.put("TEXT1", map.get("MENGE"));
+            });
+        }
         return mapList;
     }
 

topsun/src/main/resources/config/topsun/sap/costReimbursement/costReimbursement.xml

@@ -75,4 +75,74 @@
              LEFT JOIN sa_oporgproperty op ON o.DEPT_ID = op.ORG_ID where p.CODE =?
         </sql-query>
     </query>
-</query-mappings>
+
\ No newline at end of file
+    <query name="slicedAdvancePaymentList">
+        <sql-query>
+            SELECT
+             d.*,
+            b.id as biz_id,
+            b.zep_ftype,
+            b.zep_ftypename,
+            b.bukrs,
+            b.butxt,
+            b.zep_depart,
+            b.zep_departname,
+            b.zep_appli,
+            b.zep_appliname,
+            b.zep_fcrdate,
+            b.zep_no,
+            b.zep_txt,
+            b.zep_ftamount,
+            b.zep_fttax,
+            b.zep_ftamount1,
+            b.zep_fttax1,
+            b.zep_ptamount,
+            b.zep_pttax,
+            b.zep_ptamount1,
+            b.zep_pttax1,
+            b.fillin_date,
+            b.bill_code,
+            b.STATUS,
+            b.dept_name,
+            b.person_member_name,
+            b.msg_type,
+            b.msg_id,
+            b.number,
+            b.message,
+            b.log_no,
+            b.log_msg_no,
+            b.message_v1,
+            b.message_v2,
+            b.message_v3,
+            b.message_v4,
+            b.employee_loan_bill_code,
+            <!--b.zep_txt1,-->
+            <!--b.bankn1,-->
+            <!--b.zt012k_text1,-->
+            b.employee_loan_text,
+            <!--b.text1,-->
+            b.finished_date
+             FROM sap_cost_reimbursement_detail d
+             LEFT JOIN sap_cost_reimbursement_base_info b ON b.id = d.reimbursement_base_info_id where 1=1
+        </sql-query>
+        <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
+        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="b"/>
+        <condition column="zep_ftype" name="zepFtype" type="java.lang.String" symbol="=" alias="b"/>
+        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="b"/>
+        <condition column="zep_ftamount1" name="zepFtamount1Begin" type="java.lang.String" symbol="&gt;=" alias="b"/>
+        <condition column="zep_ftamount1" name="zepFtamount1End" type="java.lang.String" symbol="&lt;=" alias="b"/>
+        <condition column="fillin_date" name="fillinDateBegin" symbol="&gt;="  type="java.util.Date" alias="b"/>
+        <condition column="fillin_date" name="fillinDateEnd" symbol="&lt;="  type="java.util.Date" alias="b"/>
+        <condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="=" alias="b"/>
+        <condition column="finished_date" name="finishedDateBegin" symbol="&gt;="  type="java.util.Date" alias="b"/>
+        <condition column="finished_date" name="finishedDateEnd" symbol="&lt;="  type="java.util.Date" alias="b"/>
+
+        <condition column="koinh" name="koinh" type="java.lang.String" symbol="like" alias="d"/>
+        <condition column="zpay_staus" name="zpayStaus" type="java.lang.String" symbol="=" alias="d"/>
+        <condition column="zlsch" name="zlsch" type="java.lang.String" symbol="=" alias="d"/>
+        <condition column="belnr1" name="belnr1" type="java.lang.String" symbol="like" alias="d"/>
+
+    </query>
+</query-mappings>
+
+