提交说明10/9

2026-10-09 10:30:49 +08:00
parent f216ceb835
commit 0c0e9750e2
39 changed files with 3733 additions and 258 deletions
@@ -9070,7 +9070,8 @@ namespace GThinking.N_XLXSBJ
        { 
            double dCLCB1 = 0.0;
            double dCLCB2 = 0.0;
-            bool bHSBZ = true;
+            bool bHSBZ = CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSBJD where XLXSBJD_BJDID='{0}' and XLXSBJD_JZBJHS='Y' ", sBJDID));
+            
            TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
            TSQL sSQL = new TSQL(dberp);
        
@@ -9108,7 +9109,7 @@ namespace GThinking.N_XLXSBJ
                sSQL.Add(" and isnull(XLJGCZBLM_CLQDL,' ')<>' '");
                if (CLLX == "QTCLSH")
                {
-                    sSQL.Add(" and isnull(XLJGCZBLM_XLCLZLID,' ') <> 'DTCL' and XLJGCZBLM_CZBLMMC not like '%Í%' and XLJGCZBLM_CZBLMMC not like '%ÂÁ%'  ");
+                    sSQL.Add(" and isnull(XLJGCZBLM_XLCLZLID,' ') <> 'DTCL' and (XLXSBJCL_BJCLID in('BJCL420000','HTCL_L-01','HTCL_LW-01') or (XLJGCZBLM_CZBLMMC not like '%Í%' and XLJGCZBLM_CZBLMMC not like '%ÂÁ%') )  ");
                }

                if (CLLX == "DTCLSH")