提交说明10/9

This commit is contained in:
2026-10-09 10:30:49 +08:00
parent f216ceb835
commit 0c0e9750e2
39 changed files with 3733 additions and 258 deletions
+20 -12
View File
@@ -5357,7 +5357,8 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" and isnull(XLJGCZBLM_CLQDL,' ')<>' '");
if (sLX == "QTCLSH")
{
SQL.Add(" and isnull(XLJGCZBLM_XLCLZLID,' ') <> 'DTCL' and XLJGCZBLM_CZBLMMC not like '%Í­%' and XLJGCZBLM_CZBLMMC not like '%ÂÁ%' ");
SQL.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 (sLX == "DTCLSH")
@@ -8886,13 +8887,15 @@ namespace GThinking.N_XLXSBJ
int iXSWS = 5;
string sCJGS = "";
string sMXBH = "";
string sBJFLID = "02";
if (sJGBID == "26080009")
sBJFLID = "04";
BJFLXX flxx = XLBJDUtils.GetBJFLXX(sBJFLID);
SQL.Clear();
SQL.Add("select CJGS from dbo.JGBCJGS where JGBID=:JGBID ");
SQL.ParamByName("JGBID").Value = sJGBID;
DataSet dsCJGS = dberp.OpenDataSet(SQL);
if (dsCJGS.Tables[0].Rows.Count > 0)
sCJGS = dsCJGS.Tables[0].Rows[0][0].ToString();
if (!string.IsNullOrEmpty(flxx.XLXSBJFL_CJGS))
if (!string.IsNullOrEmpty(sCJGS))
{
int indexXSML = 0;
int indexFJSX = 0;
@@ -8915,7 +8918,10 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_XLBZID=XLXSJGBMX_XLBZID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID and XLXSCLQD_WPID='ZZZZ' ");
SQL.Add(" where XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_XH>=:maxXH ");
SQL.Add(" )sor on(XLXSJGBYZZ0_JGBID=XLXSJGBMX_JGBID and XLXSJGBMX_XH=XLXSJGBYZZ0_XH) ");
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBHSCB,0)/100.0 ");
if (sCJGS.Contains("WSCB"))
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBWSCB,0)/100.0 ");
else
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBHSCB,0)/100.0 ");
SQL.ParamByName("pJGBID").Value = sJGBID;
SQL.ParamByName("maxXH").Value = maxXH;
@@ -8931,7 +8937,10 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_XLBZID=XLXSJGBMX_XLBZID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID and XLXSCLQD_WPID='ZZZZ' ");
SQL.Add(" where XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_XH>=:maxXH ");
SQL.Add(" )sor on(XLXSJGBYZZ0_JGBID=XLXSJGBMX_JGBID and XLXSJGBMX_XH=XLXSJGBYZZ0_XH) ");
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBHSCB,0)/100.0 ");
if (sCJGS.Contains("WSCB"))
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBWSCB,0)/100.0 ");
else
SQL.Add(" when matched then update set XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "= XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + "*isnull(XLXSCLQD_JGBHSCB,0)/100.0 ");
SQL.ParamByName("pJGBID").Value = sJGBID;
SQL.ParamByName("maxXH").Value = maxXH;
@@ -8954,8 +8963,6 @@ namespace GThinking.N_XLXSBJ
}
sCJGS = flxx.XLXSBJFL_CJGS;
sMXBH = flxx.XLXSBJFL_MXBH;
//将数据都处理为0-防止编辑存在部分计算公式出错
SQL.Clear();
SQL.Add(" update XLXSJGBMX set XLXSJGBMX_CJ = 0.0 where XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_XH>=:maxXH ");
@@ -8964,11 +8971,12 @@ namespace GThinking.N_XLXSBJ
dberp.ExecSQL(SQL);
if (!sCJGS.Equals(""))
{
sCJGS = sCJGS.Replace("CLCB", "XXX01").Replace("JGBJJ", "XXX02").Replace("JGBBJ", "XXX03").Replace("CPBJ", "XXX04").Replace("ZDXJ", "XXX05").Replace("BJDHQCB", "XXX06");
sCJGS = sCJGS.Replace("CLCB", "XXX01").Replace("JGBJJ", "XXX02").Replace("JGBBJ", "XXX03").Replace("CPBJ", "XXX04").Replace("ZDXJ", "XXX05").Replace("BJDHQCB", "XXX06").Replace("WSCB", "XXX07");
sCJGS = sCJGS.Replace("JZ", "tar.XLXSJGBYZZ0_YZZ");
sCJGS = sCJGS.Replace("XXX01", "sor.XLXSJGBMX_HSJJ");
sCJGS = sCJGS.Replace("XXX02", "sor.XLXSJGBMX_HSJJ");
sCJGS = sCJGS.Replace("XXX06", "sor.XLXSJGBMX_HSJJ");
sCJGS = sCJGS.Replace("XXX07", "sor.XLXSJGBMX_WSJJ");
sCJGS = sCJGS.Replace(" ", "").Replace("×", "*").Replace("100", "100.00");
sCJGS = sCJGS.Replace("round", "roundFix");
SQL.Clear();