diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml index 5ab5d48..601a03f 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml @@ -11,6 +11,7 @@ var mark = ''; var Arguments = ''; $(function () { + SetCols(); gridList(); gridList2(flag); @@ -19,7 +20,7 @@ debugger; SetCols(); - gridList(); + //gridList(); }); }); @@ -327,8 +328,8 @@ { label: '单据行号', name: 'Sequence', width: 120, align: 'left' }, { label: '操作日期', name: 'MTIME', width: 120, align: 'left' }, { label: '料品编码', name: 'InvCode', width: 120, align: 'left' }, - { label: '物料描述', name: 'InvDescribe', width: 120, align: 'left' }, - { label: '辅助描述', name: 'InvDesc', width: 120, align: 'left' }, + { label: '物料描述', name: 'InvName', width: 120, align: 'left' }, + { label: '辅助描述', name: 'InvDes', width: 120, align: 'left' }, { label: '规格型号', name: 'InvStd', width: 120, align: 'left' }, { label: '批次', name: 'BatchCode', width: 100, align: 'left' }, { label: '区域', name: 'Area', width: 100, align: 'left' },