提交所有文件

This commit is contained in:
2026-09-19 14:12:58 +08:00
parent 20e88479b1
commit 7b922290bb
62 changed files with 11832 additions and 131 deletions
+17 -11
View File
@@ -5149,7 +5149,7 @@ namespace GThinking.N_XLXSBJ
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 ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");
@@ -5162,7 +5162,7 @@ namespace GThinking.N_XLXSBJ
SQL.ParamByName("pmaxXH").Value = maxXH;
}
SQL.Add(" and XLXSJGBYZZC_JGBID=:pTJJGBID and XLXSJGBYZZC_YZID=:pYZID ");
SQL.Add(" and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX ");
SQL.Add(" and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX and XLDTJMZHB_DTJM1=XLXSJGBYZZC_ZXJM ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" and XLXSCLQD_JGCZBID=:pJGCZBID and XLXSCLQD_JGCZBBBID=:pJGCZBBBID");
@@ -5357,12 +5357,12 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" and isnull(XLJGCZBLM_CLQDL,' ')<>' '");
if (sLX == "QTCLSH")
{
SQL.Add(" and XLJGCZBLM_XLCLZLID <> 'DTCL' and XLJGCZBLM_CZBLMMC not like '%Í­%' and XLJGCZBLM_CZBLMMC not like '%ÂÁ%' ");
SQL.Add(" and isnull(XLJGCZBLM_XLCLZLID,' ') <> 'DTCL' and XLJGCZBLM_CZBLMMC not like '%Í­%' and XLJGCZBLM_CZBLMMC not like '%ÂÁ%' ");
}
if (sLX == "DTCLSH")
{
SQL.Add(" and XLJGCZBLM_XLCLZLID = 'DTCL' and (XLJGCZBLM_CZBLMMC like '%Í­%' or XLJGCZBLM_CZBLMMC like '%ÂÁ%') ");
SQL.Add(" and isnull(XLJGCZBLM_XLCLZLID,' ') = 'DTCL' and (XLJGCZBLM_CZBLMMC like '%Í­%' or XLJGCZBLM_CZBLMMC like '%ÂÁ%') ");
}
SQL.Add(" order by XLJGCZBLM_CLQDL");
SQL.ParamByName("pJGCZBID").Value = tmpJGCZBID;
@@ -6283,7 +6283,7 @@ namespace GThinking.N_XLXSBJ
string sYZZFields_4 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_4 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
sYZZFields_4 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + ",";
}
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)
@@ -6740,14 +6740,16 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into XLXSJGBMX tar ");
SQL.Add(" using ( ");
SQL.Add("select XLXSCLQD_CLZL,JGBID,XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
SQL.Add("select XLXSCLQD_CLZL,JGBID,XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10, ");
SQL.Add(" XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15,XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20 ");
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,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
SQL.Add(" select isnull(XLXSCLQD_CLZL,0) as XLXSCLQD_CLZL,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, ");
SQL.Add(" XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15,XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20 ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
{
SQL.Add(" ,case ");
@@ -8699,7 +8701,7 @@ namespace GThinking.N_XLXSBJ
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 ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");
@@ -8712,7 +8714,7 @@ namespace GThinking.N_XLXSBJ
SQL.ParamByName("pmaxXH").Value = maxXH;
}
SQL.Add(" and XLXSJGBYZZC_JGBID=:pTJJGBID and XLXSJGBYZZC_YZID=:pYZID ");
SQL.Add(" and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX ");
SQL.Add(" and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX and XLDTJMZHB_DTJM1=XLXSJGBYZZC_ZXJM ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" and XLXSCLQD_JGCZBID=:pJGCZBID and XLXSCLQD_JGCZBBBID=:pJGCZBBBID");
@@ -8885,8 +8887,10 @@ namespace GThinking.N_XLXSBJ
string sCJGS = "";
string sMXBH = "";
BJFLXX flxx = XLBJDUtils.GetBJFLXX("02");
string sBJFLID = "02";
if (sJGBID == "26080009")
sBJFLID = "04";
BJFLXX flxx = XLBJDUtils.GetBJFLXX(sBJFLID);
if (!string.IsNullOrEmpty(flxx.XLXSBJFL_CJGS))
{
@@ -8973,6 +8977,8 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" select XLXSJGBMX_JGBID,XLXSJGBMX_XH,XLXSJGBMX_HSJJ ");
SQL.Add(" ,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05, ");
SQL.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10");
SQL.Add(" ,XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15, ");
SQL.Add(" XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20");
SQL.Add(" from XLXSJGBMX ");
SQL.Add(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID = XLXSJGBMX_JGBID and XLXSJGBYZZ0_XH = XLXSJGBMX_XH ");
SQL.Add(" where XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_XH>=:maxXH ");