提交所有文件

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
+4 -4
View File
@@ -5637,13 +5637,13 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" left join XLXHB on XLXHB_XLXHID=V_XSBJJSJGB_XLXHID ");
SQL.Add(" left join XLGGB on XLGGB_XLGGID = REPLACE(V_XSBJJSJGB_XLGGID , '*','¡Á') 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=V_XSBJJSJGB_XLXHID and XLXSBJCPYS_DYDJID=V_XSBJJSJGB_DYDJID and XLDTJMZHB_DTJM1=CONVERT(float,XLXSBJCPYS_XLYSID) ");
SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=V_XSBJJSJGB_XLXHID and XLXSBJCPYS_DYDJID=V_XSBJJSJGB_DYDJID ");
SQL.Add(" ,XLXSTZYZ,XLXSJGBYZZC ");
SQL.Add(" where V_XSBJJSJGB_ID=:pID ");
SQL.Add(" and V_XSBJJSJGB_BJDID=:pBJDID");
SQL.Add(" and V_XSBJJSJGB_WGCPBZ<>'Y' and V_XSBJJSJGB_JGFBZ<>'Y' ");
SQL.Add(" and XLXSTZYZ_MXBH='JZJ' and XLXSTZYZ_YZID=:pYZID");
SQL.Add(" and XLXSTZYZ_TJYS='C' and XLXSJGBYZZC_JGBID=XLXSTZYZ_JGBID and XLXSJGBYZZC_YZID=XLXSTZYZ_YZID ");
SQL.Add(" and XLXSTZYZ_TJYS='C' and XLXSJGBYZZC_JGBID=XLXSTZYZ_JGBID and XLXSJGBYZZC_YZID=XLXSTZYZ_YZID and XLDTJMZHB_DTJM1=XLXSJGBYZZC_ZXJM");
SQL.Add(" and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX ");
SQL.Add(" GROUP BY V_XSBJJSJGB_BJDID,V_XSBJJSJGB_BJDXH ");
SQL.Add(" ) sor ");
@@ -5916,12 +5916,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;