提交所有文件3

This commit is contained in:
2026-09-21 11:37:39 +08:00
parent 5222c98e0e
commit f216ceb835
33 changed files with 944 additions and 177 deletions
+7 -1
View File
@@ -480,6 +480,12 @@ namespace GThinking.N_XLXSBJ
sSQL += " left join XLBZ on XLBZ_XLBZID=XLXSCLQD_XLBZID ";
sSQL += " left join XLXHB on XLXHB_XLXHID = XLXSCLQD_XLXHID ";
sSQL += " left join XLXSBJXLGGTHB on XLXSBJXLGGTHB_XLGGID = XLXSCLQD_XLGGID ";
if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("CPMLID").Value.Trim()))
{
sSQL += " left join XLXSBJTJXHML AA on AA.XLXSBJTJXHML_XLXHID = XLXSCLQD_XLXHID and AA.XLXSBJTJXHML_DYDJID = isnull(XLXSCLQD_DYDJID, ' ') ";
sSQL += " left join XLXSBJTJXHML BB on BB.XLXSBJTJXHML_XLXHID = XLXSCLQD_XLXHID and BB.XLXSBJTJXHML_DYDJID = ' ' ";
}
sSQL += " where 1=1 and XLXSCLQD_WPID ='ZZZZ' and isnull(XLXHB_TYBZ,'N') <> 'Y'";
if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("JGCZBID").Value.Trim()))
@@ -504,7 +510,7 @@ namespace GThinking.N_XLXSBJ
if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("CPMLID").Value.Trim()))
{
sSQL += "\r\n and XLXSCLQD_CPMLID = :pCPMLID ";
sSQL += "\r\n and (case when AA.XLXSBJTJXHML_CPMLID is not null then AA.XLXSBJTJXHML_CPMLID else BB.XLXSBJTJXHML_CPMLID end = :pCPMLID)";
entity.Param.Add("pCPMLID", CurQueryEntity.FieldByName("CPMLID").Value.Trim());
}
//型号模糊