wangwei/N_XLXSBJ----MX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加因子，特性加点增加主芯截面

Browse Source
This commit is contained in:
wangwei
2026-09-03 11:44:53 +08:00
parent f85e5baa8d
commit 5ef31cf4c2
47 changed files with 2736 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XLBJDInfo.aspx.cs
+69 -31
View File
@@ -2203,11 +2203,19 @@ namespace GThinking.N_XLXSBJ
#region 复制XLXSBJDJJYZ
SQL.Clear();
SQL.Add(" insert into XLXSBJDJJYZ( ");
SQL.Add(" XLXSBJDJJYZ_BJDID,XLXSBJDJJYZ_XH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,XLXSBJDJJYZ_YSJDZ");
string sYZZFields_1 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_1 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add(" XLXSBJDJJYZ_BJDID,XLXSBJDJJYZ_XH," + sYZZFields_1 + ",XLXSBJDJJYZ_YSJDZ");
SQL.Add(" ) ");
SQL.Add(" select :pBJDID,XLXSBJDJJYZ_XH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,XLXSBJDJJYZ_YSJDZ ");
string sYZZFields_2 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_2 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add(" select :pBJDID,XLXSBJDJJYZ_XH," + sYZZFields_2 + ",XLXSBJDJJYZ_YSJDZ ");
SQL.Add(" from XLXSBJDJJYZ");
SQL.Add(" where XLXSBJDJJYZ_BJDID=:pOLDBJDID");
SQL.ParamByName("pBJDID").Value = txtBJDID.Text.Trim();
@@ -10606,7 +10614,7 @@ namespace GThinking.N_XLXSBJ
case when isnull(XLXSJGB_MXBH,' ')='JGB' then ' ' else rtrim(convert(char,XLXSBJDJJYZ_YZZ01))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ02))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ03))
||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ04))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ05))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ06))
||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ07))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ08))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ09))
||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ10))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YSJDZ)) end as UpdJJYZList,XLXSBJDMX_BJLY,XLXSBJDMX_BJTJCZ,case when isnull(XLXSBJDMXFD_BJDID,' ') = ' ' then 'N' else 'Y' end as HasFDJL
||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ10))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ11))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ12))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ13))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ14))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ15))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ16))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ17))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ18))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ19))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ20))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YSJDZ)) end as UpdJJYZList,XLXSBJDMX_BJLY,XLXSBJDMX_BJTJCZ,case when isnull(XLXSBJDMXFD_BJDID,' ') = ' ' then 'N' else 'Y' end as HasFDJL
from XLXSBJDMX
left join XLBZ on XLBZ_XLBZID = XLXSBJDMX_XLBZID
left join XLYSB on XLYSB_XLYSID = XLXSBJDMX_XLYSID
@@ -13060,7 +13068,7 @@ namespace GThinking.N_XLXSBJ
grdXLBJDMX.EditNewRow(row.RowIndex, "UpdJJYZList", dicBaseJG["JZ01"].ToString().Trim() + "|" + dicBaseJG["JZ02"].ToString().Trim() + "|" + dicBaseJG["JZ03"].ToString().Trim()
+ "|" + dicBaseJG["JZ04"].ToString().Trim() + "|" + dicBaseJG["JZ05"].ToString().Trim() + "|" + dicBaseJG["JZ06"].ToString().Trim()
+ "|" + dicBaseJG["JZ07"].ToString().Trim() + "|" + dicBaseJG["JZ08"].ToString().Trim() + "|" + dicBaseJG["JZ09"].ToString().Trim()
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|0");
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|" + dicBaseJG["JZ11"].ToString().Trim() + "|" + dicBaseJG["JZ12"].ToString().Trim() + "|" + dicBaseJG["JZ13"].ToString().Trim() + "|" + dicBaseJG["JZ14"].ToString().Trim() + "|" + dicBaseJG["JZ15"].ToString().Trim() + "|" + dicBaseJG["JZ16"].ToString().Trim() + "|" + dicBaseJG["JZ17"].ToString().Trim() + "|" + dicBaseJG["JZ18"].ToString().Trim() + "|" + dicBaseJG["JZ19"].ToString().Trim() + "|" + dicBaseJG["JZ20"].ToString().Trim() + "|0");
}
else
{
@@ -13285,7 +13293,7 @@ namespace GThinking.N_XLXSBJ
row["UpdJJYZList"] = dicBaseJG["JZ01"].ToString().Trim() + "|" + dicBaseJG["JZ02"].ToString().Trim() + "|" + dicBaseJG["JZ03"].ToString().Trim()
+ "|" + dicBaseJG["JZ04"].ToString().Trim() + "|" + dicBaseJG["JZ05"].ToString().Trim() + "|" + dicBaseJG["JZ06"].ToString().Trim()
+ "|" + dicBaseJG["JZ07"].ToString().Trim() + "|" + dicBaseJG["JZ08"].ToString().Trim() + "|" + dicBaseJG["JZ09"].ToString().Trim()
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|0";
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|" + dicBaseJG["JZ11"].ToString().Trim() + "|" + dicBaseJG["JZ12"].ToString().Trim() + "|" + dicBaseJG["JZ13"].ToString().Trim() + "|" + dicBaseJG["JZ14"].ToString().Trim() + "|" + dicBaseJG["JZ15"].ToString().Trim() + "|" + dicBaseJG["JZ16"].ToString().Trim() + "|" + dicBaseJG["JZ17"].ToString().Trim() + "|" + dicBaseJG["JZ18"].ToString().Trim() + "|" + dicBaseJG["JZ19"].ToString().Trim() + "|" + dicBaseJG["JZ20"].ToString().Trim() + "|0";
}
else
{
@@ -13466,7 +13474,7 @@ namespace GThinking.N_XLXSBJ
row["UpdJJYZList"] = dicBaseJG["JZ01"].ToString().Trim() + "|" + dicBaseJG["JZ02"].ToString().Trim() + "|" + dicBaseJG["JZ03"].ToString().Trim()
+ "|" + dicBaseJG["JZ04"].ToString().Trim() + "|" + dicBaseJG["JZ05"].ToString().Trim() + "|" + dicBaseJG["JZ06"].ToString().Trim()
+ "|" + dicBaseJG["JZ07"].ToString().Trim() + "|" + dicBaseJG["JZ08"].ToString().Trim() + "|" + dicBaseJG["JZ09"].ToString().Trim()
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|0";
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|" + dicBaseJG["JZ11"].ToString().Trim() + "|" + dicBaseJG["JZ12"].ToString().Trim() + "|" + dicBaseJG["JZ13"].ToString().Trim() + "|" + dicBaseJG["JZ14"].ToString().Trim() + "|" + dicBaseJG["JZ15"].ToString().Trim() + "|" + dicBaseJG["JZ16"].ToString().Trim() + "|" + dicBaseJG["JZ17"].ToString().Trim() + "|" + dicBaseJG["JZ18"].ToString().Trim() + "|" + dicBaseJG["JZ19"].ToString().Trim() + "|" + dicBaseJG["JZ20"].ToString().Trim() + "|0";
}
else
{
@@ -13648,7 +13656,7 @@ namespace GThinking.N_XLXSBJ
row["UpdJJYZList"] = dicBaseJG["JZ01"].ToString().Trim() + "|" + dicBaseJG["JZ02"].ToString().Trim() + "|" + dicBaseJG["JZ03"].ToString().Trim()
+ "|" + dicBaseJG["JZ04"].ToString().Trim() + "|" + dicBaseJG["JZ05"].ToString().Trim() + "|" + dicBaseJG["JZ06"].ToString().Trim()
+ "|" + dicBaseJG["JZ07"].ToString().Trim() + "|" + dicBaseJG["JZ08"].ToString().Trim() + "|" + dicBaseJG["JZ09"].ToString().Trim()
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|0";
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|" + dicBaseJG["JZ11"].ToString().Trim() + "|" + dicBaseJG["JZ12"].ToString().Trim() + "|" + dicBaseJG["JZ13"].ToString().Trim() + "|" + dicBaseJG["JZ14"].ToString().Trim() + "|" + dicBaseJG["JZ15"].ToString().Trim() + "|" + dicBaseJG["JZ16"].ToString().Trim() + "|" + dicBaseJG["JZ17"].ToString().Trim() + "|" + dicBaseJG["JZ18"].ToString().Trim() + "|" + dicBaseJG["JZ19"].ToString().Trim() + "|" + dicBaseJG["JZ20"].ToString().Trim() + "|0";
}
else
{
@@ -13913,7 +13921,7 @@ namespace GThinking.N_XLXSBJ
grdXLBJDMX.EditNewRow(row.RowIndex, "UpdJJYZList", dicBaseJG["JZ01"].ToString().Trim() + "|" + dicBaseJG["JZ02"].ToString().Trim() + "|" + dicBaseJG["JZ03"].ToString().Trim()
+ "|" + dicBaseJG["JZ04"].ToString().Trim() + "|" + dicBaseJG["JZ05"].ToString().Trim() + "|" + dicBaseJG["JZ06"].ToString().Trim()
+ "|" + dicBaseJG["JZ07"].ToString().Trim() + "|" + dicBaseJG["JZ08"].ToString().Trim() + "|" + dicBaseJG["JZ09"].ToString().Trim()
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|0");
+ "|" + dicBaseJG["JZ10"].ToString().Trim() + "|" + dicBaseJG["JZ11"].ToString().Trim() + "|" + dicBaseJG["JZ12"].ToString().Trim() + "|" + dicBaseJG["JZ13"].ToString().Trim() + "|" + dicBaseJG["JZ14"].ToString().Trim() + "|" + dicBaseJG["JZ15"].ToString().Trim() + "|" + dicBaseJG["JZ16"].ToString().Trim() + "|" + dicBaseJG["JZ17"].ToString().Trim() + "|" + dicBaseJG["JZ18"].ToString().Trim() + "|" + dicBaseJG["JZ19"].ToString().Trim() + "|" + dicBaseJG["JZ20"].ToString().Trim() + "|0");
}
else
{
@@ -15785,7 +15793,7 @@ namespace GThinking.N_XLXSBJ
{
string sUpdJJYZList = e.RowData["UpdJJYZList"].ToString().Trim();
if (sUpdJJYZList.Equals(""))
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0";
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0";
string sTZQZDXJ = e.RowData["XLXSBJDMX_TZQZDXJ"].ToString().Trim();
double dTZQZDXJ = CMISproConvert.StrToFloat(stZDXJ);
sTZQZDXJ = XLBJDUtils.GetZDXJ(stCLCB, stBJDHQCLCB, stJGBJJ, stJGBBJ, stCPBJ, stYZZ01, stYZZ02, stYZZ03, stYZZ04, stYZZ05, stYZZ06, stYZZ07, stYZZ08, stYZZ09, stYZZ10, stYZZ11, stYZZ12, stYZZ13, stYZZ14, stYZZ15, stYZZ16, stYZZ17, stYZZ18, stYZZ19, stYZZ20, dicChangedField, sTZQZDXJ, e.MasterDataSet["cbxBJFLID"].Trim(), 8, e.RowData["XLXSBJDMX_ZDXJBJDID"].ToString().Trim(), sUpdJJYZList);
@@ -16673,8 +16681,8 @@ namespace GThinking.N_XLXSBJ
sJJ = dJGFJJ.ToString().Trim();
sCLCB = dJGFJJ.ToString().Trim();
sBJDHQCLCB = dJGFJJ.ToString().Trim();
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
}
else if (sWGCPBZ.Equals("Y"))
{
@@ -16683,8 +16691,8 @@ namespace GThinking.N_XLXSBJ
sJJ = "0";
sCLCB = "0";
sBJDHQCLCB = "0";
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
}
else
{
@@ -16730,7 +16738,7 @@ namespace GThinking.N_XLXSBJ
e.ResultPairs.Add("UpdJJYZList", dicJJYZList["JZ01"].ToString().Trim() + "|" + dicJJYZList["JZ02"].ToString().Trim() + "|" + dicJJYZList["JZ03"].ToString().Trim()
+ "|" + dicJJYZList["JZ04"].ToString().Trim() + "|" + dicJJYZList["JZ05"].ToString().Trim() + "|" + dicJJYZList["JZ06"].ToString().Trim() + "|" + dicJJYZList["JZ07"].ToString().Trim()
+ "|" + dicJJYZList["JZ08"].ToString().Trim() + "|" + dicJJYZList["JZ09"].ToString().Trim() + "|" + dicJJYZList["JZ10"].ToString().Trim() + "|" + dicJJYZList["YSJDZ"].ToString().Trim());
+ "|" + dicJJYZList["JZ08"].ToString().Trim() + "|" + dicJJYZList["JZ09"].ToString().Trim() + "|" + dicJJYZList["JZ10"].ToString().Trim() + "|" + dicJJYZList["JZ11"].ToString().Trim() + "|" + dicJJYZList["JZ12"].ToString().Trim() + "|" + dicJJYZList["JZ13"].ToString().Trim() + "|" + dicJJYZList["JZ14"].ToString().Trim() + "|" + dicJJYZList["JZ15"].ToString().Trim() + "|" + dicJJYZList["JZ16"].ToString().Trim() + "|" + dicJJYZList["JZ17"].ToString().Trim() + "|" + dicJJYZList["JZ18"].ToString().Trim() + "|" + dicJJYZList["JZ19"].ToString().Trim() + "|" + dicJJYZList["JZ20"].ToString().Trim() + "|" + dicJJYZList["YSJDZ"].ToString().Trim());
//这里根据换算比例将GetFromJGB_BJDHQ_JGBTJYS3已经换算的数据再换算回来，交由下方统一换算
double dBJD_JGB_JLDWHSBL = XLBJDUtils.GetJLDWHSBL_JG(sJLDW, sJGBJLDW);
@@ -17099,16 +17107,16 @@ namespace GThinking.N_XLXSBJ
}
e.ResultPairs.Add("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()
+ "|" + 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"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ13"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ16"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ19"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].ToString().Trim() + "|0");
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()
+ "|" + 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"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ13"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ16"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ19"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].ToString().Trim() + "|0");
}
else
{
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
e.ResultPairs.Add("UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
AddChangedField(dicChangedField, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
}
if (JgIsZero)//若存在有材料用量、无材料价格的情况，则算出的表价、报价单行情料价改为负数显示
@@ -21749,7 +21757,7 @@ namespace GThinking.N_XLXSBJ
if (isChanged)
{
if (sUpdJJYZList.Equals(""))
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0";
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0";
if (!e.EventFieldName.Equals("XLXSBJDMX_ZDXJ"))
{
double dTZQZDXJ = CMISproConvert.StrToFloat(stZDXJ);
@@ -26870,7 +26878,7 @@ namespace GThinking.N_XLXSBJ
{
SQL.Clear();
SQL.Add("update XLXSBJDJJYZ set XLXSBJDJJYZ_YZZ01=:pYZZ01,XLXSBJDJJYZ_YZZ02=:pYZZ02,XLXSBJDJJYZ_YZZ03=:pYZZ03,XLXSBJDJJYZ_YZZ04=:pYZZ04,XLXSBJDJJYZ_YZZ05=:pYZZ05,");
SQL.Add(" XLXSBJDJJYZ_YZZ06=:pYZZ06,XLXSBJDJJYZ_YZZ07=:pYZZ07,XLXSBJDJJYZ_YZZ08=:pYZZ08,XLXSBJDJJYZ_YZZ09=:pYZZ09,XLXSBJDJJYZ_YZZ10=:pYZZ10 ");
SQL.Add(" XLXSBJDJJYZ_YZZ06=:pYZZ06,XLXSBJDJJYZ_YZZ07=:pYZZ07,XLXSBJDJJYZ_YZZ08=:pYZZ08,XLXSBJDJJYZ_YZZ09=:pYZZ09,XLXSBJDJJYZ_YZZ10=:pYZZ10,XLXSBJDJJYZ_YZZ11=:pYZZ11,XLXSBJDJJYZ_YZZ12=:pYZZ12,XLXSBJDJJYZ_YZZ13=:pYZZ13,XLXSBJDJJYZ_YZZ14=:pYZZ14,XLXSBJDJJYZ_YZZ15=:pYZZ15,XLXSBJDJJYZ_YZZ16=:pYZZ16,XLXSBJDJJYZ_YZZ17=:pYZZ17,XLXSBJDJJYZ_YZZ18=:pYZZ18,XLXSBJDJJYZ_YZZ19=:pYZZ19,XLXSBJDJJYZ_YZZ20=:pYZZ20 ");
SQL.Add(" where XLXSBJDJJYZ_BJDID=:pBJDID and XLXSBJDJJYZ_XH=:pBJDXH");
SQL.ParamByName("pBJDID").Value = sBJDID;
SQL.ParamByName("pBJDXH").Value = sXH;
@@ -26884,6 +26892,16 @@ namespace GThinking.N_XLXSBJ
SQL.ParamByName("pYZZ08").Value = dicJJYZList_JGE["JZ08"];
SQL.ParamByName("pYZZ09").Value = dicJJYZList_JGE["JZ09"];
SQL.ParamByName("pYZZ10").Value = dicJJYZList_JGE["JZ10"];
SQL.ParamByName("pYZZ11").Value = dicJJYZList_JGE["JZ11"];
SQL.ParamByName("pYZZ12").Value = dicJJYZList_JGE["JZ12"];
SQL.ParamByName("pYZZ13").Value = dicJJYZList_JGE["JZ13"];
SQL.ParamByName("pYZZ14").Value = dicJJYZList_JGE["JZ14"];
SQL.ParamByName("pYZZ15").Value = dicJJYZList_JGE["JZ15"];
SQL.ParamByName("pYZZ16").Value = dicJJYZList_JGE["JZ16"];
SQL.ParamByName("pYZZ17").Value = dicJJYZList_JGE["JZ17"];
SQL.ParamByName("pYZZ18").Value = dicJJYZList_JGE["JZ18"];
SQL.ParamByName("pYZZ19").Value = dicJJYZList_JGE["JZ19"];
SQL.ParamByName("pYZZ20").Value = dicJJYZList_JGE["JZ20"];
dberp.ExecSQL(SQL);
}
@@ -27142,7 +27160,7 @@ namespace GThinking.N_XLXSBJ
{
SQL.Clear();
SQL.Add("update XLXSBJDJJYZ set XLXSBJDJJYZ_YZZ01=:pYZZ01,XLXSBJDJJYZ_YZZ02=:pYZZ02,XLXSBJDJJYZ_YZZ03=:pYZZ03,XLXSBJDJJYZ_YZZ04=:pYZZ04,XLXSBJDJJYZ_YZZ05=:pYZZ05,");
SQL.Add(" XLXSBJDJJYZ_YZZ06=:pYZZ06,XLXSBJDJJYZ_YZZ07=:pYZZ07,XLXSBJDJJYZ_YZZ08=:pYZZ08,XLXSBJDJJYZ_YZZ09=:pYZZ09,XLXSBJDJJYZ_YZZ10=:pYZZ10 ");
SQL.Add(" XLXSBJDJJYZ_YZZ06=:pYZZ06,XLXSBJDJJYZ_YZZ07=:pYZZ07,XLXSBJDJJYZ_YZZ08=:pYZZ08,XLXSBJDJJYZ_YZZ09=:pYZZ09,XLXSBJDJJYZ_YZZ10=:pYZZ10,XLXSBJDJJYZ_YZZ11=:pYZZ11,XLXSBJDJJYZ_YZZ12=:pYZZ12,XLXSBJDJJYZ_YZZ13=:pYZZ13,XLXSBJDJJYZ_YZZ14=:pYZZ14,XLXSBJDJJYZ_YZZ15=:pYZZ15,XLXSBJDJJYZ_YZZ16=:pYZZ16,XLXSBJDJJYZ_YZZ17=:pYZZ17,XLXSBJDJJYZ_YZZ18=:pYZZ18,XLXSBJDJJYZ_YZZ19=:pYZZ19,XLXSBJDJJYZ_YZZ20=:pYZZ20 ");
SQL.Add(" where XLXSBJDJJYZ_BJDID=:pBJDID and XLXSBJDJJYZ_XH=:pBJDXH");
SQL.ParamByName("pBJDID").Value = sBJDID;
SQL.ParamByName("pBJDXH").Value = sXH;
@@ -27156,6 +27174,16 @@ namespace GThinking.N_XLXSBJ
SQL.ParamByName("pYZZ08").Value = dicJJYZList_JGE["JZ08"];
SQL.ParamByName("pYZZ09").Value = dicJJYZList_JGE["JZ09"];
SQL.ParamByName("pYZZ10").Value = dicJJYZList_JGE["JZ10"];
SQL.ParamByName("pYZZ11").Value = dicJJYZList_JGE["JZ11"];
SQL.ParamByName("pYZZ12").Value = dicJJYZList_JGE["JZ12"];
SQL.ParamByName("pYZZ13").Value = dicJJYZList_JGE["JZ13"];
SQL.ParamByName("pYZZ14").Value = dicJJYZList_JGE["JZ14"];
SQL.ParamByName("pYZZ15").Value = dicJJYZList_JGE["JZ15"];
SQL.ParamByName("pYZZ16").Value = dicJJYZList_JGE["JZ16"];
SQL.ParamByName("pYZZ17").Value = dicJJYZList_JGE["JZ17"];
SQL.ParamByName("pYZZ18").Value = dicJJYZList_JGE["JZ18"];
SQL.ParamByName("pYZZ19").Value = dicJJYZList_JGE["JZ19"];
SQL.ParamByName("pYZZ20").Value = dicJJYZList_JGE["JZ20"];
dberp.ExecSQL(SQL);
}
@@ -28157,8 +28185,18 @@ namespace GThinking.N_XLXSBJ
if (!IsJGEJGB)//是否需要按价格表报价
{
SQL.Clear();
SQL.Add("insert into XLXSBJDJJYZ(XLXSBJDJJYZ_BJDID, XLXSBJDJJYZ_XH, XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,XLXSBJDJJYZ_YSJDZ) ");
SQL.Add("select XLXSBJDMX_BJDID,XLXSBJDMX_XH,isnull(XLXSJGBYZZ0_YZZ01,0),isnull(XLXSJGBYZZ0_YZZ02,0),isnull(XLXSJGBYZZ0_YZZ03,0),isnull(XLXSJGBYZZ0_YZZ04,0),isnull(XLXSJGBYZZ0_YZZ05,0),isnull(XLXSJGBYZZ0_YZZ06,0),isnull(XLXSJGBYZZ0_YZZ07,0),isnull(XLXSJGBYZZ0_YZZ08,0),isnull(XLXSJGBYZZ0_YZZ09,0),isnull(XLXSJGBYZZ0_YZZ10,0),isnull(XLXSJGBMX_YSJDZ,0) ");
string sYZZFields_3 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_3 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
}
SQL.Add("insert into XLXSBJDJJYZ(XLXSBJDJJYZ_BJDID, XLXSBJDJJYZ_XH, " + sYZZFields_3 + ",XLXSBJDJJYZ_YSJDZ) ");
string sYZZFields_4 = "";
for (int i = 1; i <= 20; i++)
{
sYZZFields_4 += "isnull(XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + ",0)" + (i < 20 ? "," : "");
}
SQL.Add("select XLXSBJDMX_BJDID,XLXSBJDMX_XH," + sYZZFields_4 + ",isnull(XLXSJGBMX_YSJDZ,0) ");
SQL.Add(" from XLXSBJDMX ");
SQL.Add(" left join XLXSJGBMX on XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_XLXHID=XLXSBJDMX_XLXHID and XLXSJGBMX_XLGGID=XLXSBJDMX_XLGGID and XLXSJGBMX_XLBZID=XLXSBJDMX_XLBZID and XLXSJGBMX_DYDJID=XLXSBJDMX_DYDJID");
SQL.Add(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID=:pJGBID and XLXSJGBYZZ0_XH=XLXSJGBMX_XH");
@@ -28750,7 +28788,7 @@ namespace GThinking.N_XLXSBJ
double dQZDXJ = CMISproConvert.StrToFloat(grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_ZDXJ", row));
string sUpdJJYZList = grdXLBJDMX.GetValueByFieldName("UpdJJYZList", row);
if (sUpdJJYZList.Equals(""))
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0";
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0";
//计算最低限价、最低限价价差率
dicChangedField.Add("XLXSBJDMX_CLCB", grdXLBJDMX.GetValueByFieldName("XLXSBJDMX_CLCB", row));//此处简单处理，只为能够触发计算
@@ -29131,7 +29169,7 @@ namespace GThinking.N_XLXSBJ
dCPBJ = XLBJDUtils.RoundSZ(dCPBJ, CMISproConvert.StrToInt(sCPBJMRXSWS));
string sUpdJJYZList = row["UpdJJYZList"].ToString().Trim();
if (sUpdJJYZList.Equals(""))
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0";
sUpdJJYZList = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0";
double dQZDXJ = CMISproConvert.StrToFloat(row["XLXSBJDMX_ZDXJ"].ToString().Trim());
//计算最低限价、最低限价价差率
dicChangedField.Add("XLXSBJDMX_CLCB", row["XLXSBJDMX_CLCB"].ToString().Trim());//此处简单处理，只为能够触发计算
@@ -31911,10 +31949,10 @@ namespace GThinking.N_XLXSBJ
grdXLBJDMX.EditNewRow(row.RowIndex, "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()
+ "|" + 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"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ13"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ16"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ19"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].ToString().Trim() + "|0");
}
else
grdXLBJDMX.EditNewRow(row.RowIndex, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0");
grdXLBJDMX.EditNewRow(row.RowIndex, "UpdJJYZList", "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0");
if (JgIsZero)//若存在有材料用量、无材料价格的情况，则算出的表价、报价单行情料价改为负数显示
{
@@ -32149,10 +32187,10 @@ namespace GThinking.N_XLXSBJ
row["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()
+ "|" + 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"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ12"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ13"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ14"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ15"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ16"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ17"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ18"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ19"].ToString().Trim() + "|" + dicJGBTZYZGS_JGE["JZ20"].ToString().Trim() + "|0";
}
else
row["UpdJJYZList"] = "0|0|0|0|0|0|0|0|0|0|0";
row["UpdJJYZList"] = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0";
if (JgIsZero)//若存在有材料用量、无材料价格的情况，则算出的表价、报价单行情料价改为负数显示
{