wangwei/N_XLXSBJ----MX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加因子，特性加点增加主芯截面

Browse Source
This commit is contained in:
wangwei
2026-09-03 11:44:53 +08:00
parent f85e5baa8d
commit 5ef31cf4c2
47 changed files with 2736 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XLJGB_CLJGTZList.aspx.cs
+35 -7
View File
@@ -3413,14 +3413,24 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into XLXSJGBMX tar ");
SQL.Add(" using ( ");
SQL.Add("select JGBID,XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
string sYZZFields_1 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_1 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add("select JGBID,XH," + sYZZFields_1 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
SQL.Add(",JSYCBZ");
//if (dicJGBFGQCPYZ.Count > 0)
// SQL.Add(",JGBTJYZYCBZ");
SQL.Add(" from ");
SQL.Add("(");
SQL.Add(" select XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
string sYZZFields_2 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_2 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add(" select XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH," + sYZZFields_2 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
{
SQL.Add(" , case ");
@@ -5135,7 +5145,11 @@ namespace GThinking.N_XLXSBJ
SQL.Add(string.Format(",SUM(XLXSJGBYZZC_YZZ) as YZZ{0},:pTIMESTAMP,:pWHR,:pWHRID,:pWHSJ", sTJYZ[i].Trim().Replace("JZ", "")));
SQL.Add(" from XLXSJGBMX ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
SQL.Add("left join XLXHB on XLXHB_XLXHID=XLXSJGBMX_XLXHID ");
SQL.Add("left join XLXSBJXLGGTHB XLXSBJXLGGTHB_JGB10 on XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGID=XLXSJGBMX_XLGGID ");
SQL.Add("left join XLGGB on XLGGB_XLGGID = isnull(XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGIDCH,' ') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
SQL.Add("left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID and CONVERT(float,XLXSBJCPYS_XLYSID)=XLDTJMZHB_DTJM1 ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");
@@ -6248,20 +6262,30 @@ namespace GThinking.N_XLXSBJ
*/
Dictionary<string, string> dicJGBTJYZ = XLBJDInfo.GetJGBBTYZ(sJGBID);
Dictionary<string, string> dicJGBFGQCPYZ = XLBJDInfo.GetJGBFGQCPYZ(sJGBID);
SQL.Clear();
SQL.Add(" merge into XLXSJGBMX tar ");
SQL.Add(" using ( ");
SQL.Add("select XLXSCLQD_CLZL,JGBID,XH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ");
string sYZZFields_3 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_3 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add("select XLXSCLQD_CLZL,JGBID,XH," + sYZZFields_3 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
SQL.Add(",JSYCBZ");
//if (dicJGBFGQCPYZ.Count > 0)
// SQL.Add(",JGBTJYZYCBZ");
SQL.Add(" from ");
SQL.Add("(");
SQL.Add(" select isnull(XLXSCLQD_CLZL,0) as XLXSCLQD_CLZL,XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH ,");
string sYZZFields_4 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_4 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add(" select isnull(XLXSCLQD_CLZL,0) as XLXSCLQD_CLZL,XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH," + sYZZFields_4 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
{
SQL.Add("case ");
@@ -8671,7 +8695,11 @@ namespace GThinking.N_XLXSBJ
SQL.Add(string.Format(",SUM(XLXSJGBYZZC_YZZ) as YZZ{0},:pTIMESTAMP,:pWHR,:pWHRID,:pWHSJ", sTJYZ[i].Trim().Replace("JZ", "")));
SQL.Add(" from XLXSJGBMX ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
SQL.Add("left join XLXHB on XLXHB_XLXHID=XLXSJGBMX_XLXHID ");
SQL.Add("left join XLXSBJXLGGTHB XLXSBJXLGGTHB_JGB10 on XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGID=XLXSJGBMX_XLGGID ");
SQL.Add("left join XLGGB on XLGGB_XLGGID = isnull(XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGIDCH,' ') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
SQL.Add("left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID and CONVERT(float,XLXSBJCPYS_XLYSID)=XLDTJMZHB_DTJM1 ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");