diff --git a/WMS-BS/NFine.Application/OMAY/OMAYApp.cs b/WMS-BS/NFine.Application/OMAY/OMAYApp.cs index 61839e1..1c077ae 100644 --- a/WMS-BS/NFine.Application/OMAY/OMAYApp.cs +++ b/WMS-BS/NFine.Application/OMAY/OMAYApp.cs @@ -19,9 +19,9 @@ namespace NFine.Application.OMAY { public DataTable GetYLAndPC(string Type ,string Group, string TimeFrom, string TimeArrive) { - string sql = @"select -isnull( sum( case when c.BusinessCode='13' and SUBSTRING(b.InvCode, 1, 2) IN ('01','04','05') then isnull(c.Quantity,0) else 0 end ),0) as YLTR , -isnull( sum( case when c.BusinessCode='50' and b.EATTRIBUTE1='1' and SUBSTRING(b.InvCode, 1, 2) IN ('05') then isnull(c.Quantity,0) else 0 end) ,0)as PCLRK + string sql = @" select +isnull( sum( case when c.BusinessCode='13' and SUBSTRING(b.InvCode, 1, 2) IN ('01','04','05') then cast(isnull(c.Quantity,0)/1000 as decimal(18,2)) else 0 end ),0) as YLTR , +isnull( sum( case when c.BusinessCode='50' and b.EATTRIBUTE1='1' and SUBSTRING(b.InvCode, 1, 2) IN ('05') then cast( isnull(c.Quantity,0)/1000 as decimal(18,2)) else 0 end) ,0)as PCLRK from dbo.ICSMO a inner join dbo.ICSMOPick b on a.MODetailID=b.MODetailID and a.WorkPoint=b.WorkPoint inner join dbo.ICSWareHouseLotInfoLog c on a.MOCode=c.TransCode and a.Sequence+'~'+b.Sequence=c.TransSequence @@ -43,11 +43,12 @@ isnull( sum( case when c.BusinessCode='50' and b.EATTRIBUTE1='1' and SUBSTRING public DataTable GetCC(string Type, string Group, string TimeFrom, string TimeArrive) { - string sql = @" select isnull( sum(isnull(b.Quantity,0)),0) as CC + string sql = @" select cast( isnull( sum(isnull(b.Quantity,0)),0)/1000 as decimal(18,2)) as CC from dbo.ICSMO a inner join dbo.ICSWareHouseLotInfoLog b on a.MOCode=b.TransCode and a.Sequence=b.TransSequence and b.BusinessCode='17' inner join dbo.ICSDepartment d on a.DepCode=d.DepCode - where d.DepName = '" + Type + "' and b.MUSERName= '" + Type + Group + "' "; + inner join dbo.ICSInventoryLot c on b.LotNo=c.LotNo and a.WorkPoint=c.WorkPoint + where d.DepName = '" + Type + "' and c.MUSERName= '" + Type + Group + "' "; if (!string.IsNullOrWhiteSpace(TimeFrom)) { sql += "and left(b.MTIME,7)>='" + TimeFrom + "'"; diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYKPI/OMAYKPIIndex.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYKPI/OMAYKPIIndex.cshtml index 6e6e283..de87ecc 100644 --- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYKPI/OMAYKPIIndex.cshtml +++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYKPI/OMAYKPIIndex.cshtml @@ -101,13 +101,13 @@ //线别产出 - $("#L1CC").text((L1ACC + L1BCC) === 0 ? '' : (L1ACC + L1BCC)); - $("#L2CC").text((L2ACC + L2BCC) === 0 ? '' : (L2ACC + L2BCC)); - $("#L3CC").text((L3ACC + L3BCC) === 0 ? '' : (L3ACC + L3BCC)); - $("#L4CC").text((L4ACC + L4BCC) === 0 ? '' : (L4ACC + L4BCC)); - $("#L5CC").text((L5ACC + L5BCC) === 0 ? '' : (L5ACC + L5BCC)); - $("#L6CC").text((L6ACC + L6BCC) === 0 ? '' : (L6ACC + L6BCC)); - $("#L7CC").text((L7ACC + L7BCC) === 0 ? '' : (L7ACC + L7BCC)); + $("#L1CC").text((L1ACC + L1BCC) === 0 ? '' : (L1ACC + L1BCC).toFixed(2)); + $("#L2CC").text((L2ACC + L2BCC) === 0 ? '' : (L2ACC + L2BCC).toFixed(2)); + $("#L3CC").text((L3ACC + L3BCC) === 0 ? '' : (L3ACC + L3BCC).toFixed(2)); + $("#L4CC").text((L4ACC + L4BCC) === 0 ? '' : (L4ACC + L4BCC).toFixed(2)); + $("#L5CC").text((L5ACC + L5BCC) === 0 ? '' : (L5ACC + L5BCC).toFixed(2)); + $("#L6CC").text((L6ACC + L6BCC) === 0 ? '' : (L6ACC + L6BCC).toFixed(2)); + $("#L7CC").text((L7ACC + L7BCC) === 0 ? '' : (L7ACC + L7BCC).toFixed(2)); var L1CC = $("#L1CC").text() !== "" ? $("#L1CC").text() * 1 : 0; var L2CC = $("#L2CC").text() !== "" ? $("#L2CC").text() * 1 : 0; @@ -220,12 +220,27 @@ //$("#OldHJCC").text(L1CC + L2CC +L3CC); //$("#OldPCLRK").text(L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK); //$("#OldZB").text(L1ZB + L2ZB + L3ZB); - $("#OldFYLTR").text((L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR) === 0 ? '' : (L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR) ); - $("#OldYFFJ").text((L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ) === 0 ? '' : (L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ) ); - $("#OldCC").text((L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC) === 0 ? '' : (L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC) ); - $("#OldHJCC").text((L1CC + L2CC + L3CC) === 0 ? '' : (L1CC + L2CC + L3CC) ); - $("#OldPCLRK").text((L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK) === 0 ? '' : (L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK)); - $("#OldZB").text((L1ZB + L2ZB + L3ZB) === 0 ? '' : (L1ZB + L2ZB + L3ZB) ); + //$("#OldFYLTR").text((L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR) === 0 ? '' : (L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR) ); + //$("#OldYFFJ").text((L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ) === 0 ? '' : (L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ) ); + //$("#OldCC").text((L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC) === 0 ? '' : (L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC) ); + //$("#OldHJCC").text((L1CC + L2CC + L3CC) === 0 ? '' : (L1CC + L2CC + L3CC) ); + //$("#OldPCLRK").text((L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK) === 0 ? '' : (L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK)); + //$("#OldZB").text((L1ZB + L2ZB + L3ZB) === 0 ? '' : (L1ZB + L2ZB + L3ZB)); + + debugger; + $("#OldFYLTR").text(((L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR) === 0 ? '' : (L1AYLTR + L1BYLTR + L2AYLTR + L2BYLTR + L3AYLTR + L3BYLTR).toFixed(2))); + + $("#OldYFFJ").text(((L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ) === 0 ? '' : (L1AYFFJ + L1BYFFJ + L2AYFFJ + L2BYFFJ + L3AYFFJ + L3BYFFJ).toFixed(2))); + + $("#OldCC").text(((L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC) === 0 ? '' : (L1ACC + L1BCC + L2ACC + L2BCC + L3ACC + L3BCC).toFixed(2))); + + $("#OldHJCC").text(((L1CC + L2CC + L3CC) === 0 ? '' : (L1CC + L2CC + L3CC).toFixed(2))); + + $("#OldPCLRK").text(((L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK) === 0 ? '' : (L1APCLRK + L1BPCLRK + L2APCLRK + L2BPCLRK + L3APCLRK + L3BPCLRK).toFixed(2))); + + $("#OldZB").text(((L1ZB + L2ZB + L3ZB) === 0 ? '' : (L1ZB + L2ZB + L3ZB).toFixed(2))); + + // var OldFYLTR = $("#OldFYLTR").text() * 1; var OldYFFJ = $("#OldYFFJ").text() * 1; var OldCC = $("#OldCC").text() * 1; var OldHJCC = $("#OldHJCC").text() * 1; var OldPCLRK = $("#OldPCLRK").text() * 1; var OldZB = $("#OldZB").text() * 1; var OldFYLTR = $("#OldFYLTR").text() !== "" ? $("#OldFYLTR").text() * 1 : 0; var OldYFFJ = $("#OldYFFJ").text() !== "" ? $("#OldYFFJ").text() * 1 : 0; @@ -269,12 +284,29 @@ //$("#NewHJCC").text(L4CC + L5CC + L6CC + L7CC); //$("#NewPCLRK").text(L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK); //$("#NewZB").text(L4ZB + L5ZB + L6ZB + L7ZB); - $("#NewFYLTR").text((L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR) === 0 ? '' : (L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR)); - $("#NewYFFJ").text((L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ) === 0 ? '' : (L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ)); - $("#NewCC").text((L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC) === 0 ? '' : (L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC)); - $("#NewHJCC").text((L4CC + L5CC + L6CC + L7CC) === 0 ? '' : (L4CC + L5CC + L6CC + L7CC)); - $("#NewPCLRK").text((L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK) === 0 ? '' : (L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK)); - $("#NewZB").text((L4ZB + L5ZB + L6ZB + L7ZB) === 0 ? '' : (L4ZB + L5ZB + L6ZB + L7ZB)); + + //$("#NewFYLTR").text((L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR) === 0 ? '' : (L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR)); + //$("#NewYFFJ").text((L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ) === 0 ? '' : (L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ)); + //$("#NewCC").text((L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC) === 0 ? '' : (L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC)); + //$("#NewHJCC").text((L4CC + L5CC + L6CC + L7CC) === 0 ? '' : (L4CC + L5CC + L6CC + L7CC)); + //$("#NewPCLRK").text((L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK) === 0 ? '' : (L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK)); + //$("#NewZB").text((L4ZB + L5ZB + L6ZB + L7ZB) === 0 ? '' : (L4ZB + L5ZB + L6ZB + L7ZB)); + + $("#NewFYLTR").text(((L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR) === 0 ? '' : (L4AYLTR + L4BYLTR + L5AYLTR + L5BYLTR + L6AYLTR + L6BYLTR + L7AYLTR + L7BYLTR).toFixed(2))); + + $("#NewYFFJ").text(((L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ) === 0 ? '' : (L4AYFFJ + L4BYFFJ + L5AYFFJ + L5BYFFJ + L6AYFFJ + L6BYFFJ + L7AYFFJ + L7BYFFJ).toFixed(2))); + + $("#NewCC").text(((L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC) === 0 ? '' : (L4ACC + L4BCC + L5ACC + L5BCC + L6ACC + L6BCC + L7ACC + L7BCC)).toFixed(2)); + + $("#NewHJCC").text(((L4CC + L5CC + L6CC + L7CC) === 0 ? '' : (L4CC + L5CC + L6CC + L7CC).toFixed(2))); + + $("#NewPCLRK").text(((L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK) === 0 ? '' : (L4APCLRK + L4BPCLRK + L5APCLRK + L5BPCLRK + L6APCLRK + L6BPCLRK + L7APCLRK + L7BPCLRK).toFixed(2))); + + $("#NewZB").text(((L4ZB + L5ZB + L6ZB + L7ZB) === 0 ? '' : (L4ZB + L5ZB + L6ZB + L7ZB).toFixed(2))); + + + + // var NewFYLTR = $("#NewFYLTR").text() * 1; var NewYFFJ = $("#NewYFFJ").text() * 1; var NewCC = $("#NewCC").text() * 1; var NewHJCC = $("#NewHJCC").text() * 1; var NewPCLRK = $("#NewPCLRK").text() * 1; var NewZB = $("#NewZB").text() * 1; var NewFYLTR = ($("#NewFYLTR").text() !== "") ? $("#NewFYLTR").text() * 1 : 0; var NewYFFJ = ($("#NewYFFJ").text() !== "") ? $("#NewYFFJ").text() * 1 : 0; @@ -323,12 +355,27 @@ //$("#OldNewXBHYL").text(Converts(((OldNewCC + OldNewPCLRK) / (OldNewFYLTR + OldNewYFFJ)) * 100).toFixed(2) + '%'); //$("#OldNewBZDCL").text(Converts(((OldNewCC) / (OldNewZB)) * 100).toFixed(2) + '%'); //$("#OldNewCLDBL").text(Converts(((OldNewCC) / (OldNewZB)) * 100).toFixed(2) + '%'); - $("#OldNewFYLTR").text((OldFYLTR + NewFYLTR) === 0 ? '' : (OldFYLTR + NewFYLTR)); - $("#OldNewYFFJ").text((OldYFFJ + NewYFFJ) === 0 ? '' : (OldYFFJ + NewYFFJ)); - $("#OldNewCC").text((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC)); - $("#OldNewHJCC").text((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC)); - $("#OldNewPCLRK").text((OldPCLRK + NewPCLRK) === 0 ? '' : (OldPCLRK + NewPCLRK)); - $("#OldNewZB").text((OldZB + NewZB) === 0 ? '' : (OldZB + NewZB)); + + + //$("#OldNewFYLTR").text((OldFYLTR + NewFYLTR) === 0 ? '' : (OldFYLTR + NewFYLTR)); + //$("#OldNewYFFJ").text((OldYFFJ + NewYFFJ) === 0 ? '' : (OldYFFJ + NewYFFJ)); + //$("#OldNewCC").text((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC)); + //$("#OldNewHJCC").text((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC)); + //$("#OldNewPCLRK").text((OldPCLRK + NewPCLRK) === 0 ? '' : (OldPCLRK + NewPCLRK)); + //$("#OldNewZB").text((OldZB + NewZB) === 0 ? '' : (OldZB + NewZB)); + + + $("#OldNewFYLTR").text(((OldFYLTR + NewFYLTR) === 0 ? '' : (OldFYLTR + NewFYLTR).toFixed(2))); + + $("#OldNewYFFJ").text(((OldYFFJ + NewYFFJ) === 0 ? '' : (OldYFFJ + NewYFFJ).toFixed(2))); + + $("#OldNewCC").text(((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC).toFixed(2))); + + $("#OldNewHJCC").text(((OldCC + NewCC) === 0 ? '' : (OldCC + NewCC).toFixed(2))); + + $("#OldNewPCLRK").text(((OldPCLRK + NewPCLRK) === 0 ? '' : (OldPCLRK + NewPCLRK).toFixed(2))); + + $("#OldNewZB").text(((OldZB + NewZB) === 0 ? '' : (OldZB + NewZB).toFixed(2))); //$("#OldNewCXL").text(Converts((OldNewCC / (OldNewFYLTR + OldNewYFFJ)) * 100).toFixed(2) + '%');