|
|
|
@ -7166,11 +7166,18 @@ namespace SlabHandle
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).Count() > 0)
|
|
|
|
|
{
|
|
|
|
|
//同一个分组
|
|
|
|
|
int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK
|
|
|
|
|
&& p.CLASS_FL.Contains(glCpNiscoChmcSl.Where(e => e.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& e.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& e.ZZ_PLT == "C3"
|
|
|
|
|
&& e.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& e.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().CLASS_FL)
|
|
|
|
|
).FirstOrDefault().STL_SEQ;
|
|
|
|
|
TSS.SORT = intSort;
|
|
|
|
|
//替代工艺
|
|
|
|
|
if (ChkDiffStdl(TSCopy, TPF.Order))
|
|
|
|
@ -8748,11 +8755,25 @@ namespace SlabHandle
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).Count() > 0)
|
|
|
|
|
{
|
|
|
|
|
//int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
// && p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
// && p.ZZ_PLT == "C3"
|
|
|
|
|
// && p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
// && p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
//同一个分组
|
|
|
|
|
int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK
|
|
|
|
|
&& p.CLASS_FL.Contains(glCpNiscoChmcSl.Where(e => e.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& e.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& e.ZZ_PLT == "C3"
|
|
|
|
|
&& e.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& e.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().CLASS_FL)
|
|
|
|
|
).FirstOrDefault().STL_SEQ;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TSS.SORT = intSort;
|
|
|
|
|
//替代工艺
|
|
|
|
|
if (ChkDiffStdl(TSCopy, TPF.Order))
|
|
|
|
@ -9835,11 +9856,23 @@ namespace SlabHandle
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).Count() > 0)
|
|
|
|
|
{
|
|
|
|
|
//int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
// && p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
// && p.ZZ_PLT == "C3"
|
|
|
|
|
// && p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
// && p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
//同一个分组
|
|
|
|
|
int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK
|
|
|
|
|
&& p.CLASS_FL.Contains(glCpNiscoChmcSl.Where(e => e.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& e.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& e.ZZ_PLT == "C3"
|
|
|
|
|
&& e.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& e.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().CLASS_FL)
|
|
|
|
|
).FirstOrDefault().STL_SEQ;
|
|
|
|
|
TSS.SORT = intSort;
|
|
|
|
|
//替代工艺
|
|
|
|
|
if (ChkDiffStdl(TSCopy, TPF.Order))
|
|
|
|
@ -11019,11 +11052,23 @@ namespace SlabHandle
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).Count() > 0)
|
|
|
|
|
{
|
|
|
|
|
//int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
// && p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
// && p.ZZ_PLT == "C3"
|
|
|
|
|
// && p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
// && p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
//同一个分组
|
|
|
|
|
int intSort = glCpNiscoChmcSl.Where(p => p.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& p.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().STL_SEQ;
|
|
|
|
|
&& p.THK_MAX >= TPF.Order.ORD_THK
|
|
|
|
|
&& p.CLASS_FL.Contains(glCpNiscoChmcSl.Where(e => e.STLGRD == TSCopy.STLGRD
|
|
|
|
|
&& e.STDSPEC == TPF.Order.STDSPEC
|
|
|
|
|
&& e.ZZ_PLT == "C3"
|
|
|
|
|
&& e.THK_MIN <= TPF.Order.ORD_THK
|
|
|
|
|
&& e.THK_MAX >= TPF.Order.ORD_THK).FirstOrDefault().CLASS_FL)
|
|
|
|
|
).FirstOrDefault().STL_SEQ;
|
|
|
|
|
TSS.SORT = intSort;
|
|
|
|
|
//替代工艺
|
|
|
|
|
if (ChkDiffStdl(TSCopy, TPF.Order))
|
|
|
|
@ -14955,6 +15000,25 @@ namespace SlabHandle
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//获取分类
|
|
|
|
|
string strClass = glCpNiscoChmcSl.Where(p => p.STLGRD == tSlab.STLGRD
|
|
|
|
|
&& p.STDSPEC == strSTD1
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= decThk
|
|
|
|
|
&& p.THK_MAX >= decThk).FirstOrDefault().CLASS_FL;
|
|
|
|
|
|
|
|
|
|
//一坯多标准要在同一个分类中
|
|
|
|
|
if (glCpNiscoChmcSl.Where(p => p.STLGRD == tSlab.STLGRD
|
|
|
|
|
&& p.STDSPEC == strSTD2
|
|
|
|
|
&& p.ZZ_PLT == "C3"
|
|
|
|
|
&& p.THK_MIN <= decThk
|
|
|
|
|
&& p.THK_MAX >= decThk
|
|
|
|
|
&& p.CLASS_FL.Contains(strClass)).Count()<0)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|