2023-02-20 001 焊接修改
This commit is contained in:
@@ -108,23 +108,57 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static DataTable GetSHOPStockDt( string projectid)
|
||||
{
|
||||
string strSql = @" select
|
||||
mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
|
||||
from HJGL_MaterialManage mat
|
||||
left join HJGL_MaterialCodeLib lib on mat.MaterialCode=lib.MaterialCode
|
||||
left join (SELECT lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
|
||||
lib.MaterialSpec,lib.MaterialMade,-sum( pipe.Number) as num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.PipeArea=@PipeArea and line.State=1
|
||||
group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa on mat.MaterialCode=aa.MaterialCode
|
||||
where mat.projectid=@projectid
|
||||
group by mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
|
||||
string strSql = @" SELECT mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,
|
||||
0) AS MaterialNum
|
||||
FROM HJGL_MaterialManage mat
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON mat.MaterialCode=lib.MaterialCode
|
||||
LEFT JOIN
|
||||
(SELECT stockused.MaterialCode,
|
||||
stockused.MaterialName,
|
||||
stockused.MaterialUnit,
|
||||
stockused.MaterialSpec,
|
||||
stockused.MaterialMade,
|
||||
-sum( stockused.num) AS num
|
||||
FROM
|
||||
(SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint
|
||||
ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
WHERE comjoint.State=1
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade
|
||||
UNION
|
||||
SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line
|
||||
ON pipe.PipelineId=line.PipelineId
|
||||
LEFT JOIN View_HJGL_WeldJoint weldjoint
|
||||
ON weldjoint.PipelineId=line.PipelineId
|
||||
WHERE weldjoint.JointAttribute='安装口'
|
||||
AND weldjoint .WeldingDailyId !=''
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade ) AS stockused
|
||||
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
|
||||
ON mat.MaterialCode=aa.MaterialCode
|
||||
WHERE mat.projectid=@projectid
|
||||
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
|
||||
|
||||
";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
@@ -136,26 +170,61 @@ namespace BLL
|
||||
}
|
||||
public static DataTable GetFIELDStockDt(string projectid)
|
||||
{
|
||||
string strSql = @" select
|
||||
mat.MaterialCode,
|
||||
string strSql = @"
|
||||
SELECT mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,
|
||||
0) AS MaterialNum
|
||||
FROM Material_Material mat
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON mat.MaterialCode=lib.MaterialCode
|
||||
LEFT JOIN Material_Inspection Ins
|
||||
ON mat.InspectionId=Ins.InspectionId
|
||||
LEFT JOIN
|
||||
(SELECT stockused.MaterialCode,
|
||||
stockused.MaterialName,
|
||||
stockused.MaterialUnit,
|
||||
stockused.MaterialSpec,
|
||||
stockused.MaterialMade,
|
||||
-sum( stockused.num) AS num
|
||||
FROM
|
||||
(SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
|
||||
from Material_Material mat
|
||||
left join HJGL_MaterialCodeLib lib on mat.MaterialCode=lib.MaterialCode
|
||||
left join Material_Inspection Ins on mat.InspectionId=Ins.InspectionId
|
||||
left join (SELECT lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
|
||||
lib.MaterialSpec,lib.MaterialMade,-sum( pipe.Number) as num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.PipeArea=@PipeArea
|
||||
group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa on mat.MaterialCode=aa.MaterialCode
|
||||
where mat.projectid=@Projectid and Ins.State=@State
|
||||
group by mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
|
||||
|
||||
";
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint
|
||||
ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
WHERE comjoint.State=1
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade
|
||||
UNION
|
||||
SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line
|
||||
ON pipe.PipelineId=line.PipelineId
|
||||
LEFT JOIN View_HJGL_WeldJoint weldjoint
|
||||
ON weldjoint.PipelineId=line.PipelineId
|
||||
WHERE weldjoint.JointAttribute='安装口'
|
||||
AND weldjoint .WeldingDailyId !=''
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade ) AS stockused
|
||||
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
|
||||
ON mat.MaterialCode=aa.MaterialCode
|
||||
WHERE mat.projectid=@Projectid
|
||||
AND Ins.State=@State
|
||||
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@Projectid", projectid));
|
||||
listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP));
|
||||
@@ -284,12 +353,13 @@ namespace BLL
|
||||
if ((decimal)item.Number > StockNum) //实际大于库存
|
||||
{
|
||||
state = false; //库存不足
|
||||
return state;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -297,14 +367,14 @@ namespace BLL
|
||||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user