This commit is contained in:
parent
d024dfdf9b
commit
28e4f5ebfa
|
@ -65,8 +65,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
||||||
(CASE WHEN UsingPlan.InPutMan IS NOT NULL THEN (CASE WHEN userInput.UserName IS NOT NULL THEN userInput.UserName ELSE welderInput.WED_Name END)
|
(CASE WHEN UsingPlan.InPutMan IS NOT NULL THEN (CASE WHEN userInput.UserName IS NOT NULL THEN userInput.UserName ELSE welderInput.WED_Name END)
|
||||||
ELSE '' END) AS InPutMan,
|
ELSE '' END) AS InPutMan,
|
||||||
--man.UserName AS InPutMan,
|
--man.UserName AS InPutMan,
|
||||||
((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)-
|
((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)+
|
||||||
(SELECT ISNULL(SUM(ISNULL(re.RecycleAmount,0)),0) FROM dbo.Weld_RecycleMat re WHERE re.UsingPlanId=UsingPlan.UsingPlanId))
|
(SELECT ISNULL(SUM(ISNULL(us.TwoAmount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId))
|
||||||
AS UsedAmount,(CASE UsingPlan.IsFinish WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE NULL END) AS IsFinish
|
AS UsedAmount,(CASE UsingPlan.IsFinish WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE NULL END) AS IsFinish
|
||||||
FROM dbo.Weld_UsingPlan AS UsingPlan
|
FROM dbo.Weld_UsingPlan AS UsingPlan
|
||||||
LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId
|
LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId
|
||||||
|
|
Loading…
Reference in New Issue