采购申请、供应商管理、领料申请、采购信息记录查询条件

1876b033 · 鲁鑫 · b5a1b452 · 1876b033 · 1876b033 · 1876b033
Commit 1876b033 authored Sep 19, 2024 by 鲁鑫
25 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
@@ -59,11 +59,12 @@
    <div class="hg-form-cols">
        <div class="hg-form-row">
            <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
+            <x:inputC name="matnr" label="物料编号" labelCol="1" fieldCol="2"/>
          <c:if test="${kind=='product'}">
-            <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="5"/>
+            <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
          </c:if>
          <c:if test="${kind!='product'}">
-            <x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="5"/>
+            <x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="2"/>
          </c:if>
            <x:hidden name="baseUnit"/>
            <x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
@@ -518,7 +518,7 @@ function financialDisplayNcost(vprsv) { // alert("-="+vprsv);
        $('#mlast').val('3');
        $('#mlast_text').val('单/多级');
    } else  if (vprsv == 'V') { //移动平均价格
-        if ($('#beskz').val() == 'F' || $('#sobsl').val() == '40' || $('#sobsl').val() == '70') { //外部采购，库存转储，从1010工厂领料
+        if ($('#beskz').val() == 'F' && ($('#sobsl').val() == '40' || $('#sobsl').val() == '70')) { //外部采购，库存转储，从1010工厂领料
            $('#ncost').val('0');
            $('#ncost_text').val('0-空');
        } else {

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
@@ -20,6 +20,7 @@ function loadGrid() {
    gridManager = UICtrl.grid("#maingrid", {
        columns: [
            {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
+            {display: "领料单号", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
            {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
            {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
@@ -27,9 +28,16 @@ function loadGrid() {
            {display: "成本中心", name: "kostlName", width: 200, minWidth: 60, type: "string", align: "left"},
            {display: "内部订单编号", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},
            {display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",},
+            {display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left"},
+            {display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
+            {display: "库存地点", name: "lgobe", width: 200, minWidth: 60, type: "string", align: "left",},
+            {display: "数量", name: "erfmg", width: 100, minWidth: 60, type: "string", align: "left",},
+            {display: "计量单位", name: "msehl", width: 90, minWidth: 60, type: "string", align: "left",},
+            {display: "领料方", name: "wempf", width: 200, minWidth: 60, type: "string", align: "left",},
+            {display: "备注用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",},
            {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
            {display: "消息类型", name: "typeTextView", width: 100, minWidth: 60, type: "string", align: "left"},
-            {display: "领料单号", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
        ],
        dataAction: "server",
        url: web_app.name + '/nonProducePick/slicedNonProducePickList.ajax',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.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,dateTime,commonTree"/>
    <x:script src='/biz/topsun/sap/nonProducePick/nonProducePickList.js'/>
 </head>
 <body>
@@ -14,7 +14,28 @@
        <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">
+                <div class="hg-form-row">
                    <x:inputC name="billCode" required="false" label="单据编号" labelCol="1"/>
+                    <x:inputC name="message" required="false" label="领料单号" labelCol="1"/>
+                    <x:inputC name="deptName" required="false" label="领料部门" labelCol="1"/>
+                    <x:inputC name="personMemberName" required="false" label="领料人" labelCol="1"/>
+                </div>
+                <div class="hg-form-row">
+                    <x:inputC name="matnr" required="false" label="物料编码" labelCol="1"/>
+                    <x:inputC name="maktx" required="false" label="物料名称" labelCol="1"/>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
+                    </div>
+                </div>
                <x:searchButtons/>
            </form>
            <div class="blank_div clearfix"></div>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
@@ -82,6 +82,7 @@ function initItemGrid() {
                    knttp: $("#knttp").val(),
                    ernam: $("#personMemberName").val(),
                    afnam: $("#personMemberName").val(),
+                    afnamId: $("#personMemberId").val(),
                });
            }
        },
@@ -356,7 +357,26 @@ function getGridColumns() {
        columns.push({display: "创建者", name: "ernam", width: "200", align: "left", type: "string"},);
        columns.push({
            display: "申请人", name: "afnam", width: "90", align: "left", type: "string",
-            editor: {type: 'text', required: true},
+            //editor: {type: 'text', required: true},
+            editor: {
+                type: 'tree',
+                required: true,
+                checkbox: true,
+                data: {
+                    name: 'org',
+                    filter: 'psm',
+                    minWidth: 250,
+                    param: {
+                        orgRoot: "14636F3F48934EE7811768692A0AC5E1"
+                    }
+                },
+                back: {
+                    name: 'afnam',
+                    id: 'afnamId'
+                },
+                // textField: 'executor',
+                // valueField: 'executorId',
+            }
        },);
        columns.push({
            display: "预估单价", name: "preis", width: "100", align: "left", type: "string",

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
@@ -41,15 +41,37 @@ function initPurchaseListGrid() {
    purchaseGridManager = UICtrl.grid('#purchaseGrid', {
            columns: [
-                {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
+                {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"},
-                , {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
+                {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true},
-                , {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "PR类型", name: "bsartTextView", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "PR类型", name: "bsartTextView", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "科目分配类别", name: "knttpTextView", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "科目分配类别", name: "knttpTextView", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "批准时间", name: "frgdt", width: 200, minWidth: 60, type: "date", align: "center"}
+                //{display: "批准时间", name: "frgdt", width: 200, minWidth: 60, type: "date", align: "center"},
-                , {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"}
+                //{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
-                , {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"}
+                {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
+                {display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",},
+                {display: "工厂", name: "werks", width: "100", align: "left", type: "string"},
+                {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",},
+                {display: "库存地点", name: "lgort", width: "100", align: "left", type: "string"},
+                {display: "库存地点名称", name: "lgobe", width: "200", align: "left", type: "string"},
+                {display: "短文本", name: "txz01", width: "200", align: "left", type: "string",},
+                {display: "物料组", name: "matklName", width: "100", align: "left", type: "string",},
+                {display: "申购数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "申购数量单位", name: "meinsName", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "采购组", name: "ekgrpName", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "批准日期", name: "frgdt", width: "100", align: "left", type: "string",},
+                {display: "要求交货日期", name: "lfdat", width: "100", align: "left", type: "string",},
+                {display: "申购部门", name: "afnamDeptName", width: "90", align: "left", type: "string",},
+                {display: "申请人", name: "afnam", width: "90", align: "left", type: "string",},
+                {display: "预估单价", name: "preis", width: "100", align: "left", type: "string",},
+                {display: "价格基数", name: "ebanPeinh", width: "100", align: "left", type: "string",},
+                {display: "币种", name: "waersName", width: "100", align: "left", type: "string",},
+                {display: "评估金额", name: "ebanNetwr", width: "100", align: "left", type: "string",},
+                {display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string",},
+                {display: "订单号", name: "aufnr", width: "200", align: "left", type: "string",},
+                {display: "申请日期", name: "badat", width: "100", align: "left", type: "string",},
+                {display: "创建日期", name: "erdat", width: "100", align: "left", type: "string",},
            ],
            dataAction: 'server',
            url: web_app.name + '/sapPurchase/slicedSapPurchaseList.ajax?',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.jsp
@@ -16,22 +16,55 @@
            <x:title title="搜索" hideTable="queryMainForm"/>
            <form class="hg-form ui-show" method="post" action="" id="queryMainForm">
                <div class="hg-form-row">
-                    <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
+                    <x:inputC name="billCode" label="单据编号" labelCol="1"/>
-                    <x:inputC name="banfn" label="采购申请编号" labelCol="1"/>
+                    <x:inputC name="banfn" label="申购单号" labelCol="1"/>
+                    <x:inputC name="matnr" label="产品编码" labelCol="1"/>
                </div>
                <div class="hg-form-row">
                    <div class="col-xs-4 col-sm-1">
-                        <label class="hg-form-label">申请日期起&nbsp;:</label>
+                        <label class="hg-form-label">申购日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="badatBegin" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">申购日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="badatEnd" label="至" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">交货日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="lfdatBegin" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">交货日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="lfdatEnd" label="至" required="false" wrapper="date" />
+                    </div>
+                </div>
+                <div class="hg-form-row">
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期起&nbsp;:</label>
                    </div>
                    <div class="col-xs-4 col-sm-2 col-white-bg">
                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
                    </div>
                    <div class="col-xs-4 col-sm-1">
-                        <label class="hg-form-label">申请日期止&nbsp;:</label>
+                        <label class="hg-form-label">录入日期止&nbsp;:</label>
                    </div>
                    <div class="col-xs-4 col-sm-2 col-white-bg">
                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
                    </div>
+                    <x:inputC name="afnamDeptName" label="申购部门" labelCol="1"/>
+                    <x:inputC name="afnam" label="申购人" labelCol="1"/>
+                </div>
+                <div class="hg-form-row">
+                    <x:inputC name="lgort" label="库存编码" labelCol="1"/>
+                    <x:inputC name="lgobe" label="库存名称" labelCol="1"/>
                </div>
                <div class="hg-form-row">
                    <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
@@ -41,6 +41,7 @@ function initItemGrid() {
                erdat: fillinDate,
                ernam: $("#personMemberName").val(),
                afnam: $("#personMemberName").val(),
+                afnamId: $("#personMemberId").val(),
            });
        },
        deleteHandler: function () {
@@ -278,7 +279,26 @@ function getGridColumns() {
        columns.push({display: "创建者", name: "ernam", width: "200", align: "left", type: "string"},);
        columns.push({
            display: "申请人", name: "afnam", width: "90", align: "left", type: "string",
-            editor: {type: 'text', required: true},
+            //editor: {type: 'text', required: true},
+            editor: {
+                type: 'tree',
+                required: true,
+                checkbox: true,
+                data: {
+                    name: 'org',
+                    filter: 'psm',
+                    minWidth: 250,
+                    param: {
+                        orgRoot: "14636F3F48934EE7811768692A0AC5E1"
+                    }
+                },
+                back: {
+                    name: 'afnam',
+                    id: 'afnamId'
+                },
+                // textField: 'executor',
+                // valueField: 'executorId',
+            }
        },);
        columns.push({
            display: "预估单价", name: "preis", width: "100", align: "left", type: "string",

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
@@ -96,6 +96,7 @@ function initItemGrid() {
                    knttp: $("#knttp").val(),
                    ernam: $("#personMemberName").val(),
                    afnam: $("#personMemberName").val(),
+                    afnamId: $("#personMemberId").val(),
                });
            }
        },
@@ -425,7 +426,26 @@ function getGridColumns() {
        columns.push({display: "创建者", name: "ernam", width: "200", align: "left", type: "string"},);
        columns.push({
            display: "申请人", name: "afnam", width: "90", align: "left", type: "string",
-            editor: {type: 'text', required: true},
+            //editor: {type: 'text', required: true},
+            editor: {
+                type: 'tree',
+                required: true,
+                checkbox: true,
+                data: {
+                    name: 'org',
+                    filter: 'psm',
+                    minWidth: 250,
+                    param: {
+                        orgRoot: "14636F3F48934EE7811768692A0AC5E1"
+                    }
+                },
+                back: {
+                    name: 'afnam',
+                    id: 'afnamId'
+                },
+                // textField: 'executor',
+                // valueField: 'executorId',
+            }
        },);
        columns.push({
            display: "预估单价", name: "preis", width: "100", align: "left", type: "string",

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js
@@ -32,14 +32,40 @@ function initPurchaseListGrid() {
    });
    purchaseApprovalGridManager = UICtrl.grid('#purchaseApprovalGrid', {
            columns: [
-                {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"}
+                {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"},
-                , {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
+                {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true},
-                , {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "采购申请类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "采购申请类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
+                {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"},
-                , {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "center"}
+                {display: "项目编号", name: "bnfpo", width: "80", align: "left", type: "string"},
-                , {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
+                {display: "项目类别", name: "pstyp", width: "50", align: "left", type: "string"},
-                , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "center"}
+                {display: "项目类别描述", name: "ptext", width: "100", align: "left", type: "string"},
+                {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string"},
+                {display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
+                {display: "工厂", name: "werks", width: "100", align: "left", type: "string",},
+                {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string"},
+                {display: "物料编号", name: "matnr", width: "200", align: "left", type: "string",},
+                {display: "物料描述", name: "txz01", width: "300", align: "left", type: "string",},
+                {display: "物料组", name: "matkl", width: "100", align: "left", type: "string",},
+                {display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string",},
+                {display: "采购申请数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "采购申请计量单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "单位描述", name: "msehl", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "要求交货日期", name: "lfdat", width: "100", align: "left", type: "string",},
+                {display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",},
+                {display: "库存地点名称", name: "lgobe", width: "100", align: "left", type: "string"},
+                {display: "采购组", name: "ekgrp", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "采购组描述", name: "eknam", width: 200, minWidth: 60, type: "string", align: "center",},
+                {display: "评估价格", name: "preis", width: "100", align: "left", type: "string",},
+                {display: "价格单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",},
+                {display: "币种", name: "waers", width: "100", align: "left", type: "string",},
+                {display: "价格基数", name: "peinh", width: "100", align: "left", type: "string",},
+                {display: "需求(请求)日期", name: "badat", width: "100", align: "left", type: "string",},
+                {display: "创建人", name: "ernam", width: "100", align: "left", type: "string",},
+                {display: "申请人", name: "nameText", width: "100", align: "left", type: "string",},
+                {display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "center"},
+                {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "center"},
+                {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "date", align: "center"}
            ],
            dataAction: 'server',
            url: web_app.name + '/sapPurchaseApproval/slicedSapPurchaseApprovalList.ajax?',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.jsp
@@ -16,22 +16,57 @@
            <x:title title="搜索" hideTable="queryMainForm"/>
            <form class="hg-form ui-show" method="post" action="" id="queryMainForm">
                <div class="hg-form-row">
-                    <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
+                    <x:inputC name="billCode" label="单据编号" labelCol="1"/>
-                    <x:inputC name="banfn" label="采购申请编号" labelCol="1"/>
+                    <x:inputC name="banfn" label="申购单号" labelCol="1"/>
+                    <x:inputC name="matnr" label="产品编码" labelCol="1"/>
+                    <x:inputC name="txz01" label="产品名称" labelCol="1"/>
                </div>
                <div class="hg-form-row">
                    <div class="col-xs-4 col-sm-1">
-                        <label class="hg-form-label">申请日期起&nbsp;:</label>
+                        <label class="hg-form-label">需求日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="badatBegin" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">需求日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="badatEnd" label="至" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">交货日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="lfdatBegin" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">交货日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="lfdatEnd" label="至" required="false" wrapper="date" />
+                    </div>
+                </div>
+                <div class="hg-form-row">
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期起&nbsp;:</label>
                    </div>
                    <div class="col-xs-4 col-sm-2 col-white-bg">
                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
                    </div>
                    <div class="col-xs-4 col-sm-1">
-                        <label class="hg-form-label">申请日期止&nbsp;:</label>
+                        <label class="hg-form-label">录入日期止&nbsp;:</label>
                    </div>
                    <div class="col-xs-4 col-sm-2 col-white-bg">
                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
                    </div>
+                    <x:inputC name="afnamDeptName" label="申购部门" labelCol="1"/>
+                    <x:inputC name="nameText" label="申购人" labelCol="1"/>
+                </div>
+                <div class="hg-form-row">
+                    <x:inputC name="lgort" label="库存编码" labelCol="1"/>
+                    <x:inputC name="lgobe" label="库存名称" labelCol="1"/>
+                    <x:inputC name="ernam" label="创建人" labelCol="1"/>
                </div>
                <div class="hg-form-row">
                    <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.jsp
@@ -16,13 +16,35 @@
            <x:title title="搜索" hideTable="queryMainForm"/>
            <form class="hg-form ui-show" method="post" action="" id="queryMainForm">
                <div class="hg-form-row">
-                    <x:inputC name="billCode" label="采购信息记录编号" labelCol="1"/>
+                    <x:inputC name="infnr" label="采购信息记录编号" labelCol="1"/>
                    <x:hidden name="werks"/>
                    <x:inputC name="werksName" label="工厂" labelCol="1" wrapper="select"/>
                    <x:hidden name="lifnr"/>
                    <x:inputC name="name1" label="供应商" labelCol="1" wrapper="select"/>
-                    <x:inputC name="matnr" label="物料" labelCol="1"/>
+                    <x:selectC name="esokz" label="采购信息记录分类" labelCol="1" dictionary="esokz"/>
-                    <x:selectC name="esokz" label="信息类别标识" labelCol="1" dictionary="esokz"/>
+                </div>
+                <div class="hg-form-row">
+                    <x:inputC name="matnr" label="物料编码" labelCol="1"/>
+                    <x:inputC name="maktx" label="物料名称" labelCol="1"/>
+                    <x:inputC name="matklName" label="物料组" labelCol="1"/>
+                    <x:inputC name="personMemberName" label="录入人" labelCol="1"/>
+                </div>
+                <div class="hg-form-row">
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期起&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
+                    </div>
+                    <div class="col-xs-4 col-sm-1">
+                        <label class="hg-form-label">录入日期止&nbsp;:</label>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-white-bg">
+                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
+                    </div>
+                </div>
+                <div class="hg-form-row">
+                    <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
                </div>
                <x:searchButtons/>
            </form>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.jsp
@@ -21,7 +21,8 @@
                <x:inputC name="partner" required="false" label="业务伙伴编号" labelCol="1"/>
                <x:inputC name="nameOrg1" required="false" label="组织名称1" labelCol="1"/>
                <x:selectC name="applyType" label="操作类型" labelCol="1" fieldCol="2" dictionary="applyType"/>
-                <x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
+                <x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
+                <%--<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>--%>
                <x:searchButtons/>
            </form>
            <div class="blank_div clearfix"></div>

--- a/topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
 package com.huigou.topsun.sap.nonProdApply.controller;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.huigou.cache.DictUtil;
 import com.huigou.context.Operator;
@@ -199,6 +200,10 @@ public class NonProdApplyController extends CommonController {
        String isDetailPage = sdo.getString("isDetailPage");
        if("true".equals(isDetailPage)) this.putAttribute("isDetailPage","true");
        NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
+        SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(id);
+        if (ObjectUtil.isNotNull(nonProdApplyDept)){
+            nonProdApplyBaseInfo.setMatnr(nonProdApplyDept.getMatnr());
+        }
        nonProdApplyBaseInfo.setApplyType("0");
        if (nonProdApplyBaseInfo.getMaintenanceType().equals("modify")){
            nonProdApplyBaseInfo.setApplyType("1");
@@ -212,7 +217,6 @@ public class NonProdApplyController extends CommonController {
            //String []exdusages=nonProdApplyBaseInfo.getBusinessUsage().split(",");
            //查询扩展前所有的 业务部门
-            SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(id);
            NonProdApplyBaseInfoQueryRequest queryRequest=new NonProdApplyBaseInfoQueryRequest();
            queryRequest.setMatnr(nonProdApplyDept.getMatnr());
            Map exmap=nonProdApplyApplication.slicedNonApplyBaseInfoByMatnr(queryRequest);

--- a/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/query/NonProducePickQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/query/NonProducePickQueryRequest.java
@@ -3,6 +3,9 @@ package com.huigou.topsun.sap.nonProducePick.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
+import javax.persistence.Column;
+import java.util.Date;
 /**
 * @Auther: xin.lu
 * @Date: 2024/03/13/9:48
@@ -11,6 +14,51 @@ import lombok.Data;
 @Data
 public class NonProducePickQueryRequest extends QueryAbstractRequest {
    private String nonProducePickId;
+    /**
+     * 单据编号
+     */
    private String billCode;
+    /**
+     * 领料单号
+     */
    private String message;
+    /**
+     * 成本中心
+     */
+    private String kostlName;
+    /**
+     * 内部订单
+     */
+    private String aufnrName;
+    /**
+     * 录入时间起
+     */
+    protected Date fillinBeginDate;
+    /**
+     * 录入时间止
+     */
+    protected Date fillinEndDate;
+    /**
+     * 录入人
+     */
+    private String personMemberName;
+    /**
+     * 录入人部门
+     */
+    private String deptName;
+    private String statusKind;
+    /**
+     * 物料编码
+     */
+    private String matnr;
+    /**
+     * 物料名称
+     */
+    private String maktx;
 }
--- a/topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/SapPurchaseItem.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/SapPurchaseItem.java
@@ -197,6 +197,12 @@ public class SapPurchaseItem extends AbstractEntity {
    @Column(name = "AFNAM")
    private String afnam;
+    /**
+     * 申请人ID
+     */
+    @Column(name = "AFNAM_ID")
+    private String afnamId;
    /**
     * 评估价格
     */

--- a/topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/query/SapPurchaseQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/query/SapPurchaseQueryRequest.java
@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.purchase.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
+import javax.persistence.Column;
 import java.util.Date;
 /**
@@ -31,4 +32,66 @@ public class SapPurchaseQueryRequest extends QueryAbstractRequest {
    protected Date fillinEndDate;
    private String statusKind;
+    /**
+     * 工厂
+     */
+    private String werks;
+    /**
+     * 工厂名称
+     */
+    private String name1;
+    /**
+     * 库存地点
+     */
+    private String lgort;
+    /**
+     * 库存地点名称
+     */
+    private String lgobe;
+    /**
+     * 物料编号
+     */
+    private String matnr;
+    /**
+     * 短文本
+     */
+    private String txz01;
+    /**
+     * 要求交货日期
+     */
+    private Date lfdatBegin;
+    private Date lfdatEnd;
+    /**
+     * 申请日期
+     */
+    private Date badatBegin;
+    private Date badatEnd;
+    /**
+     * 申请人ID
+     */
+    private String afnamId;
+    /**
+     * 申请人
+     */
+    private String afnam;
+    /**
+     * 申购人部门
+     */
+    private String afnamDeptName;
+    /**
+     * 申购人部门ID
+     */
+    private String afnamDeptId;
 }
--- a/topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/domain/query/SapPurchaseApprovalQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/domain/query/SapPurchaseApprovalQueryRequest.java
@@ -35,4 +35,71 @@ public class SapPurchaseApprovalQueryRequest extends QueryAbstractRequest {
    protected Date fillinEndDate;
    private String statusKind;
+    /**
+     * 工厂
+     */
+    private String werks;
+    /**
+     * 工厂名称
+     */
+    private String name1;
+    /**
+     * 库存地点
+     */
+    private String lgort;
+    /**
+     * 库存地点名称
+     */
+    private String lgobe;
+    /**
+     * 物料编号
+     */
+    private String matnr;
+    /**
+     * 短文本
+     */
+    private String txz01;
+    /**
+     * 要求交货日期
+     */
+    private Date lfdatBegin;
+    private Date lfdatEnd;
+    /**
+     * 申请日期
+     */
+    private Date badatBegin;
+    private Date badatEnd;
+    /**
+     * 申购人ID
+     */
+    private String afnamId;
+    /**
+     * 申购人
+     */
+    private String nameText;
+    /**
+     * 申购人部门
+     */
+    private String afnamDeptName;
+    /**
+     * 申购人部门ID
+     */
+    private String afnamDeptId;
+    /**
+     * 创建人
+     */
+    private String ernam;
 }
--- a/topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordController.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordController.java
@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.purchaseInfoRecord.controller;
 import com.alibaba.fastjson.JSON;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+import com.huigou.topsun.common.BillStatus;
 import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordApplication;
 import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordItemApplication;
 import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecord;
@@ -46,6 +47,7 @@ public class SapPurchaseInfoRecordController extends CommonController {
    private CodeGenerator codeGenerator;
    public String forwardSapPurchaseInfoRecordList(){
+        this.putAttribute("statusKindsList", BillStatus.getValidMap());
        return forward("purchaseInfoRecordList");
    }

--- a/topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/query/SapPurchaseInfoRecordQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/query/SapPurchaseInfoRecordQueryRequest.java
@@ -3,6 +3,8 @@ package com.huigou.topsun.sap.purchaseInfoRecord.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
+import java.util.Date;
 /**
 * @Auther: xin.lu
 * @Date: 2024/02/28/18:08
@@ -16,7 +18,21 @@ public class SapPurchaseInfoRecordQueryRequest extends QueryAbstractRequest {
    private String werks;
    private String lifnr;
+    private String infnr;
    private String matnr;
+    private String maktx;
    private String esokz;
    private String matkl;
+    private String matklName;
+    private String personMemberName;
+    /**
+     * 录入时间起
+     */
+    protected Date fillinBeginDate;
+    /**
+     * 录入时间止
+     */
+    protected Date fillinEndDate;
+    private String statusKind;
 }
--- a/topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/SuppliersDataController.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/SuppliersDataController.java
@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.suppliers.controller;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+import com.huigou.topsun.common.BillStatus;
 import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
 import com.huigou.topsun.sap.suppliers.domain.SuppliersInfo;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersBankQueryRequest;
@@ -43,6 +44,7 @@ public class SuppliersDataController extends CommonController {
    public String forwardSuppliersDataList() {
+        this.putAttribute("statusKindsList", BillStatus.getValidMap());
        return forward("suppliersDataList");
    }

--- a/topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
+++ b/topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
@@ -2,10 +2,52 @@
 <query-mappings>
    <query name="nonProducePick" label="SAP非生产性领料申请与发料过账" table="sap_non_produce_pick">
        <sql-query>
-            select t.* from sap_non_produce_pick t
+            SELECT
+             t.id,
+            t.fillin_date,
+            t.bill_code,
+            t.status,
+            t.full_id,
+            t.organ_id,
+            t.organ_name,
+            t.dept_id,
+            t.dept_name,
+            t.position_id,
+            t.position_name,
+            t.person_member_id,
+            t.person_member_name,
+            t.werks,
+            t.werks_name,
+            t.kostl,
+            t.kostl_name,
+            t.aufnr,
+            t.aufnr_name,
+            t.type,
+            t.message,
+            pi.non_produce_pick_id,
+            pi.rspos,
+            pi.matnr,
+            pi.maktx,
+            pi.lgort,
+            pi.erfmg,
+            pi.meins,
+            pi.wempf,
+            pi.msehl,
+            pi.lgobe,
+            pi.used,
+            pi.remark
+             FROM sap_non_produce_pick t
+             LEFT JOIN sap_non_produce_pick_item pi ON t.id = pi.non_produce_pick_id where 1=1
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
        <condition column="message" name="message" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
+        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
+        <condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="dept_name" name="deptName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="pi"/>
+        <condition column="maktx" name="maktx" type="java.lang.String" symbol="like" alias="pi"/>
+        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
    </query>
    <query name="nonProducePickItems" label="SAP非生产性领料申请与发料过账明细" table="sap_non_produce_pick_item">

--- a/topsun/src/main/resources/config/topsun/sap/sapPurchase/sapPurchase.xml
+++ b/topsun/src/main/resources/config/topsun/sap/sapPurchase/sapPurchase.xml
@@ -2,13 +2,92 @@
 <query-mappings>
    <query name="sapPurchaseList" label="SAP采购申请" table="sap_purchase">
        <sql-query>
-            select t.* from sap_purchase t
+            SELECT
+             t.id,
+            t.fillin_date,
+            t.STATUS,
+            t.full_id,
+            t.organ_id,
+            t.organ_name,
+            t.dept_id,
+            t.dept_name,
+            t.position_id,
+            t.position_name,
+            t.person_member_id,
+            t.person_member_name,
+            t.bill_code,
+            t.bsart,
+            t.banfn,
+            it.sap_purchase_id,
+            it.bnfpo,
+            it.pstyp,
+            it.knttp,
+            it.werks,
+            it.name1,
+            it.lgort,
+            it.lgobe,
+            it.matnr,
+            it.txz01,
+            it.matkl,
+            it.menge,
+            it.meins,
+            it.ekgrp,
+            it.badat,
+            it.erdat,
+            it.frgdt,
+            it.lfdat,
+            it.srvpos,
+            it.ktext1,
+            it.esll_menge,
+            it.esll_meins,
+            it.peinh,
+            it.brtwr,
+            it.netwr,
+            it.ernam,
+            it.afnam,
+            it.preis,
+            it.eban_peinh,
+            it.waers,
+            it.eban_netwr,
+            it.zebkn,
+            it.vrtkz,
+            it.twrkz,
+            it.ekbn_menge,
+            it.sakto,
+            it.kostl,
+            it.aufnr,
+            it.anln1,
+            it.anln2,
+            it.banpr,
+            it.meins_name,
+            it.matkl_name,
+            it.ekgrp_name,
+            it.waers_name,
+            it.kostl_name,
+            it.afnam_id,
+            o.dept_name as afnam_dept_name,
+            o.dept_id as afnam_dept_id
+             FROM sap_purchase t
+             LEFT JOIN sap_purchase_item it ON t.id = it.sap_purchase_id
+             LEFT JOIN sa_oporg o on it.afnam_id = o.id where 1=1
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="it"/>
+        <condition column="lgobe" name="lgobe" type="java.lang.String" symbol="like" alias="it"/>
        <condition column="banfn" name="banfn" type="java.lang.String" symbol="like" alias="t"/>
        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
+        <condition column="badat" name="badatBegin" type="java.util.Date" symbol="&gt;=" alias="it"/>
+        <condition column="badat" name="badatEnd" type="java.util.Date" symbol="&lt;=" alias="it"/>
+        <condition column="lfdat" name="lfdatBegin" type="java.util.Date" symbol="&gt;=" alias="it"/>
+        <condition column="lfdat" name="lfdatEnd" type="java.util.Date" symbol="&lt;=" alias="it"/>
+        <condition column="afnam" name="afnam" type="java.lang.String" symbol="like" alias="it"/>
+        <condition column="lgobe" name="lgobe" type="java.lang.String" symbol="like" alias="it"/>
+        <condition column="lgort" name="lgort" type="java.lang.String" symbol="like" alias="it"/>
+        <condition column="dept_name" name="afnamDeptName" type="java.lang.String" symbol="like" alias="o"/>
+        <condition column="dept_id" name="afnamDeptId" type="java.lang.String" symbol="like" alias="o"/>
    </query>
 </query-mappings>
--- a/topsun/src/main/resources/config/topsun/sap/sapPurchaseApproval/sapPurchaseApproval.xml
+++ b/topsun/src/main/resources/config/topsun/sap/sapPurchaseApproval/sapPurchaseApproval.xml
@@ -2,13 +2,75 @@
 <query-mappings>
    <query name="sapPurchaseApprovalList" label="SAP采购审批" table="sap_purchase_approval">
        <sql-query>
-            select t.* from sap_purchase_approval t where 1=1
+            select
+             t.id,
+            t.fillin_date,
+            t.status,
+            t.full_id,
+            t.organ_id,
+            t.organ_name,
+            t.dept_id,
+            t.dept_name,
+            t.position_id,
+            t.position_name,
+            t.person_member_id,
+            t.person_member_name,
+            t.bill_code,
+            t.banfn,
+            t.bsart,
+            t.batxt,
+            t.type,
+            t.message,
+            ai.sap_purchase_approval_id,
+            ai.bnfpo,
+            ai.pstyp,
+            ai.ptext,
+            ai.knttp,
+            ai.knttx,
+            ai.matnr,
+            ai.txz01,
+            ai.matkl,
+            ai.wgbez,
+            ai.menge,
+            ai.meins,
+            ai.msehl,
+            ai.lfdat,
+            ai.werks,
+            ai.name1,
+            ai.lgort,
+            ai.lgobe,
+            ai.ekgrp,
+            ai.eknam,
+            ai.preis,
+            ai.peinh,
+            ai.waers,
+            ai.rlwrt,
+            ai.badat,
+            ai.ernam,
+            ai.name_text,
+            o.dept_name as afnam_dept_name
+             FROM sap_purchase_approval t
+             LEFT JOIN sap_purchase_approval_item ai ON t.id = ai.sap_purchase_approval_id
+             LEFT JOIN sa_opperson op ON ai.name_text = op.name
+             LEFT JOIN sa_oporg o ON op.id = o.PERSON_ID and op.MAIN_ORG_ID = o.PARENT_ID where 1=1
        </sql-query>
          <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="ai"/>
        <condition column="banfn" name="banfn" type="java.lang.String" symbol="like" alias="t"/>
        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
+        <condition column="badat" name="badatBegin" type="java.util.Date" symbol="&gt;=" alias="ai"/>
+        <condition column="badat" name="badatEnd" type="java.util.Date" symbol="&lt;=" alias="ai"/>
+        <condition column="lfdat" name="lfdatBegin" type="java.util.Date" symbol="&gt;=" alias="ai"/>
+        <condition column="lfdat" name="lfdatEnd" type="java.util.Date" symbol="&lt;=" alias="ai"/>
+        <condition column="name_text" name="nameText" type="java.lang.String" symbol="like" alias="ai"/>
+        <condition column="ernam" name="ernam" type="java.lang.String" symbol="like" alias="ai"/>
+        <condition column="lgobe" name="lgobe" type="java.lang.String" symbol="like" alias="ai"/>
+        <condition column="lgort" name="lgort" type="java.lang.String" symbol="like" alias="ai"/>
+        <condition column="txz01" name="txz01" type="java.lang.String" symbol="like" alias="ai"/>
+        <condition column="dept_name" name="afnamDeptName" type="java.lang.String" symbol="like" alias="o"/>
    </query>
 </query-mappings>
\ No newline at end of file
--- a/topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecord.xml
+++ b/topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecord.xml
@@ -9,10 +9,17 @@
             where 1=1
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
-        <condition column="lifnr" name="lifnr" type="java.lang.String" symbol="=" alias="i"/>
+        <condition column="lifnr" name="lifnr" type="java.lang.String" symbol="like" alias="i"/>
+        <condition column="infnr" name="infnr" type="java.lang.String" symbol="like" alias="i"/>
        <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="i"/>
+        <condition column="maktx" name="maktx" type="java.lang.String" symbol="like" alias="i"/>
        <condition column="esokz" name="esokz" type="java.lang.String" symbol="=" alias="i"/>
        <condition column="werks" name="werks" type="java.lang.String" symbol="=" alias="i"/>
+        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
+        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
+        <condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
+        <condition column="matkl_name" name="matklName" type="java.lang.String" symbol="like" alias="i"/>
    </query>
 </query-mappings>
\ No newline at end of file