提交所有文件3
This commit is contained in:
+68
-28
@@ -13006,8 +13006,13 @@ namespace GThinking.N_XLXSBJ
|
||||
grdXLBJDMX.FindColumnByFieldName("XLXSBJDMX_DYDJID").ReadOnly = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
chkJZBJHS.Checked = true;
|
||||
if (cbxBJFLID.SelectedValue.Trim() == "04")
|
||||
{
|
||||
chkJZBJHS.Checked = false;
|
||||
}
|
||||
|
||||
|
||||
//报价分类change，重新加载cbxJGBID
|
||||
SetcbxJGBID();
|
||||
@@ -15886,6 +15891,7 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
protected void grdXLBJDMX_CalculateField(object sender, CalculateFieldEventArgs e)
|
||||
{
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-1");
|
||||
bool sBJU064 = GetOption("BJU064").Equals("Y");
|
||||
bool isChanged = false;
|
||||
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(e.MasterDataSet["cbxBJFLID"].Trim());
|
||||
@@ -16076,6 +16082,7 @@ namespace GThinking.N_XLXSBJ
|
||||
if (e.EventFieldName.Equals("XLXSBJDMX_XLXHID") || e.EventFieldName.Equals("XLXSBJDMX_XLGGID" )|| e.EventFieldName.Equals("XLXSBJDMX_GYKH") || e.EventFieldName.Equals("XLXSBJDMX_KHWLID")
|
||||
|| e.EventFieldName.Equals("XLXSBJDMX_XLBZID") || e.EventFieldName.Equals("XLBZ_XLBZMS") || e.EventFieldName.Equals("XLXSBJDMX_DYDJID"))
|
||||
{
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-2");
|
||||
string sDYDJID = e.RowData["XLXSBJDMX_DYDJID"].ToString().Trim().Split('|')[0].Trim();
|
||||
string sXLXHID = e.RowData["XLXSBJDMX_XLXHID"].ToString().Trim();
|
||||
string sXLGGID = e.RowData["XLXSBJDMX_XLGGID"].ToString().Trim();
|
||||
@@ -16354,7 +16361,7 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-3");
|
||||
#region 型号-规格-标准-电压等级-颜色
|
||||
|
||||
if (e.EventFieldName.Equals("XLXSBJDMX_XLXHID") || e.EventFieldName.Equals("XLXSBJDMX_XLGGID")||e.EventFieldName.Equals("XLXSBJDMX_GYKH") || e.EventFieldName.Equals("XLXSBJDMX_KHWLID")
|
||||
@@ -16365,10 +16372,11 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
|
||||
#endregion
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4");
|
||||
#region 型号-规格-标准-电压等级-计量单位
|
||||
if (e.EventFieldName.Equals("XLXSBJDMX_XLXHID") || e.EventFieldName.Equals("XLXSBJDMX_XLGGID")||e.EventFieldName.Equals("XLXSBJDMX_GYKH") || e.EventFieldName.Equals("XLXSBJDMX_KHWLID")
|
||||
|| e.EventFieldName.Equals("XLXSBJDMX_XLBZID") || e.EventFieldName.Equals("XLBZ_XLBZMS") || e.EventFieldName.Equals("XLXSBJDMX_DYDJID")
|
||||
|| e.EventFieldName.Equals("XLXSBJDMX_JLDW") || e.EventFieldName.Equals("XLXSBJDMX_BJSL"))
|
||||
|| e.EventFieldName.Equals("XLXSBJDMX_JLDW") || e.EventFieldName.Equals("XLXSBJDMX_BJSL") || e.EventFieldName.Equals("XLXSBJDMX_WGCPBZ"))
|
||||
{
|
||||
string sXLXHID = e.RowData["XLXSBJDMX_XLXHID"].ToString().Trim();
|
||||
string sXLGGID = e.RowData["XLXSBJDMX_XLGGID"].ToString().Trim();
|
||||
@@ -16388,6 +16396,7 @@ namespace GThinking.N_XLXSBJ
|
||||
|
||||
bool changeXLBZ = false;//标准、电压等级是否重新赋值了
|
||||
bool changeDYDJ = false;//标准、电压等级是否重新赋值了
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.1");
|
||||
if (e.EventFieldName.Equals("XLXSBJDMX_XLXHID") || e.EventFieldName.Equals("XLXSBJDMX_XLGGID"))
|
||||
{
|
||||
if (!sXLXHID.Equals("") || !sXLGGID.Equals(""))
|
||||
@@ -16634,6 +16643,8 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.2");
|
||||
//匹配下单线缆标准
|
||||
string sXDXLBZID = XLBJDUtils.GetXDXLBZID(sXLXHID, sDYDJID, sXLGGID, sXLBZID);
|
||||
e.ResultPairs.Add("XLXSBJDMX_XDXLBZID", sXDXLBZID);
|
||||
@@ -16657,6 +16668,8 @@ namespace GThinking.N_XLXSBJ
|
||||
e.ResultPairs.Add("XLXSBJDMX_DZSC", "N");
|
||||
AddChangedField(dicChangedField, "XLXSBJDMX_DZSC", "N");
|
||||
}
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.3");
|
||||
string sBJU018 = GetOption("BJU018");
|
||||
string sJGBJLDW = XLBJDUtils.GetJGBJLDW(sJGBID, sXLXHID, sXLGGID, sXLBZID, sDYDJID, sBJU003, sBJU018);//提前依据sBJU018判断是否取精确价格单位
|
||||
string sJGBJSDW = XLBJDUtils.GetsJSDW(sJGBJLDW, sBJU003);
|
||||
@@ -16669,7 +16682,7 @@ namespace GThinking.N_XLXSBJ
|
||||
sJLDW = sJGBJLDW;
|
||||
}
|
||||
}
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.4");
|
||||
//产品目录名称赋值
|
||||
if (!sXLXHID.Equals(""))
|
||||
{
|
||||
@@ -16702,6 +16715,8 @@ namespace GThinking.N_XLXSBJ
|
||||
e.ResultPairs.Add("XLXSBJDMX_ZHCPMLMC", "");
|
||||
}
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.5");
|
||||
|
||||
//有无清单
|
||||
if (CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSCLQD where XLXSCLQD_WPID='ZZZZ' and XLXSCLQD_XLXHID='{0}' and XLXSCLQD_XLGGID='{1}' and XLXSCLQD_XLBZID='{2}' and XLXSCLQD_DYDJID='{3}'",
|
||||
sXLXHID, sXLGGID, sXLBZID, sDYDJID.Equals("") ? " " : sDYDJID)))
|
||||
@@ -16723,7 +16738,11 @@ namespace GThinking.N_XLXSBJ
|
||||
string sWGCPBZ = "N";
|
||||
string sJGFBZ = "N";
|
||||
int iJGBTJYZYC = 1;
|
||||
if (XLBJDUtils.IsWGCP(sXLXHID, sXLGGID, sXLBZID, sDYDJID))
|
||||
if (e.EventFieldName.Equals("XLXSBJDMX_WGCPBZ"))
|
||||
{
|
||||
sWGCPBZ = e.EventFieldValue=="Y"?"Y":"N";
|
||||
}
|
||||
else if (XLBJDUtils.IsWGCP(sXLXHID, sXLGGID, sXLBZID, sDYDJID))
|
||||
sWGCPBZ = "Y";
|
||||
if (XLBJDUtils.IsJGFJGBMX(e.MasterDataSet["datBJRQ"].Trim(), sXLXHID, sXLGGID, sXLBZID, sDYDJID))
|
||||
{
|
||||
@@ -16761,6 +16780,7 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
else
|
||||
{
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.6");
|
||||
if (!XLBJDUtils.IsJGEJGB(e.MasterDataSet["cbxJGBID"].Trim()))//是否表价实时计算价格表
|
||||
{
|
||||
//M、KM、米、千米、KG、T、千克、公斤、吨
|
||||
@@ -17005,6 +17025,7 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
else//表价实时计算价格表
|
||||
{
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.7");
|
||||
//M、KM、米、千米、KG、T、千克、公斤、吨
|
||||
if (XLBJDUtils.sJCJLDWList.IndexOf(sJGBJSDW.ToUpper()) >= 0
|
||||
&& XLBJDUtils.sJCJLDWList.IndexOf(sJLDW.ToUpper()) >= 0)
|
||||
@@ -17054,7 +17075,7 @@ namespace GThinking.N_XLXSBJ
|
||||
Dictionary<string, string> dicXLJBXX_JGE = new Dictionary<string, string>();
|
||||
XLBJDUtils.GetdsJGBYZ_JGE(e.MasterDataSet["cbxJGBID"].Trim(), ref dsJGBYZ);
|
||||
sJGBTJYSS = XLBJDUtils.GetJGBTJYSSByBJFLID(sBJFLID);
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.8");
|
||||
dicXLJBXX_JGE.Clear();
|
||||
dicXLJBXX_JGE.Add("XLXHID", sXLXHID);
|
||||
dicXLJBXX_JGE.Add("XLGGID", sXLGGID);
|
||||
@@ -17065,12 +17086,13 @@ namespace GThinking.N_XLXSBJ
|
||||
dicXLJBXX_JGE.Add("LJ", e.MasterDataSet["txtLJ"].Trim());
|
||||
dicXLJBXX_JGE.Add("JLDW", sJLDW);
|
||||
dicXLJBXX_JGE.Add("BJSL", e.RowData["XLXSBJDMX_BJSL"].ToString().Trim());
|
||||
|
||||
|
||||
dicJGBTZYZGS_JGE = XLBJDUtils.GetJGBTZYZ_JGE(e.MasterDataSet["cbxJGBID"].Trim(), "0", dsJGBYZ, dicXLJBXX_JGE);
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.1");
|
||||
string srs = XLBJDUtils.GetCJ(sBJRQ,dicXLJBXX_JGE, sCLCB, sBJDHQCLCB, e.MasterDataSet["txtBJDID"].Trim(), e.MasterDataSet["cbxBJFLID"].Trim(), iXSWS, dicJGBTZYZGS_JGE["JZ01"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ02"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ03"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ04"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ05"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ06"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ07"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ08"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ09"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ10"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ11"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ11"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ11"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ13"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ16"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ19"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].Trim() + "|0");
|
||||
@@ -17078,13 +17100,16 @@ namespace GThinking.N_XLXSBJ
|
||||
string sCJ = srs.Split(',')[0];
|
||||
string sJJlist = srs.Split(',')[1];
|
||||
e.ResultPairs.Add("XLXSBJDMX_CJ",sCJ);
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.2");
|
||||
string[] strJJYZZ = sJJlist.ToString().Trim().Split('|');
|
||||
for (int i = 1; i <= strJJYZZ.Length; i++)
|
||||
{
|
||||
dicJGBTZYZGS_JGE["JZ" + i.ToString().PadLeft(2, '0')] = strJJYZZ[i - 1];
|
||||
}
|
||||
|
||||
Mac.MacLog.TraceFormat("strJJYZZ" + i.ToString() + ":" + strJJYZZ[i - 1]);
|
||||
|
||||
}
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.3");
|
||||
|
||||
AddChangedField(dicChangedField, "UpdJJYZList", dicJGBTZYZGS_JGE["JZ01"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ02"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ03"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ04"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ05"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ06"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ07"].Trim()
|
||||
@@ -17166,13 +17191,15 @@ namespace GThinking.N_XLXSBJ
|
||||
dicJDYZXS.Add(sYZID, 1);
|
||||
}
|
||||
|
||||
for (int i = 1; i <= 10; i++)
|
||||
for (int i = 1; i <= 20; i++)
|
||||
{
|
||||
string sYZID = "JZ" + i.ToString().PadLeft(2, '0');
|
||||
if (dicJGBTZYZGS_JGE.ContainsKey(sYZID) && dicJDYZXS.ContainsKey(sYZID))
|
||||
{
|
||||
double sYZZ = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE[sYZID].Trim(), 0) * dicJDYZXS[sYZID];
|
||||
dicJGBTZYZGS_JGE[sYZID] = sYZZ.ToString();
|
||||
Mac.MacLog.TraceFormat("dicJGBTZYZGS_JGE" + i.ToString() + ":" + sYZZ.ToString());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18330,7 +18357,7 @@ namespace GThinking.N_XLXSBJ
|
||||
DoAfterCalcCPBJ(e, bBJSDBZ, dCLCB, dBJDHQCLCB, dCPJJ, dCPBJ, dBJSL, sCPBJMRXSWS, ref dicChangedField);
|
||||
}
|
||||
#endregion
|
||||
|
||||
Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-5");
|
||||
#region 颜色
|
||||
|
||||
//如果线缆颜色变了，则需要重新获取按“D|颜色”设置的调价因子值
|
||||
@@ -30250,7 +30277,7 @@ namespace GThinking.N_XLXSBJ
|
||||
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
|
||||
TSQL sql = new TSQL(dberp);
|
||||
sql.Clear();
|
||||
sql.Add(" select XLXSBJDMX_XLXHID,XLXSBJDMX_XLGGID,XLXSBJDMX_XLBZID,XLXSBJDMX_DYDJID,XLXSBJDMX_XSSX ");
|
||||
sql.Add(" select XLXSBJDMX_BJCP,XLXSBJDMX_XLXHID,XLXSBJDMX_XLGGID,XLXSBJDMX_XLBZID,XLXSBJDMX_DYDJID,XLXSBJDMX_XSSX ");
|
||||
for (int i = 1; i <= 80; i++)
|
||||
{
|
||||
string sL = i.ToString().PadLeft(2, '0');
|
||||
@@ -30294,6 +30321,7 @@ namespace GThinking.N_XLXSBJ
|
||||
{
|
||||
dicCLQD = new Dictionary<string, Dictionary<string, XLCLQDLEntity>>(estimatedCapacity);
|
||||
}
|
||||
int bjcpIndex = ds.Tables[0].Columns.IndexOf("XLXSBJDMX_BJCP");
|
||||
int xlxhIdIndex = ds.Tables[0].Columns.IndexOf("XLXSBJDMX_XLXHID");
|
||||
int xlggIdIndex = ds.Tables[0].Columns.IndexOf("XLXSBJDMX_XLGGID");
|
||||
int xlbzIdIndex = ds.Tables[0].Columns.IndexOf("XLXSBJDMX_XLBZID");
|
||||
@@ -30310,6 +30338,7 @@ namespace GThinking.N_XLXSBJ
|
||||
|
||||
// 使用StringBuilder构建键
|
||||
keyBuilder.Length = 0; // 清空StringBuilder
|
||||
keyBuilder.Append(row[bjcpIndex].ToString().Trim()).Append("|");
|
||||
keyBuilder.Append(row[xlxhIdIndex].ToString().Trim()).Append("|");
|
||||
keyBuilder.Append(row[xlggIdIndex].ToString().Trim()).Append("|");
|
||||
keyBuilder.Append(row[xlbzIdIndex].ToString().Trim()).Append("|");
|
||||
@@ -30367,6 +30396,7 @@ namespace GThinking.N_XLXSBJ
|
||||
DataTable FinalTable = new DataTable();
|
||||
FinalTable.TableName = "报价单行情材料成本";
|
||||
FinalTable.Columns.Add("显示序号", typeof(double));
|
||||
FinalTable.Columns.Add("报价产品", typeof(string));
|
||||
FinalTable.Columns.Add("型号", typeof(string));
|
||||
FinalTable.Columns.Add("规格", typeof(string));
|
||||
FinalTable.Columns.Add("标准", typeof(string));
|
||||
@@ -30382,11 +30412,12 @@ namespace GThinking.N_XLXSBJ
|
||||
{
|
||||
bool flag = false;
|
||||
string[] keyParts = sKey.Split('|');
|
||||
string sXLXHID = keyParts[0];
|
||||
string sXLGGID = keyParts[1];
|
||||
string sXLBZID = keyParts[2];
|
||||
string sDYDJID = keyParts[3];
|
||||
double dXSSX = CMISproConvert.StrToFloat(keyParts[4], 0);
|
||||
string sBJCP = keyParts[0];
|
||||
string sXLXHID = keyParts[1];
|
||||
string sXLGGID = keyParts[2];
|
||||
string sXLBZID = keyParts[3];
|
||||
string sDYDJID = keyParts[4];
|
||||
double dXSSX = CMISproConvert.StrToFloat(keyParts[5], 0);
|
||||
|
||||
foreach (string CLQDL in dicCLQD[sKey].Keys)
|
||||
{
|
||||
@@ -30418,6 +30449,7 @@ namespace GThinking.N_XLXSBJ
|
||||
{
|
||||
DataRow newRow = FinalTable.NewRow();
|
||||
newRow["显示序号"] = dXSSX;
|
||||
newRow["报价产品"] = sBJCP;
|
||||
newRow["型号"] = sXLXHID;
|
||||
newRow["规格"] = sXLGGID;
|
||||
newRow["标准"] = sXLBZID;
|
||||
@@ -30448,23 +30480,23 @@ namespace GThinking.N_XLXSBJ
|
||||
sd.ColumnStyle = new System.Collections.Generic.Dictionary<string, NpoiColumnStyle>();
|
||||
NpoiColumnStyle ct = new NpoiColumnStyle();
|
||||
ct.DataFormat = "0;-0;;@";
|
||||
sd.ColumnStyle.Add("A", ct);
|
||||
sd.ColumnStyle.Add("B", ct);
|
||||
ct.DataFormat = "0.000;-0.000;;@";
|
||||
sd.ColumnStyle.Add("H", ct);
|
||||
ct.DataFormat = "0.000000;-0.000000;;@";
|
||||
sd.ColumnStyle.Add("I", ct);
|
||||
ct.DataFormat = "0.0000;-0.0000;;@";
|
||||
ct.DataFormat = "0.000000;-0.000000;;@";
|
||||
sd.ColumnStyle.Add("J", ct);
|
||||
ct.DataFormat = "0.0000;-0.0000;;@";
|
||||
sd.ColumnStyle.Add("K", ct);
|
||||
sd.ColumnType = new System.Collections.Generic.Dictionary<string, NpoiColumnType>();
|
||||
string sLet = "";
|
||||
sLet = TExcelData.ColIndexToReference(0);
|
||||
sd.ColumnType.Add(sLet, NpoiColumnType.Double);
|
||||
sLet = TExcelData.ColIndexToReference(7);
|
||||
sd.ColumnType.Add(sLet, NpoiColumnType.Double);
|
||||
sLet = TExcelData.ColIndexToReference(8);
|
||||
sd.ColumnType.Add(sLet, NpoiColumnType.Double);
|
||||
sLet = TExcelData.ColIndexToReference(9);
|
||||
sd.ColumnType.Add(sLet, NpoiColumnType.Double);
|
||||
sLet = TExcelData.ColIndexToReference(10);
|
||||
sd.ColumnType.Add(sLet, NpoiColumnType.Double);
|
||||
|
||||
|
||||
|
||||
@@ -32097,7 +32129,11 @@ namespace GThinking.N_XLXSBJ
|
||||
dicJGBTZYZGS_JGE = XLBJDUtils.GetJGBTZYZ_JGE(cbxJGBID.SelectedValue.Trim(), "0", dsJGBYZ, dicXLJBXX_JGE);
|
||||
string srs = XLBJDUtils.GetCJ(datBJRQ.Text, dicXLJBXX_JGE, dCLCB.ToString(), dBJDHQCLCB.ToString(), txtBJDID.Text.Trim(), cbxBJFLID.SelectedValue.Trim(), iXSWS, dicJGBTZYZGS_JGE["JZ01"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ02"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ03"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ04"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ05"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ06"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ07"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ08"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ09"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ10"].Trim() + "|0");
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ08"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ09"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ10"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ11"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ13"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ16"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ19"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].Trim() + "|0");
|
||||
|
||||
string sCJ = srs.Split(',')[0];
|
||||
string sJJlist = srs.Split(',')[1];
|
||||
@@ -32157,7 +32193,7 @@ namespace GThinking.N_XLXSBJ
|
||||
dicJDYZXS.Add(sYZID, 1);
|
||||
}
|
||||
|
||||
for (int i = 1; i <= 10; i++)
|
||||
for (int i = 1; i <= 20; i++)
|
||||
{
|
||||
string sYZID = "JZ" + i.ToString().PadLeft(2, '0');
|
||||
if (dicJGBTZYZGS_JGE.ContainsKey(sYZID) && dicJDYZXS.ContainsKey(sYZID))
|
||||
@@ -32338,7 +32374,11 @@ namespace GThinking.N_XLXSBJ
|
||||
|
||||
string srs = XLBJDUtils.GetCJ(datBJRQ.Text, dicXLJBXX_JGE, dCLCB.ToString(), dBJDHQCLCB.ToString(), txtBJDID.Text.Trim(), cbxBJFLID.SelectedValue.Trim(), iXSWS, dicJGBTZYZGS_JGE["JZ01"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ02"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ03"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ04"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ05"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ06"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ07"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ08"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ09"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ10"].Trim() + "|0");
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ08"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ09"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ10"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ11"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ13"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ16"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].Trim()
|
||||
+ "|" + dicJGBTZYZGS_JGE["JZ19"].Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].Trim() + "|0");
|
||||
|
||||
string sCJ = srs.Split(',')[0];
|
||||
string sJJlist = srs.Split(',')[1];
|
||||
@@ -32395,7 +32435,7 @@ namespace GThinking.N_XLXSBJ
|
||||
dicJDYZXS.Add(sYZID, 1);
|
||||
}
|
||||
|
||||
for (int i = 1; i <= 10; i++)
|
||||
for (int i = 1; i <= 20; i++)
|
||||
{
|
||||
string sYZID = "JZ" + i.ToString().PadLeft(2, '0');
|
||||
if (dicJGBTZYZGS_JGE.ContainsKey(sYZID) && dicJDYZXS.ContainsKey(sYZID))
|
||||
|
||||
Reference in New Issue
Block a user