提交所有文件3
This commit is contained in:
+25
-14
@@ -2565,23 +2565,27 @@ namespace GThinking.N_XLXSBJ
|
||||
sql.ParamByName("pTJ").Value = dLJ * 1000;
|
||||
|
||||
}
|
||||
DataSet dsQH = dberp.OpenDataSet(sql);
|
||||
if (dsQH.Tables[0].Rows.Count > 0)
|
||||
if (bTCP || bLCP)
|
||||
{
|
||||
string sQH = dsQH.Tables[0].Rows[0][0].ToString().Trim();
|
||||
sql.Clear();
|
||||
sql.Add(" select XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID and XLXSBJDQYFB_YFJZQH=:XLXSBJDQYFB_YFJZQH ");
|
||||
sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID;
|
||||
sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = sQH;
|
||||
DataSet ds = dberp.OpenDataSet(sql);
|
||||
|
||||
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
|
||||
DataSet dsQH = dberp.OpenDataSet(sql);
|
||||
if (dsQH.Tables[0].Rows.Count > 0)
|
||||
{
|
||||
double dYZZ = CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDQYFB_YSFL"].ToString());
|
||||
dicYZZBZPF[sYFYZID] = dYZZ;
|
||||
}
|
||||
string sQH = dsQH.Tables[0].Rows[0][0].ToString().Trim();
|
||||
sql.Clear();
|
||||
sql.Add(" select XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID and XLXSBJDQYFB_YFJZQH=:XLXSBJDQYFB_YFJZQH ");
|
||||
sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID;
|
||||
sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = sQH;
|
||||
DataSet ds = dberp.OpenDataSet(sql);
|
||||
|
||||
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
|
||||
{
|
||||
double dYZZ = CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDQYFB_YSFL"].ToString());
|
||||
dicYZZBZPF[sYFYZID] = dYZZ;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return dicYZZBZPF;
|
||||
}
|
||||
@@ -9037,11 +9041,15 @@ namespace GThinking.N_XLXSBJ
|
||||
double ZZSCB = (CMISproConvert.StrToFloat(strJJYZZ[indexPTF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexZJF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexFXYL - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexQTSH - 1])
|
||||
+ (CMISproConvert.StrToFloat(strJJYZZ[indexDF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexGJ - 1])*10000 / 81.2655989526499 / 71.3980341706337)) * CMISproConvert.StrToFloat(strJJYZZ[indexZZSCB - 1]);
|
||||
strJJYZZ[indexZZSCB - 1] = ZZSCB.ToString();
|
||||
|
||||
Mac.MacLog.TraceFormat("indexZZSCB£º" + ZZSCB.ToString());
|
||||
}
|
||||
|
||||
for (int i = 0; i < strJJYZZ.Length; i++)
|
||||
{
|
||||
sJJList += strJJYZZ[i] + "|";
|
||||
|
||||
Mac.MacLog.TraceFormat("sUpdJJYZList" + i.ToString() + ":" + strJJYZZ[i]);
|
||||
}
|
||||
|
||||
|
||||
@@ -9581,9 +9589,12 @@ namespace GThinking.N_XLXSBJ
|
||||
SQL.Add(" left join XLXSBJXLGGTHB on XLXSBJXLGGTHB_XLGGID = XLXSBJDMX_XLGGID ");
|
||||
SQL.Add(" left join XLGGB on XLGGB_XLGGID = XLXSBJXLGGTHB_XLGGIDCH and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
|
||||
SQL.Add(" left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
|
||||
SQL.Add(" left join XLXSBJXHML on XLXSBJXHML_XLXHID=XLXSBJDMX_XLXHID and XLXSBJXHML_DYDJID=XLXSBJDMX_DYDJID ");
|
||||
SQL.Add(" where XLXSBJDMX_BJDID=:pBJDID ");
|
||||
SQL.Add(" and exists(select 1 from V_XSBJJSJGB where V_XSBJJSJGB_ID=:pID and V_XSBJJSJGB_BJDID=:pBJDID and V_XSBJJSJGB_WGCPBZ<>'Y' and V_XSBJJSJGB_JGFBZ<>'Y' and V_XSBJJSJGB_BJDID=XLXSBJDMX_BJDID and V_XSBJJSJGB_BJDXH=XLXSBJDMX_XH ) ");
|
||||
SQL.Add(" and (XLXSBJDMX_JLDW='Ôú' or (XLXSBJDMX_JLDW in ('Ã×','M') and XLDTJMZHB_DTJM1<=16 ) ) ");
|
||||
SQL.Add(" and (XLXSBJDMX_JLDW='Ôú' or (XLXSBJDMX_JLDW in ('Ã×','M') and XLDTJMZHB_DTJM1<=16 ");
|
||||
SQL.Add(" and exists(select 1 from XLXSCPML where XLXSCPML_CPMLIDS like '%' ||XLXSBJXHML_CPMLID|| '%' and XLXSCPML_CPMLMC like 'µçÏß%' )");
|
||||
SQL.Add(" ) ) ");
|
||||
SQL.Add(" and " + CMISproDataBase.GetWhereEqual("XLXHB_DTCLID", sTcpList));
|
||||
SQL.Add(" )sor on(XLXSBJDMX_BJDID=XLXSBJDJJYZ_BJDID and XLXSBJDMX_XH=XLXSBJDJJYZ_XH) ");
|
||||
SQL.Add(" when matched then update set XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + "= 0 ");
|
||||
|
||||
Reference in New Issue
Block a user