自定义列

37c4cac0 · 鲁鑫 · d542d861 · 37c4cac0 · 37c4cac0 · 37c4cac0
Commit 37c4cac0 authored Sep 12, 2024 by 鲁鑫
26 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelDetail.js
@@ -72,6 +72,8 @@ function loadGrid() {
            }
        ],
        dataAction: "server",
+        _tableKey: 'epSaleOrderCancelItem',
+        _local: true,
        url: web_app.name + '/epSaleOrderCancelItem/queryEpSaleOrderCancelItems.ajax',
        pageSize: 10,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelList.js
@@ -16,6 +16,30 @@ function loadGrid() {
        columns: [
            {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
+            {
+                display: "销售单号", name: "vbeln", width: 200, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "项次", name: "posnr", width: 140, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "物料编号", name: "matnr", width: 140, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "数量", name: "kwmeng", width: 140, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "单位", name: "vrkme", width: 140, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "生产单号", name: "produceCode", width: 140, minWidth: 60, type: "string", align: "left",
+            },
+            {
+                display: "工序", name: "process", width: 140, 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"},
            {display: "客户编码", name: "customerCode", width: 200, minWidth: 60, type: "string", align: "left"},
@@ -26,7 +50,7 @@ function loadGrid() {
            {display: "状态码", name: "code", width: 100, minWidth: 60, type: "string", align: "left"},
            {display: "消息", name: "msg", width: 200, minWidth: 60, type: "string", align: "left"},
        ],
-        _tableKey: 'epSaleOrderCancel',
+        _tableKey: 'epSaleOrderCancelList',
        _local: true,
        dataAction: "server",
        url: web_app.name + '/epSaleOrderCancel/slicedEpSaleOrderCancelList.ajax',

--- a/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderDetail.js
@@ -123,6 +123,8 @@ function loadGrid() {

        ],
        dataAction: "server",
+        _tableKey: 'epSaleOrder',
+        _local: true,
        url: web_app.name + '/epSaleOrderItem/queryEpSaleOrderItems.ajax',
        pageSize: 10,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderList.js
@@ -11,6 +11,54 @@ function initUI() {
 var defaultcols = [
    {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
    {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
+    {
+        display: "订单原因（业务交易原因）", name: "augru", width: 200, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "订单编号", name: "vbeln", width: 200, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "订单总金额", name: "netwr", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "客户采购单号", name: "bstnk", width: 200, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "销售凭证项目", name: "posnr", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "物料编号", name: "matnr", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "订单数量", name: "kwmeng", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "销售单位", name: "vrkme", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "价格", name: "vaKbetr", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "工厂", name: "werks", width: 200, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "指令号", name: "zinstnum", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "型体号", name: "zmold", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "配色号", name: "zmapcolor", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "品牌", name: "mvgr1", width: 140, minWidth: 60, type: "string", align: "left",
+    },
+    {
+        display: "物料组", name: "matkl", width: 140, 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"},
    {display: "联系电话长号", name: "telPhoneLong", width: 200, minWidth: 60, type: "string", align: "left"},
@@ -27,7 +75,7 @@ function loadGrid() {
    });
    gridManager = UICtrl.grid("#maingrid", {
        columns: defaultcols,
-        _tableKey: 'epSaleOrder',
+        _tableKey: 'epSaleOrderList',
        _local: true,
        dataAction: "server",
        url: web_app.name + '/epSaleOrder/slicedEpSaleOrderList.ajax',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.js
@@ -199,6 +199,8 @@ function loadFinaCustomerPayListGrid() {
            },
        ],
        dataAction: "server",
+        _tableKey: 'finaCustomerPay',
+        _local: true,
        url: web_app.name + '/finaCustomer/slicedFinaCustomerPayData.ajax',
        parms: {sId: getsId},
        pageSize: 20,
@@ -311,6 +313,8 @@ function loadFinaCustomerBankListGrid() {
             },
        ],
        dataAction: "server",
+        _tableKey: 'finaCustomerBank',
+        _local: true,
        url: web_app.name + '/finaCustomer/slicedFinaCustomerBankData.ajax',
        parms: {sId: getsId},
        pageSize: 20,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerExtendDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerExtendDetail.js
@@ -182,6 +182,8 @@ function loadFinaCustomerPayListGrid() {
            },
        ],
        dataAction: "server",
+        _tableKey: 'finaCustomerPay',
+        _local: true,
        url: web_app.name + '/finaCustomer/slicedFinaCustomerPayData.ajax',
        parms: {sId: getsId},
        pageSize: 20,
@@ -304,6 +306,8 @@ function loadFinaCustomerBankListGrid() {
             }
        ],
        dataAction: "server",
+        _tableKey: 'finaCustomerBank',
+        _local: true,
        url: web_app.name + '/finaCustomer/slicedFinaCustomerBankData.ajax',
        parms: {sId: getsId},
        pageSize: 20,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerList.js
@@ -44,6 +44,8 @@ function loadSuppliersDataListGrid() {

        ],
        dataAction: "server",
+        _tableKey: 'finaCustomer',
+        _local: true,
        url: web_app.name + '/finaCustomer/slicedFinaCustomerList.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.js
@@ -49,6 +49,8 @@ function loadCostCenterListGrid() {
            {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
        ],
        dataAction: "server",
+        _tableKey: 'nonOrderStorage',
+        _local: true,
        url: web_app.name + '/nonOrderStorage/slicedNonOrderStorageList.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
@@ -143,6 +143,8 @@ function loadNonProdApplyListGrid() {
            },*/
        ],
        dataAction: "server",
+        _tableKey: 'sapNonProdApply',
+        _local: true,
        url: web_app.name + '/sapNonProdApply/slicedNonProdApplyList.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js
@@ -71,6 +71,8 @@ function loadOrderItemGrid() {
    orderItemGridManager = UICtrl.grid("#orderItemGrid", {
        columns: getOrderColumns(),
        dataAction: "server",
+        _tableKey: 'processOutsourceItem',
+        _local: true,
        url: web_app.name + '/processOutsource/queryProcessOutsourceOrderItems.ajax',
        parms: {processOutsourceId: getId()},
        pageSize: 20,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js
@@ -40,6 +40,8 @@ function loadProcessOutsourceOrderListGrid() {

        ],
        dataAction: "server",
+        _tableKey: 'processOutsource',
+        _local: true,
        url: web_app.name + '/processOutsource/slicedProcessOutsourceList.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyDetail.js
@@ -16,6 +16,8 @@ function initItemGrid() {
        itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'productScrapApplyItem',
+            _local: true,
            url: web_app.name + '/productScrapApply/queryProductScrapApplyItems.ajax',
            parms:{productScrapApplyId:getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyList.js
@@ -41,6 +41,8 @@ function initPurchaseListGrid() {
                , {display: "SAP创建日期", name: "zdat", width: 140, minWidth: 60, type: "date", align: "center"}
            ],
            dataAction: 'server',
+            _tableKey: 'productScrapApply',
+            _local: true,
            url: web_app.name + '/productScrapApply/slicedProductScrapApplyList.ajax?',
            //parms: {requireItemId: $("#prepareItemId").val()},
            toolbar: toolbarOptions,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
@@ -114,6 +114,8 @@ function initItemGrid() {
    itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'sapPurchaseItemZFW',
+            _local: true,
            url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax',
            parms: {sapPurchaseId: getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
@@ -72,6 +72,8 @@ function initItemGrid() {
    itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+        _tableKey: 'sapPurchaseItemZNE1',
+        _local: true,
            url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax',
            parms: {sapPurchaseId: getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE2PurchaseDetail.js
@@ -128,6 +128,8 @@ function initItemGrid() {
    itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+        _tableKey: 'sapPurchaseItemZNE2',
+        _local: true,
            url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax',
            parms: {sapPurchaseId: getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js
@@ -30,6 +30,8 @@ function initItemGrid() {
        itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'sapPurchaseApprovalItem',
+            _local: true,
            url: web_app.name + '/sapPurchaseApprovalItem/querySapPurchaseApprovalItems.ajax',
            parms:{sapPurchaseApprovalId:getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
@@ -52,6 +52,8 @@ function initItemGrid() {
        itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'sapPurchaseInfoRecordItem',
+            _local: true,
            url: web_app.name + '/sapPurchaseInfoRecordItem/querySapPurchaseInfoRecordItems.ajax',
            parms:{sapPurchaseInfoRecordId:getId(),ids:$("#ids").val()},
            height: '94%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
@@ -99,6 +99,8 @@ function initPurchaseListGrid() {
                {display: "申请日期", name: "fillinDate", width: 150, minWidth: 60, type: "date", align: "center"}
            ],
            dataAction: 'server',
+        _tableKey: 'sapPurchaseInfoRecord',
+        _local: true,
            url: web_app.name + '/sapPurchaseInfoRecord/slicedSapPurchaseInfoRecordList.ajax?',
            //parms: {requireItemId: $("#prepareItemId").val()},
            toolbar: toolbarOptions,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
@@ -13,6 +13,8 @@ function initItemGrid() {
    itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'sapPurchaseOrder',
+            _local: true,
            url: web_app.name + '/sapPurchaseOrder/querySapPurchaseOrderItems.ajax',
            parms: {sapPurchaseOrderId: getId()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
@@ -112,6 +112,8 @@ function initItemGrid() {
        itemGridManager = UICtrl.grid('#maingrid', {
            columns: getGridColumns(),
            dataAction: 'server',
+            _tableKey: 'sapQualityInfoRecordItem',
+            _local: true,
            url: web_app.name + '/sapQualityInfoRecordItem/querySapQualityInfoRecordItems.ajax',
            parms:{sapQualityInfoRecordId:Public.isNotBlank(getId())?getId():$("#tempId").val()},
            height: '95%',

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordList.js
@@ -104,6 +104,8 @@ function initQualityListGrid() {

            ],
            dataAction: 'server',
+            _tableKey: 'sapQualityInfoRecord',
+            _local: true,
            url: web_app.name + '/sapQualityInfoRecord/slicedSapQualityInfoRecordList.ajax?',
            //parms: {requireItemId: $("#prepareItemId").val()},
            toolbar: toolbarOptions,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrderList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/salesOrder/salesOrderList.js
@@ -38,6 +38,8 @@ function loadSalesOrderListGrid() {
            {display: "审核人", name: "salesOrderReviewer", width: 120, minWidth: 60, type: "string", align: "left"},
        ],
        dataAction: "server",
+        _tableKey: 'customer',
+        _local: true,
        url: web_app.name + '/customer/findCustomer.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.js
@@ -73,6 +73,8 @@ function loadSuppliersDataListGrid() {

        ],
        dataAction: "server",
+        _tableKey: 'sapSuppliersData',
+        _local: true,
        url: web_app.name + '/sapSuppliersData/slicedSuppliersDataList.ajax',
        pageSize: 20,
        usePager: true,

--- a/topsun/src/main/resources/config/topsun/ep/epSaleOrder/epSaleOrder.xml
+++ b/topsun/src/main/resources/config/topsun/ep/epSaleOrder/epSaleOrder.xml
@@ -2,7 +2,24 @@
 <query-mappings>
    <query name="epSaleOrder" label="EP销售订单" table="ep_sale_order">
        <sql-query>
-            select t.* from ep_sale_order t
+            select t.*,
+            oi.AUGRU,
+            oi.VBELN,
+            oi.NETWR,
+            oi.BSTNK,
+            oi.POSNR,
+            oi.MATNR,
+            oi.MAKTX,
+            oi.KWMENG,
+            oi.VRKME,
+            oi.VA_KBETR,
+            oi.WERKS,
+            oi.ZINSTNUM,
+            oi.ZMOLD,
+            oi.ZMAPCOLOR,
+            oi.MVGR1,
+            oi.MATKL,
+            oi.amount from ep_sale_order t left join ep_sale_order_item oi on oi.ep_sale_order_id = t.id where 1=1
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
        <condition column="kunnr" name="kunnr" type="java.lang.String" symbol="like" alias="t"/>

--- a/topsun/src/main/resources/config/topsun/ep/epSaleOrder/epSaleOrderCancel.xml
+++ b/topsun/src/main/resources/config/topsun/ep/epSaleOrder/epSaleOrderCancel.xml
@@ -2,7 +2,15 @@
 <query-mappings>
    <query name="epSaleOrderCancel" label="EP销售订单取消/变更" table="ep_sale_order_cancel">
        <sql-query>
-            select t.* from ep_sale_order_cancel t
+            select t.*,
+            ci.VBELN,
+            ci.POSNR,
+            ci.MATNR,
+            ci.MAKTX,
+            ci.KWMENG,
+            ci.VRKME,
+            ci.PRODUCE_CODE,
+            ci.PROCESS from ep_sale_order_cancel t left join ep_sale_order_cancel_item ci on ci.ep_sale_order_cancel_id = t.id where 1=1
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
    </query>