wangwei/U20261363_N_XLXSBJ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangwei
2026-09-09 23:26:19 +08:00
parent 7b99aec79b
commit 2b324c2ec8
5 changed files with 238 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BJDCache.cs
+63 -40
View File
@@ -4756,7 +4756,7 @@ public class XLJGB_CLJGTZList
public static void DoCPJJ(TDatabase dberp, string sMXBH, string sJGBID, bool bInsertXLXSJGBYZZ0, string sJGCZBID, string sJGCZBBBID, int iXSWS, string sJSBLFS, string sWHRID, string sWHR, double maxXH)
{
{
//据材料成本及调整因子的值计算无税产品单价、含税产品单价
TSQL SQL = new TSQL(dberp);
@@ -4772,44 +4772,51 @@ public class XLJGB_CLJGTZList
if (dsJGBYZ.Tables[0].Rows.Count > 0)
{
string sJSGS = dsJGBYZ.Tables[0].Rows[0]["XLXSJGB_JSGS"].ToString().Trim();
string sTJYSList_ = "";//记录调价因素为空的因子id
string sTJYSList1 = "";//记录调价因素为'1'的因子id
string sTJYSList3 = "";//记录调价因素为'3'的因子id
string sTJYSList4 = "";//记录调价因素为'4'的因子id
string sTJYSList5 = "";//记录调价因素为'5'的因子id
string sTJYSList8 = "";//记录调价因素为'8'的因子id
string sTJYSList9 = "";//记录调价因素为'9'的因子id
StringBuilder sbTJYSList_ = new StringBuilder("");//记录调价因素为空的因子id
StringBuilder sbTJYSList1 = new StringBuilder("");//记录调价因素为'1'的因子id
StringBuilder sbTJYSList3 = new StringBuilder("");//记录调价因素为'3'的因子id
StringBuilder sbTJYSList4 = new StringBuilder("");//记录调价因素为'4'的因子id
StringBuilder sbTJYSList5 = new StringBuilder("");//记录调价因素为'5'的因子id
StringBuilder sbTJYSList8 = new StringBuilder("");//记录调价因素为'8'的因子id
StringBuilder sbTJYSList9 = new StringBuilder("");//记录调价因素为'9'的因子id
for (int i = 0; i < dsJGBYZ.Tables[0].Rows.Count; i++)
{
if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals(""))
{
sTJYSList_ += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList_.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("1"))
{
sTJYSList1 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList1.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("3"))
{
sTJYSList3 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList3.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("4"))
{
sTJYSList4 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList4.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("5"))
{
sTJYSList5 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList5.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("8"))
{
sTJYSList8 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList8.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("9"))
{
sTJYSList9 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList9.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
}
string sTJYSList_ = sbTJYSList_.ToString();
string sTJYSList9 = sbTJYSList9.ToString();
string sTJYSList8 = sbTJYSList8.ToString();
string sTJYSList5 = sbTJYSList5.ToString();
string sTJYSList4 = sbTJYSList4.ToString();
string sTJYSList3 = sbTJYSList3.ToString();
string sTJYSList1 = sbTJYSList1.ToString();
sTJYSList_ = sTJYSList_.TrimEnd(',');
sTJYSList1 = sTJYSList1.TrimEnd(',');
sTJYSList3 = sTJYSList3.TrimEnd(',');
@@ -5603,44 +5610,51 @@ public class XLJGB_CLJGTZList
if (dsJGBYZ.Tables[0].Rows.Count > 0)
{
string sJSGS = dsJGBYZ.Tables[0].Rows[0]["XLXSJGB_JSGS"].ToString().Trim();
string sTJYSList_ = "";//记录调价因素为空的因子id
string sTJYSList1 = "";//记录调价因素为'1'的因子id
string sTJYSList3 = "";//记录调价因素为'3'的因子id
string sTJYSList4 = "";//记录调价因素为'4'的因子id
string sTJYSList5 = "";//记录调价因素为'5'的因子id
string sTJYSList8 = "";//记录调价因素为'8'的因子id
string sTJYSList9 = "";//记录调价因素为'9'的因子id
StringBuilder sbTJYSList_ = new StringBuilder("");//记录调价因素为空的因子id
StringBuilder sbTJYSList1 = new StringBuilder("");//记录调价因素为'1'的因子id
StringBuilder sbTJYSList3 = new StringBuilder("");//记录调价因素为'3'的因子id
StringBuilder sbTJYSList4 = new StringBuilder("");//记录调价因素为'4'的因子id
StringBuilder sbTJYSList5 = new StringBuilder("");//记录调价因素为'5'的因子id
StringBuilder sbTJYSList8 = new StringBuilder("");//记录调价因素为'8'的因子id
StringBuilder sbTJYSList9 = new StringBuilder("");//记录调价因素为'9'的因子id
for (int i = 0; i < dsJGBYZ.Tables[0].Rows.Count; i++)
{
if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals(""))
{
sTJYSList_ += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList_.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("1"))
{
sTJYSList1 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList1.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("3"))
{
sTJYSList3 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList3.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("4"))
{
sTJYSList4 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList4.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("5"))
{
sTJYSList5 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList5.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("8"))
{
sTJYSList8 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList8.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("9"))
{
sTJYSList9 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList9.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
}
string sTJYSList_ = sbTJYSList_.ToString();
string sTJYSList9 = sbTJYSList9.ToString();
string sTJYSList8 = sbTJYSList8.ToString();
string sTJYSList5 = sbTJYSList5.ToString();
string sTJYSList4 = sbTJYSList4.ToString();
string sTJYSList3 = sbTJYSList3.ToString();
string sTJYSList1 = sbTJYSList1.ToString();
sTJYSList_ = sTJYSList_.TrimEnd(',');
sTJYSList1 = sTJYSList1.TrimEnd(',');
sTJYSList3 = sTJYSList3.TrimEnd(',');
@@ -6605,7 +6619,7 @@ public class XLJGB_CLJGTZList
//调价因素3价格表，则XLXSCLQD_JGBHSCB、XLXSCLQD_JGBWSCB只用来记录材料价价差
public static void UpdateCLCB(TDatabase dberp, TSQL SQL, string sJGBID, string sJGCZBID, string sJGCZBBBID, int iXSWS, string sJSBLFS, string sWHRID, string sWHR, double maxXH, string sJGBID1,
string sTBJCLID_JGBBJ, string sLBJCLID_JGBBJ, double dTJ_JGBBJ, double dLJ_JGBBJ, string sBJDID, int iMinXH, string sBJDXHList, string sBJU003)
{
{
bool bExistsWLHQ = false;//是否存在物料行情报价材料
if (CMISproDataBase.ExistsRecord("DBERP", string.Format("select top 1 XLXSBJCL_BJCLID from XLXSBJCL where XLXSBJCL_BJHQ='2'")))
bExistsWLHQ = true;
@@ -7578,15 +7592,16 @@ public class XLJGB_CLJGTZList
if (bNeedAddWLHQ)
{
string sWLHQCLQDL = string.Empty;//记录物料行情的材料清单列
StringBuilder sbWLHQCLQDL = new StringBuilder(string.Empty);//记录物料行情的材料清单列
for (int i = 0; i < dsCLQDL.Tables[0].Rows.Count; i++)
{
sCLQDL = dsCLQDL.Tables[0].Rows[i]["XLJGCZBLM_CLQDL"].ToString().Trim();
sBJHQ = dsCLQDL.Tables[0].Rows[i]["XLXSBJCL_BJHQ"].ToString().Trim();
sBJRCLCB = dsCLQDL.Tables[0].Rows[i]["XLJGCZBLM_BJRCLCB"].ToString().Trim();
if (sBJHQ.Equals("2") && !sBJRCLCB.Equals("Y"))//2|物料行情
sWLHQCLQDL += sCLQDL.Replace("第", "").Replace("列", "") + ",";
sbWLHQCLQDL.Append(sCLQDL.Replace("第", "").Replace("列", "") + ",");
}
string sWLHQCLQDL = sbWLHQCLQDL.ToString();
sWLHQCLQDL = sWLHQCLQDL.TrimEnd(',');
string[] sWLHQCLQDList = sWLHQCLQDL.Split(',');
@@ -9324,20 +9339,26 @@ public class XLJGB_JGFLDInfo
if (dsBJCL.Tables[0].Rows.Count > 0)
{
//判断 加工原料 铜
//预加载该价格表当日已存在的料价记录，避免循环内逐行查询数据库
SQL.Clear();
SQL.Add("select XLXSCLHQ_BJCLID from XLXSCLHQ where XLXSCLHQ_JGBID =:pJGBID and XLXSCLHQ_YXQS= :pRQ ");
SQL.ParamByName("pJGBID").Value = sJGBID;
SQL.ParamByName("pRQ").Value = "1900-01-01 00:00:00.000";
DataSet dsCLHQExist = dberp.OpenDataSet(SQL);
Dictionary<string, object> dicCLHQExist = new Dictionary<string, object>();
for (int rExist = 0; rExist < dsCLHQExist.Tables[0].Rows.Count; rExist++)
{
string sExistID = dsCLHQExist.Tables[0].Rows[rExist]["XLXSCLHQ_BJCLID"].ToString().Trim();
if (!dicCLHQExist.ContainsKey(sExistID))
dicCLHQExist.Add(sExistID, null);
}
for (int i = 0; i < dsBJCL.Tables[0].Rows.Count; i++)
{
sJGLBJCLID = dsBJCL.Tables[0].Rows[i]["XLXSBJCL_BJCLID"].ToString().Trim();
if (!dsBJCL.Tables[0].Rows[i]["XLXSBJCL_JGYBJCLID"].ToString().Trim().Equals(""))
{
sJGLBJCL = sJGLBJCL + dsBJCL.Tables[0].Rows[i]["XLXSBJCL_BJCLMC"].ToString().Trim() + "、";
SQL.Clear();
//查询是否存在记录
SQL.Add("select 1 from XLXSCLHQ where XLXSCLHQ_JGBID =:pJGBID and XLXSCLHQ_YXQS= :pRQ and XLXSCLHQ_BJCLID = :pBJCLID ");
SQL.ParamByName("pJGBID").Value = sJGBID;
SQL.ParamByName("pRQ").Value = "1900-01-01 00:00:00.000";
SQL.ParamByName("pBJCLID").Value = sJGLBJCLID;
DataSet ds = dberp.OpenDataSet(SQL);
if (ds.Tables[0].Rows.Count > 0)
if (dicCLHQExist.ContainsKey(sJGLBJCLID))
{
SQL.Clear();
SQL.Add(" update XLXSCLHQ ");
@@ -9382,6 +9403,8 @@ public class XLJGB_JGFLDInfo
SQL.ParamByName("pBJCLID").Value = sJGLBJCLID;
SQL.ParamByName("pJGBID").Value = sJGBID;
dberp.ExecSQL(SQL);
if (!dicCLHQExist.ContainsKey(sJGLBJCLID))
dicCLHQExist.Add(sJGLBJCLID, null);
}
//更新或插入后处理加工料的HSJG、WSJG
XLBJDCalcUtils.cs
+32 -91
View File
@@ -2433,7 +2433,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
public static void CalcUpdateJGBBJ_JGE(TDatabase dberp, TSQL SQL, DataSet dsJGBYZ, int VnewID, string sBJDID, string sMXBH, string sJGBID, int iXSWS, string sJSBLFS, string sWHRID, string sWHR, string sJGBIDS)
{
{
//据材料成本及调整因子的值计算无税产品单价、含税产品单价
//SQL.Clear();
//SQL.Add("select XLXSJGBYZ_YZID,XLXSTZYZ_JJFS,XLXSTZYZ_TJYZID,XLXSTZYZ_TJYS");
@@ -2460,39 +2460,45 @@ namespace GThinking.U20261363_N_XLXSBJ
string sJGBJJLY = XLBJDUtils.GetXLXSJGBXXByJGBID(sJGBID).XLXSJGB_JJLY;
string ABJDHQJSBJ = XLBJDUtils.GetBJFLXX(sBJFLID).XLXSBJFL_ABJDHQJSBJ;
string sTJYSList_ = "";//记录调价因素为空的因子id
string sTJYSList1 = "";//记录调价因素为'1'的因子id
string sTJYSList3 = "";//记录调价因素为'3'的因子id
string sTJYSList4 = "";//记录调价因素为'4'的因子id
string sTJYSList5 = "";//记录调价因素为'5'的因子id
string sTJYSList8 = "";//记录调价因素为'8'的因子id
StringBuilder sbTJYSList_ = new StringBuilder("");//记录调价因素为空的因子id
StringBuilder sbTJYSList1 = new StringBuilder("");//记录调价因素为'1'的因子id
StringBuilder sbTJYSList3 = new StringBuilder("");//记录调价因素为'3'的因子id
StringBuilder sbTJYSList4 = new StringBuilder("");//记录调价因素为'4'的因子id
StringBuilder sbTJYSList5 = new StringBuilder("");//记录调价因素为'5'的因子id
StringBuilder sbTJYSList8 = new StringBuilder("");//记录调价因素为'8'的因子id
for (int i = 0; i < dsJGBYZ.Tables[0].Rows.Count; i++)
{
if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals(""))
{
sTJYSList_ += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList_.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("1"))
{
sTJYSList1 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList1.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("3"))
{
sTJYSList3 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList3.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("4"))
{
sTJYSList4 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList4.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("5"))
{
sTJYSList5 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList5.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("8"))
{
sTJYSList8 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList8.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
}
string sTJYSList_ = sbTJYSList_.ToString();
string sTJYSList8 = sbTJYSList8.ToString();
string sTJYSList5 = sbTJYSList5.ToString();
string sTJYSList4 = sbTJYSList4.ToString();
string sTJYSList3 = sbTJYSList3.ToString();
string sTJYSList1 = sbTJYSList1.ToString();
sTJYSList_ = sTJYSList_.TrimEnd(',');
sTJYSList1 = sTJYSList1.TrimEnd(',');
sTJYSList3 = sTJYSList3.TrimEnd(',');
@@ -3415,7 +3421,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYS2(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "2", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSList2"))
@@ -3434,7 +3440,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYS3(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "3", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSList3"))
@@ -3453,7 +3459,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYS6(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "6", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSList6"))
@@ -3472,7 +3478,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYSE(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "E", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSListE"))
@@ -3491,7 +3497,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYSG(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "G", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSListG"))
@@ -3510,7 +3516,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYSF(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "F", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSListF"))
@@ -3529,7 +3535,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sYZID = sYZIDs[i].Trim();
if (dicABJCPJYYZList.ContainsKey(sYZID))
{
bool chkResult = CheckBJDTJYSH(dberp, SQL, sBJDID, sBJFLID, sYZID, sBJU003);
bool chkResult = CheckBJDTJYS(dberp, SQL, sBJDID, sBJFLID, "H", sYZID, sBJU003);
if (chkResult)
{
if (!dicCheckedYZIDList.ContainsKey("sTJYSListH"))
@@ -3543,11 +3549,14 @@ namespace GThinking.U20261363_N_XLXSBJ
return dicCheckedYZIDList;
}
//对“2|导体材料&电压区间&报价数量区间”进行整单因子值校验，返回true代表因子值不一致
public static bool CheckBJDTJYS2(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
//对指定类型的整单因子值进行校验，返回true代表因子值不一致
//sType 即 GetBJSLTJYS_SQL 的因子类型参数：
// "2"|导体材料&电压区间&报价数量区间 "3"|产品用途&电压等级分类&报价数量区间 "6"|报价数量区间调价米数/报价数量
// "E"|型号&电压等级&主芯截面范围&报价数量区间 "F"|电压等级&芯线结构&报价数量区间加价/报价数量 "G"/"H"等
public static bool CheckBJDTJYS(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sType, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "2", sYZID, sBJU003, "exists");
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, sType, sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
@@ -3555,74 +3564,6 @@ namespace GThinking.U20261363_N_XLXSBJ
return false;
}
//对“3|产品用途&电压等级分类&报价数量区间”进行整单因子值校验，返回true代表因子值不一致
public static bool CheckBJDTJYS3(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "3", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
//对“6|报价数量区间调价米数/报价数量”进行整单因子值校验，返回true代表因子值不一致
public static bool CheckBJDTJYS6(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "6", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
//对“E|型号&电压等级&主芯截面范围&报价数量区间”进行整单因子值校验，返回true代表因子值不一致
public static bool CheckBJDTJYSE(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "E", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
public static bool CheckBJDTJYSG(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "G", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
//对“F|电压等级&芯线结构&报价数量区间加价/报价数量”进行整单因子值校验，返回true代表因子值不一致
public static bool CheckBJDTJYSF(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "F", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
public static bool CheckBJDTJYSH(TDatabase dberp, TSQL SQL, string sBJDID, string sBJFLID, string sYZID, string sBJU003)
{
SQL.Clear();
XLBJD_YZZCheck.GetBJSLTJYS_SQL(SQL, sBJDID, sBJFLID, "H", sYZID, sBJU003, "exists");
DataSet dsTJYS = dberp.OpenDataSet(SQL);
if (dsTJYS.Tables[0].Rows.Count > 0)
return true;
else
return false;
}
public static void CalcWithBJSLYZZCheck(TDatabase dberp, TSQL SQL, string sBJDID, string strYZIDList2, string strYZIDList3, string strYZIDList6, string strYZIDListE, string strYZIDListF, string strYZIDListG,
string strYZIDListH, string sBJU002, string sBJU003, bool bUpdXLBJD)
XLBJDInfo.aspx.cs
+70 -39
View File
@@ -3103,7 +3103,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
protected override bool DataLogicValid()
{
{
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL SQL = new TSQL(dberp);
DataSet ds;
@@ -3278,7 +3278,7 @@ namespace GThinking.U20261363_N_XLXSBJ
if (ControlState == TControlState.ctsEdit)
{
string sYLZDMXTZ=XLBJDUtils.GetXLXSBJPZXX(100860064).XLXSBJPZ_YLZDMXTZ;
string sYLZDMsg = string.Empty;
StringBuilder sbYLZDMsg = new StringBuilder(string.Empty);
for (int i = 0; i < grdXLBJDMX.NewRows.Count; i++)
{
sHasYLDZSQ = grdXLBJDMX.GetValueByFieldName("HasYLDZSQ", grdXLBJDMX.NewRows[i]).Trim();
@@ -3320,13 +3320,14 @@ namespace GThinking.U20261363_N_XLXSBJ
ds = dberp.OpenDataSet(SQL);
if (ds.Tables[0].Rows.Count > 0)
{
sYLZDMsg += string.Format("[{0}] [{1} {2} {3} {4}]\r\n", dXSSX, sXLXHID, sXLGGID, sXLBZID, sDYDJID);
sbYLZDMsg.Append(string.Format("[{0}] [{1} {2} {3} {4}]\r\n", dXSSX, sXLXHID, sXLGGID, sXLBZID, sDYDJID));
}
}
}
string sYLZDMsg = sbYLZDMsg.ToString();
if (!string.IsNullOrEmpty(sYLZDMsg))
{
@@ -4750,7 +4751,7 @@ namespace GThinking.U20261363_N_XLXSBJ
if (sKHJSLY.Equals("KHXX"))
{
Hashtable sSQLParams = GetHashtableValue(Server.HtmlDecode(Request.Form["SQLParam"].ToString()));
Dictionary<string, string> sSQLParams = GetHashtableValue(Server.HtmlDecode(Request.Form["SQLParam"].ToString()));
StringBuilder strSQL = new StringBuilder();
strSQL.AppendLine("!select A.KHLXR_LXRID as CODE, case when isnull(A.KHLXR_XM,' ') = ' ' then A.KHLXR_CW else A.KHLXR_XM end as Message ");
strSQL.AppendLine(" from KHLXR A ");
@@ -7360,9 +7361,9 @@ namespace GThinking.U20261363_N_XLXSBJ
// }
//}
private Hashtable GetHashtableValue(string sSQLParam)
private Dictionary<string, string> GetHashtableValue(string sSQLParam)
{
Hashtable hParam = new Hashtable();
Dictionary<string, string> hParam = new Dictionary<string, string>();
hParam.Clear();
if (!sSQLParam.Trim().Equals(""))
{
@@ -21047,7 +21048,7 @@ namespace GThinking.U20261363_N_XLXSBJ
//价格表行情料价调整
protected void btnCLCB_MenuItemClick(object sender, string value)
{
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
{
@@ -21072,7 +21073,7 @@ namespace GThinking.U20261363_N_XLXSBJ
DRWLJCP(txtBJDID.Text.Trim(),cbxBJFLID.SelectedValue.Trim());
break;
case "SCBJ":
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
string[] sTempArr = grdXLBJDMX.CheckedRows.Split(new char[] { ',' });
foreach (string sIndex in sTempArr)
{
@@ -21080,9 +21081,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
string sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
pageParams.UrlPath = "XLBJD_MX_YZInfo.aspx";
@@ -21284,7 +21286,7 @@ namespace GThinking.U20261363_N_XLXSBJ
//价格表行情料价调整
protected void btnLJ_MenuItemClick(object sender, string value)
{
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
switch (value)
{
@@ -21397,15 +21399,16 @@ namespace GThinking.U20261363_N_XLXSBJ
ShowMessage("请选择一条需要调整的报价产品！");
return;
}
string sBJDXH = "";
StringBuilder sbBJDXH = new StringBuilder("");
foreach (GridViewRow Row in grdXLBJDMX.NewRows)
{
if (grdXLBJDMX.RowIsChecked(Row))
{
string sTmp = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", Row).Trim();
sBJDXH += sTmp + ",";
sbBJDXH.Append(sTmp + ",");
}
}
string sBJDXH = sbBJDXH.ToString();
sBJDXH = sBJDXH.TrimEnd(',');
if(sBJDXH.Equals(""))
sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", grdXLBJDMX.SelectedIndex).Trim();
@@ -22723,16 +22726,17 @@ namespace GThinking.U20261363_N_XLXSBJ
// return;
//}
string[] sTempArr = grdXLBJDMX.CheckedRows.Split(new char[] { ',' });
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
foreach (string sIndex in sTempArr)
{
int iRowIndex = CMISproConvert.StrToInt(sIndex.Trim());
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
string sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
//UFC_20191806_N_XL8
@@ -22984,6 +22988,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -22996,8 +23001,9 @@ namespace GThinking.U20261363_N_XLXSBJ
{
int iRowIndex = CMISproConvert.StrToInt(sIndex.Trim());
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
@@ -23011,7 +23017,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
//价格表表价调整
protected void btnRefreshJGBBJTZ_Click(object sender, EventArgs e)
protected void btnRefreshJGBBJTZ_Click(object sender, EventArgs e)
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
@@ -23030,6 +23036,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23042,8 +23049,9 @@ namespace GThinking.U20261363_N_XLXSBJ
{
int iRowIndex = CMISproConvert.StrToInt(sIndex.Trim());
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
SQL.Clear();
@@ -23089,7 +23097,8 @@ namespace GThinking.U20261363_N_XLXSBJ
btnOnlyRefresh_Click(null, null);
}
protected void btnRefreshJGBBJSC_Click(object sender, EventArgs e)
protected void
btnRefreshJGBBJSC_Click(object sender, EventArgs e)
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
@@ -23107,6 +23116,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23119,8 +23129,9 @@ namespace GThinking.U20261363_N_XLXSBJ
{
int iRowIndex = CMISproConvert.StrToInt(sIndex.Trim());
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
SQL.Clear();
@@ -23178,6 +23189,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23192,9 +23204,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
else if(txtPLSZAll.Value.Trim().Equals("D"))
@@ -23290,7 +23303,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
btnRefreshDRBJDMX_Click(null, null);
}
}
//下浮
protected void btnRefreshBJXF_Click(object sender, EventArgs e)
@@ -23306,6 +23319,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23320,9 +23334,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
else if (txtPLSZAll.Value.Trim().Equals("D"))
@@ -23414,13 +23429,13 @@ namespace GThinking.U20261363_N_XLXSBJ
{
ShowMessage("批量调价-下浮出现错误，请联系系统管理员！" + ex);
dberp.RollbackTrans();
}
}
btnRefreshDRBJDMX_Click(null, null);
}
//表价价差率
protected void btnRefreshBJJCL_Click(object sender, EventArgs e)
protected void btnRefreshBJJCL_Click(object sender, EventArgs e)
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
@@ -23449,6 +23464,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23463,9 +23479,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
@@ -23664,11 +23681,11 @@ namespace GThinking.U20261363_N_XLXSBJ
ShowMessage("批量调价-表价价差率出现错误，请联系系统管理员！" + ex);
dberp.RollbackTrans();
}
btnRefreshDRBJDMX_Click(null, null);
btnRefreshDRBJDMX_Click(null, null);
}
//料价价差率
//注意----跳过表价不为0的记录
//注意----跳过表价不为0的记录
protected void btnRefreshLJJCL_Click(object sender, EventArgs e)
{
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
@@ -23700,6 +23717,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (sSZFW.Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23713,9 +23731,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
@@ -23727,7 +23746,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sErrorMsg = "";
PLTJ_LJJCL(sBJDXHList, 0, sBJDID, sBJFLID, dCLCBLR, sCLCBLX, sCZLM, sJCLLX, sLJJCLLX, sZDXJJCLLX, sJYF, sYFWLID, sBJHYF, sCPBJMRXSWS, tmpXSWS, GetOption(100860000, "BJU002"), bWBJ, bFWG, ref sErrorMsg);
if (!sErrorMsg.Equals(""))
{
{
ShowMessage(sErrorMsg);
}
btnOnlyRefresh_Click(null, null);
@@ -23760,6 +23779,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL SQL = new TSQL(dberp);
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (sSZFW.Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23773,9 +23793,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
@@ -23793,6 +23814,7 @@ namespace GThinking.U20261363_N_XLXSBJ
protected void btnRefreshPLTZBZ_Click(object sender, EventArgs e)
{
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23807,9 +23829,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
UpdateBJCPByXLBZID(txtBJDID.Text.Trim(), sBJDXHList, XLBJDUtils.ISDZBZ(txtPLSZBZID.Value.Trim()) ? "Y" : "N");
@@ -23832,13 +23855,14 @@ namespace GThinking.U20261363_N_XLXSBJ
//是否整单调整
pageParams.AddString("txtPLSZAllCID", txtPLSZAll.ClientID);
pageParams.AddString("btnRefreshKHWL", btnRefreshKHWL.ClientID);
OpenDialog(pageParams);
pageParams.AddString("btnRefreshKHWL", btnRefreshKHWL.ClientID);
OpenDialog(pageParams);
}
protected void btnRefreshKHWL_Click(object sender, EventArgs e)
{
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
if (txtPLSZAll.Value.Trim().Equals("N"))//调价范围：N|勾选记录
{
if (!(grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows)))
@@ -23853,9 +23877,10 @@ namespace GThinking.U20261363_N_XLXSBJ
string sBJDXH = grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XH", iRowIndex);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
}
sBJDXHList = sbBJDXHList.ToString();
sBJDXHList = sBJDXHList.TrimEnd(',');
}
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
@@ -25115,8 +25140,8 @@ namespace GThinking.U20261363_N_XLXSBJ
pageParams.AddString("XLGGID", grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XLGGID", grdXLBJDMX._SelectedIndex));
pageParams.AddString("XLBZID", grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_XLBZID", grdXLBJDMX._SelectedIndex));
pageParams.AddString("DYDJID", grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_DYDJID", grdXLBJDMX._SelectedIndex));
OpenModuleDialog(100860122, pageParams, btnRefreshCLHQTZ.ClientID);
}
OpenModuleDialog(100860122, pageParams, btnRefreshCLHQTZ.ClientID);
}
@@ -25147,8 +25172,11 @@ namespace GThinking.U20261363_N_XLXSBJ
lst.Clear();
string sFirstXH = "0";
string sBJDXHList = "";
StringBuilder sbBJDXHList = new StringBuilder("");
string sBJDXHList_GX_SD = "";
string sBJDXHList_GX_WSD = "";
StringBuilder sbBJDXHList_GX_SD = new StringBuilder("");
StringBuilder sbBJDXHList_GX_WSD = new StringBuilder("");
if (grdXLBJDMX.CheckBox && !String.IsNullOrEmpty(grdXLBJDMX.CheckedRows))
{
string[] sTempArr = grdXLBJDMX.CheckedRows.Split(new char[] { ',' });
@@ -25159,21 +25187,24 @@ namespace GThinking.U20261363_N_XLXSBJ
lst.Add(sBJDXH);
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
sBJDXHList += sBJDXH + ",";
sbBJDXHList.Append(sBJDXH + ",");
}
if (!sBJDXH.Equals("") && !sBJDXH.Equals("0"))
{
if (grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_BJSDBZ", iRowIndex).ToString().Trim().Equals("Y"))
{
sBJDXHList_GX_SD += sBJDXH + ",";
sbBJDXHList_GX_SD.Append(sBJDXH + ",");
}
else
{
sBJDXHList_GX_WSD += sBJDXH + ",";
sbBJDXHList_GX_WSD.Append(sBJDXH + ",");
}
}
}
sBJDXHList_GX_WSD = sbBJDXHList_GX_WSD.ToString();
sBJDXHList_GX_SD = sbBJDXHList_GX_SD.ToString();
sBJDXHList = sbBJDXHList.ToString();
}
sBJDXHList = sBJDXHList.TrimStart(',').TrimEnd(',');
sBJDXHList_GX_SD = sBJDXHList_GX_SD.TrimStart(',').TrimEnd(',');
XLBJDUtils.cs
+67 -46
View File
@@ -3185,7 +3185,7 @@ namespace GThinking.U20261363_N_XLXSBJ
}
public static void UpdateBJDMX(TDatabase dberp, TSQL SQL, string sBJFLID, string sBJDID, int tmpXSWS, string sJCLLX, string sLJJCLLX, string sCPBJMRXSWS, string sXHList, int minBJDXH, bool bYBJ, bool bWG, bool bFWG, string sTLcpList, DateTime tWHSJCondition, bool bYLZD,int VBJDID)
{
{
string sTZQCPBJGS = XLBJDUtils.GetTZQCPBJGS(sBJFLID);
string sBJLJJCLLX = "";
string sJSJJCLLX = "";
@@ -3237,7 +3237,7 @@ namespace GThinking.U20261363_N_XLXSBJ
string sTJYZID = dsBJDYZ.Tables[0].Rows[0]["XLXSTZYZ_TJYZID"].ToString().Trim();
string sJJFS = dsBJDYZ.Tables[0].Rows[0]["XLXSTZYZ_JJFS"].ToString().Trim();
string sBTYZJYSQL = "";//必填因子校验SQL
string sBTYZSQL = "";//必填因子SQL
StringBuilder sbBTYZSQL = new StringBuilder("");//必填因子SQL
for (int i = 1; i < dsBJDYZ.Tables[0].Rows.Count; i++)
{
if (!sTJYZID.Equals(dsBJDYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYZID"].ToString().Trim()))
@@ -3309,9 +3309,10 @@ namespace GThinking.U20261363_N_XLXSBJ
sBTYZJYSQL = "*( case ";
string sBTYZZ_SQL = string.Format("XLXSBJDYZZ0_YZZ{0}", dsBJDYZ.Tables[0].Rows[i]["XLXSBJFLYZ_YZID"].ToString().Trim().Replace("BJ", ""));
sBTYZJYSQL += "when " + sBTYZZ_SQL + " = 0 then 0 ";
sBTYZSQL += "," + sBTYZZ_SQL;
sbBTYZSQL.Append("," + sBTYZZ_SQL);
}
}
string sBTYZSQL = sbBTYZSQL.ToString();
if (!sBTYZJYSQL.Equals(""))
sBTYZJYSQL += " else 1 end )";
//true表示先加价
@@ -6488,7 +6489,7 @@ namespace GThinking.U20261363_N_XLXSBJ
//------根据报价分类获取因子列
//构建报价单因子字符串，供后续直接使用而不再查询，返回格式：BJ01|开票(JD),BJ02|ZR（阻燃）(JD),BJ10|其它()
public static Dictionary<string, string> GetBJDYZ(string sBJFLID)
{
{
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL SQL = new TSQL(dberp);
SQL.Clear();
@@ -6506,18 +6507,18 @@ namespace GThinking.U20261363_N_XLXSBJ
if (!sBJFLID.Trim().Equals(""))
SQL.ParamByName("pBJFLID").Value = sBJFLID.Trim();
DataSet ds = dberp.OpenDataSet(SQL);
string sBJDYZ = "";
StringBuilder sbBJDYZ = new StringBuilder("");
string sTJYSList = "";
string sYZWPIDList = "";
string sZDWPIDList = "";
string sHCYZIDList = "";
string sHCYZMCList = "";
string sReadOnlyYZ = "";
string sPFYZ = "";
string sBZPFYZ = "";
string sCPWJPF = "";
string sBTYZ = "";
string sXSJEYZ = "";
StringBuilder sbYZWPIDList = new StringBuilder("");
StringBuilder sbZDWPIDList = new StringBuilder("");
StringBuilder sbHCYZIDList = new StringBuilder("");
StringBuilder sbHCYZMCList = new StringBuilder("");
StringBuilder sbReadOnlyYZ = new StringBuilder("");
StringBuilder sbPFYZ = new StringBuilder("");
StringBuilder sbBZPFYZ = new StringBuilder("");
StringBuilder sbCPWJPF = new StringBuilder("");
StringBuilder sbBTYZ = new StringBuilder("");
StringBuilder sbXSJEYZ = new StringBuilder("");
string sFSYZID = "";
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
@@ -6533,7 +6534,7 @@ namespace GThinking.U20261363_N_XLXSBJ
sJJFS = "XX";
}
}
sBJDYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_YZMC"].ToString().Trim() + "(" + sJJFS + "),";
sbBJDYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_YZMC"].ToString().Trim() + "(" + sJJFS + "),");
//构建 报价分类使用到的调价因素
if (ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("Y"))
@@ -6578,46 +6579,46 @@ namespace GThinking.U20261363_N_XLXSBJ
//sYZWPIDList格式：BJ01|0010,0020;BJ02|0020
if (!ds.Tables[0].Rows[i]["XLXSTZYZ_WPIDLIST"].ToString().Trim().Equals(""))
{
sYZWPIDList += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_WPIDLIST"].ToString().Trim() + ";";
sbYZWPIDList.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_WPIDLIST"].ToString().Trim() + ";");
}
if (!ds.Tables[0].Rows[i]["XLXSTZYZ_ZDWPIDLIST"].ToString().Trim().Equals(""))
{
sZDWPIDList += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_ZDWPIDLIST"].ToString().Trim() + ";";
sbZDWPIDList.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_ZDWPIDLIST"].ToString().Trim() + ";");
}
//只存 互斥 且 使用 且 参与调价
if (ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("Y")
&& ds.Tables[0].Rows[i]["XLXSTZYZ_HCBZ"].ToString().Trim().Equals("Y")
&& ds.Tables[0].Rows[i]["XLXSTZYZ_BCYTJ"].ToString().Trim().Equals("N"))
{
sHCYZIDList += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ";";
sHCYZMCList += ds.Tables[0].Rows[i]["XLXSTZYZ_YZMC"].ToString().Trim() + "、";
sbHCYZIDList.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ";");
sbHCYZMCList.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZMC"].ToString().Trim() + "、");
}
sReadOnlyYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_YZZZD"].ToString().Trim() + ",";
sbReadOnlyYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + "|" + ds.Tables[0].Rows[i]["XLXSTZYZ_YZZZD"].ToString().Trim() + ",");
//盘费因子
if (ds.Tables[0].Rows[i]["XLXSTZYZ_TJMDID"].ToString().Trim().Equals("100860080"))
{
sPFYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",";
sbPFYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",");
}
//包装方式
if (ds.Tables[0].Rows[i]["XLXSTZYZ_TJMDID"].ToString().Trim().Equals("100860124"))
{
sBZPFYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",";
sbBZPFYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",");
}
//产品外径盘费
if (ds.Tables[0].Rows[i]["XLXSTZYZ_TJMDID"].ToString().Trim().Equals("100860162"))
{
sCPWJPF += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",";
sbCPWJPF.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",");
}
//必填因子
if (ds.Tables[0].Rows[i]["BTYZ"].ToString().Trim().Equals("Y") && ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("Y"))
{
sBTYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",";
sbBTYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",");
}
//显示金额因子
if (ds.Tables[0].Rows[i]["XSJE"].ToString().Trim().Equals("Y"))
{
sXSJEYZ += ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",";
sbXSJEYZ.Append(ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim() + ",");
}
//反算因子因子
if (ds.Tables[0].Rows[i]["FSYZ"].ToString().Trim().Equals("Y") && ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("Y"))
@@ -6625,6 +6626,17 @@ namespace GThinking.U20261363_N_XLXSBJ
sFSYZID = ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim();
}
}
string sZDWPIDList = sbZDWPIDList.ToString();
string sYZWPIDList = sbYZWPIDList.ToString();
string sXSJEYZ = sbXSJEYZ.ToString();
string sReadOnlyYZ = sbReadOnlyYZ.ToString();
string sPFYZ = sbPFYZ.ToString();
string sHCYZMCList = sbHCYZMCList.ToString();
string sHCYZIDList = sbHCYZIDList.ToString();
string sCPWJPF = sbCPWJPF.ToString();
string sBZPFYZ = sbBZPFYZ.ToString();
string sBTYZ = sbBTYZ.ToString();
string sBJDYZ = sbBJDYZ.ToString();
Dictionary<string, string> dicBJDYZ = new Dictionary<string, string>();
dicBJDYZ.Add("BJDYZ", sBJDYZ.TrimEnd(','));
dicBJDYZ.Add("TJYSList", sTJYSList);
@@ -7134,7 +7146,7 @@ namespace GThinking.U20261363_N_XLXSBJ
public static void UpdateXLXSBJDJCXJ4(TDatabase dberp, TSQL SQL, string sBJDID)
{
{
if (GetXLXSBJPZXX(100860008).XLXSBJPZ_JLXJXXHZFS != "4")
return;
@@ -7274,16 +7286,18 @@ namespace GThinking.U20261363_N_XLXSBJ
ds = dberp.OpenDataSet(SQL);
if (ds.Tables[0].Rows.Count > 0)
{
string sZDXJJEHZ = "''";
string sZDXJJCLHZ = "''";
StringBuilder sbZDXJJEHZ = new StringBuilder("''");
StringBuilder sbZDXJJCLHZ = new StringBuilder("''");
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
string sHZFS = ds.Tables[0].Rows[i]["HZFS"].ToString().Trim();
string sZDXJJE = NumberUtils.RoundX(CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDMX_ZDXJZJE"].ToString().Trim()), 2).ToString();
string sZDXJJCL = NumberUtils.RoundX(CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDMX_ZDXJJCL"].ToString().Trim()), 2).ToString();
sZDXJJEHZ += "||'" + sHZFS + ":" + sZDXJJE + "元'||char(13)||char(10)";
sZDXJJCLHZ += "||'" + sHZFS + ":" + sZDXJJCL + "%'||char(13)||char(10)";
sbZDXJJEHZ.Append("||'" + sHZFS + ":" + sZDXJJE + "元'||char(13)||char(10)");
sbZDXJJCLHZ.Append("||'" + sHZFS + ":" + sZDXJJCL + "%'||char(13)||char(10)");
}
string sZDXJJEHZ = sbZDXJJEHZ.ToString();
string sZDXJJCLHZ = sbZDXJJCLHZ.ToString();
SQL.Clear();
SQL.Add("insert into XLXSBJDJCXJ4(XLXSBJDJCXJ4_BJDID,XLXSBJDJCXJ4_ZDXJJEXJ,XLXSBJDJCXJ4_ZDXJJCLXJ) ");
SQL.Add(" values(:pBJDID," + sZDXJJEHZ + "," + sZDXJJCLHZ + ")");
@@ -8176,7 +8190,7 @@ namespace GThinking.U20261363_N_XLXSBJ
/// 通用计算，dicXLJBXX要求（必须）：XLXHID-KVV, XLGGID-1*2.5, XLBZID-G,DYDJID-0.6/1kV，XSWS-5，XH-3，BJDID-BJ20210001、
/// flag标志为0，表示从明细手动编辑调整需要调整计算公式
public static Dictionary<string, string> GetJGBTZYZ_JGE(string sJGEJGBID, string flag, DataSet dsJGBYZ, Dictionary<string, string> dicXLJBXX)
{
{
//汇总因子，用于更新----总计10个最终赋值dicJGBTZYZGS进行输出
Dictionary<string, double> dicJGBYZZ = new Dictionary<string, double>();
//用于记录调整因子的值
@@ -8187,46 +8201,53 @@ namespace GThinking.U20261363_N_XLXSBJ
string sKDSQL = "1";
string sJJSQL = "0";
string sSXSQL = "1";
string sTJYSList_ = "";//记录调价因素为空的因子id
string sTJYSList1 = "";//记录调价因素为'1'的因子id
string sTJYSList3 = "";//记录调价因素为'1'的因子id
string sTJYSList4 = "";//记录调价因素为'4'的因子id
string sTJYSList5 = "";//记录调价因素为'5'的因子id
string sTJYSList8 = "";//记录调价因素为'8'的因子id
string sTJYSList9 = "";//记录调价因素为'9'的因子id
StringBuilder sbTJYSList_ = new StringBuilder("");//记录调价因素为空的因子id
StringBuilder sbTJYSList1 = new StringBuilder("");//记录调价因素为'1'的因子id
StringBuilder sbTJYSList3 = new StringBuilder("");//记录调价因素为'1'的因子id
StringBuilder sbTJYSList4 = new StringBuilder("");//记录调价因素为'4'的因子id
StringBuilder sbTJYSList5 = new StringBuilder("");//记录调价因素为'5'的因子id
StringBuilder sbTJYSList8 = new StringBuilder("");//记录调价因素为'8'的因子id
StringBuilder sbTJYSList9 = new StringBuilder("");//记录调价因素为'9'的因子id
if (dsJGBYZ.Tables[0].Rows.Count > 0)
{
for (int i = 0; i < dsJGBYZ.Tables[0].Rows.Count; i++)
{
if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals(""))
{
sTJYSList_ += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList_.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("1"))
{
sTJYSList1 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList1.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("3"))
{
sTJYSList3 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList3.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("4"))
{
sTJYSList4 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList4.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("5"))
{
sTJYSList5 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList5.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("8"))
{
sTJYSList8 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList8.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
else if (dsJGBYZ.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("9"))
{
sTJYSList9 += dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",";
sbTJYSList9.Append(dsJGBYZ.Tables[0].Rows[i]["XLXSJGBYZ_YZID"].ToString().Trim() + ",");
}
}
string sTJYSList_ = sbTJYSList_.ToString();
string sTJYSList9 = sbTJYSList9.ToString();
string sTJYSList8 = sbTJYSList8.ToString();
string sTJYSList5 = sbTJYSList5.ToString();
string sTJYSList4 = sbTJYSList4.ToString();
string sTJYSList3 = sbTJYSList3.ToString();
string sTJYSList1 = sbTJYSList1.ToString();
sTJYSList_ = sTJYSList_.TrimEnd(',');
sTJYSList1 = sTJYSList1.TrimEnd(',');
sTJYSList3 = sTJYSList3.TrimEnd(',');
XLBJD_BDOBill.cs
+6 -5
View File
@@ -1306,7 +1306,7 @@ namespace GThinking.U20261363_N_XLXSBJ
public static string getZDZDLX(string sBJDID)
{
{
if (XLBJDUtils.GetXLXSBJPZXX(100860068).XLXSBJPZ_ZDZDLX.Equals(""))
return "";
string sZDLXList = string.Empty;
@@ -1367,7 +1367,7 @@ namespace GThinking.U20261363_N_XLXSBJ
if (!dicYYZDLX.ContainsKey(sZDLXNum[j]))
{
dicYYZDLX.Add(sZDLXNum[j], dicZDLX[sZDLXNum[j]]);
sZDLXList+=dicZDLX[sZDLXNum[j]]+";";
sZDLXList += dicZDLX[sZDLXNum[j]]+";";
}
}
@@ -1915,7 +1915,7 @@ namespace GThinking.U20261363_N_XLXSBJ
public static void JudgeDifBJCP(string sBJDID, string sBJU003, ref string WarningMsg, string sXTCPBJYZ)
{
{
List<string> lst = new List<string>();
lst.Clear();
@@ -1994,11 +1994,12 @@ namespace GThinking.U20261363_N_XLXSBJ
}
if (dicA.Count > 1)
{
string sXHList = "";
StringBuilder sbXHList = new StringBuilder("");
foreach (string sKeyA in dicA.Keys)
{
sXHList += "[" + dicA[sKeyA] + "] ";
sbXHList.Append("[" + dicA[sKeyA] + "] ");
}
string sXHList = sbXHList.ToString();
lst.Add(sXHList);
}
}