diff --git a/SRM/NFine.Application/SRM/InvoiceManageApp.cs b/SRM/NFine.Application/SRM/InvoiceManageApp.cs index 6dc27e9..b1d903e 100644 --- a/SRM/NFine.Application/SRM/InvoiceManageApp.cs +++ b/SRM/NFine.Application/SRM/InvoiceManageApp.cs @@ -241,15 +241,16 @@ namespace NFine.Application //LEFT JOIN ICSINVENTORY j ON f.invcode=j.invCode AND j.WorkPoint=f.WorkPoint // WHERE a.DocNo = '{0}' AND a.WorkPoint = '{1}' "; - string sql = @"SELECT DISTINCT a.ID,a.InvCode,j.InvName,a.Qty,j.InvUnit AS InvUom,j.InvStd, + string sql = @"SELECT DISTINCT a.ID,a.InvCode,j.InvName,a.Qty,--j.InvUnit AS InvUom, +a.InvUom,j.invstd, CAST(a.TaxPriceSell AS DECIMAL(18,2)) AS Price,CAST(g.ioriSum AS DECIMAL(18,2)) AS Total, - a.Src_CADocNo AS CACOde,f.POCode,ISNULL(g.iOriMoney,0) AS iOriMoney,ISNULL(g.iOriTaxPrice,0) AS iOriTaxPrice + a.Src_CADocNo AS CACOde,e.POCode,ISNULL(g.iOriMoney,0) AS iOriMoney,ISNULL(g.iOriTaxPrice,0) AS iOriTaxPrice FROM ICSInvoiceNewDetail a left join ICSCANew c on a.Src_CADocNo=c.DocNo and a.WorkPoint=c.WorkPoint LEFT JOIN ICSCANewdetail e ON c.DocNo=e.DocNo AND a.Src_CADocLineNo=e.DocLineNo AND a.InvCode=e.InvCode LEFT JOIN " + Views + @" g ON e.EATTRIBUTE1=g.AutoID LEFT JOIN dbo.ICSPurchaseOrder f ON e.POCode=f.POCode AND e.porow=f.Sequence and e.WorkPoint=f.WorkPoint and e.InvCode=f.InvCode - LEFT JOIN ICSINVENTORY j ON f.invcode=j.invCode AND j.WorkPoint=f.WorkPoint + LEFT JOIN ICSINVENTORY j ON a.invcode=j.invCode AND j.WorkPoint=a.WorkPoint WHERE a.DocNo = '{0}' AND a.WorkPoint = '{1}' "; sql = string.Format(sql, ID, WorkPoint, DBLANK); return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam); diff --git a/SRM/NFine.Web/Areas/SRM/Views/InvoiceManageAdmin/Index.cshtml b/SRM/NFine.Web/Areas/SRM/Views/InvoiceManageAdmin/Index.cshtml index 8b61f4e..3a9e502 100644 --- a/SRM/NFine.Web/Areas/SRM/Views/InvoiceManageAdmin/Index.cshtml +++ b/SRM/NFine.Web/Areas/SRM/Views/InvoiceManageAdmin/Index.cshtml @@ -149,9 +149,9 @@ { label: "主键", name: "ID", hidden: true, key: true }, { label: '物料编码', name: 'InvCode', width: 100, align: 'left' }, { label: '物料名称', name: 'InvName', width: 120, align: 'left' }, - { label: '规格型号', name: 'InvStd', width: 120, align: 'left' }, + { label: "单位", name: "InvUom", width: 40, align: 'left' }, - + { label: '规格型号', name: 'invstd', width: 120, align: 'left' }, { label: '对账单号', name: 'CACOde', width: 120, align: 'left' }, //{ label: '送货单号', name: 'DNCOde', width: 120, align: 'left' }, { label: '采购单号', name: 'POCode', width: 120, align: 'left' },