提交所有文件
This commit is contained in:
+232
-13
@@ -3057,15 +3057,15 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
//启用运费因子，校验项目所在地不为空
|
||||
if (cbxKHSZDPRO.SelectedValue.Trim().Equals("") || cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
if(CMISproDataBase.ExistsRecord("DBERP",string.Format(@"select 1 from XLXSTZYZ where XLXSTZYZ_TJMDID = 100860071 and XLXSTZYZ_MXBH='BJD'
|
||||
and exists(select 1 from XLXSBJFLYZ where XLXSBJFLYZ_YZID=XLXSTZYZ_YZID and XLXSBJFLYZ_BJFLID='{0}' )", cbxBJFLID.SelectedValue.Trim())))
|
||||
{
|
||||
ShowMessage("项目所在地--不允许为空！");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// if (cbxKHSZDPRO.SelectedValue.Trim().Equals("") || cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
|
||||
// {
|
||||
// if(CMISproDataBase.ExistsRecord("DBERP",string.Format(@"select 1 from XLXSTZYZ where XLXSTZYZ_TJMDID = 100860071 and XLXSTZYZ_MXBH='BJD'
|
||||
// and exists(select 1 from XLXSBJFLYZ where XLXSBJFLYZ_YZID=XLXSTZYZ_YZID and XLXSBJFLYZ_BJFLID='{0}' )", cbxBJFLID.SelectedValue.Trim())))
|
||||
// {
|
||||
// ShowMessage("项目所在地--不允许为空！");
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
if (GetOption("BJU062").Equals("Y"))
|
||||
{
|
||||
@@ -10257,6 +10257,17 @@ namespace GThinking.N_XLXSBJ
|
||||
dicTJYZList.Add("sTJYSListPFCPWJ", yzxxNew.XLXSTZYZ_YZID.Trim());
|
||||
}
|
||||
}
|
||||
else if (yzxxNew.XLXSTZYZ_TJMDID.Trim().Equals("100860071"))
|
||||
{
|
||||
if (dicTJYZList.ContainsKey("sTJYSListYF"))
|
||||
{
|
||||
dicTJYZList["sTJYSListYF"] = dicTJYZList["sTJYSListYF"] + "," + yzxxNew.XLXSTZYZ_YZID.Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
dicTJYZList.Add("sTJYSListPFCPWJ", yzxxNew.XLXSTZYZ_YZID.Trim());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dicTJYZList.ContainsKey("sTJYSList_"))
|
||||
@@ -12834,6 +12845,24 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Dictionary<string, double> dicYZZYF = new Dictionary<string, double>();
|
||||
//运费
|
||||
string sYFYZID = XLBJDUtils.GetBJFLSYYFYZID(cbxBJFLID.SelectedValue.Trim());
|
||||
if (!sYFYZID.Equals(""))
|
||||
{
|
||||
sYFYZID = sYFYZID.Split('|')[0];
|
||||
|
||||
dicYZZYF = XLBJDUtils.GetYFYZZ(sYFYZID,txtXZQHID.Value,sXLXHID,txtTJ.Value,txtLJ.Value);
|
||||
foreach (string sYZID in dicYZZYF.Keys)
|
||||
{
|
||||
grdXLBJDMX.EditNewRow(row.RowIndex, "TZYZ_" + sYZID, dicYZZYF[sYZID].ToString());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Dictionary<string, double> dicYZZB = new Dictionary<string, double>();
|
||||
if (txtTJYSList.Text.Trim().Contains(",B,"))
|
||||
{
|
||||
@@ -13794,6 +13823,24 @@ namespace GThinking.N_XLXSBJ
|
||||
{
|
||||
cbxKHSZDCITY.SelectedValue = "";
|
||||
}
|
||||
if (!cbxKHSZDCOUNTY.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDCOUNTY.SelectedValue.Trim();
|
||||
}
|
||||
else if (!cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDCITY.SelectedValue.Trim();
|
||||
}
|
||||
else if (!cbxKHSZDPRO.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDPRO.SelectedValue.Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
txtXZQHID.Value = "";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected void cbxKHSZDCITY_OnSelectedIndexChanged(object sender, EventArgs e)
|
||||
@@ -13831,6 +13878,24 @@ namespace GThinking.N_XLXSBJ
|
||||
{
|
||||
cbxKHSZDCOUNTY.SelectedValue = "";
|
||||
}
|
||||
|
||||
if (!cbxKHSZDCOUNTY.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDCOUNTY.SelectedValue.Trim();
|
||||
}
|
||||
else if (!cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDCITY.SelectedValue.Trim();
|
||||
}
|
||||
else if (!cbxKHSZDPRO.SelectedValue.Trim().Equals(""))
|
||||
{
|
||||
txtXZQHID.Value = cbxKHSZDPRO.SelectedValue.Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
txtXZQHID.Value = "";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void chkJZBJHS_CheckedChanged(object sender, EventArgs e)
|
||||
@@ -17644,6 +17709,44 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
|
||||
Dictionary<string, double> dicYZZYF = new Dictionary<string, double>();
|
||||
//运费
|
||||
string sYFYZID = XLBJDUtils.GetBJFLSYYFYZID(sBJFLID);
|
||||
if (!sYFYZID.Equals(""))
|
||||
{
|
||||
string sXZQH = string.Empty;
|
||||
if (!e.MasterDataSet["cbxKHSZDCITY"].Trim().Equals(""))
|
||||
{
|
||||
sXZQH = e.MasterDataSet["cbxKHSZDCITY"].Trim();
|
||||
}
|
||||
else if (!e.MasterDataSet["cbxKHSZDPRO"].Trim().Equals(""))
|
||||
{
|
||||
sXZQH = e.MasterDataSet["cbxKHSZDPRO"].Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
sXZQH = "";
|
||||
}
|
||||
Mac.MacLog.TraceFormat("sYFYZID-1");
|
||||
sYFYZID = sYFYZID.Split('|')[0];
|
||||
dicYZZYF = XLBJDUtils.GetYFYZZ(sYFYZID, sXZQH, sXLXHID, CMISproConvert.StrToFloat(e.MasterDataSet["txtTJ"].Trim()), CMISproConvert.StrToFloat(e.MasterDataSet["txtLJ"].Trim()));
|
||||
Mac.MacLog.TraceFormat("sYFYZID-2");
|
||||
foreach (string sYZID in dicYZZYF.Keys)
|
||||
{
|
||||
e.ResultPairs.Add("TZYZ_" + sYZID, dicYZZYF[sYZID].ToString());
|
||||
AddChangedField(dicChangedField, "TZYZ_" + sYZID, dicYZZYF[sYZID].ToString());
|
||||
if (dicValueContained(dicTYZZYZID, sYZID))
|
||||
{
|
||||
if (!dicTYZZYZIDValue.ContainsKey(sYZID))
|
||||
dicTYZZYZIDValue.Add(sYZID, dicYZZYF[sYZID]);
|
||||
else
|
||||
dicTYZZYZIDValue[sYZID] += dicYZZYF[sYZID];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Dictionary<string, double> dicYZZB = new Dictionary<string, double>();
|
||||
if (e.MasterDataSet["txtTJYSList"].Contains(",B,"))
|
||||
{
|
||||
@@ -17725,7 +17828,8 @@ namespace GThinking.N_XLXSBJ
|
||||
if (!dicYZZ2.ContainsKey(sFieldName.Substring(5)) && !dicYZZ3.ContainsKey(sFieldName.Substring(5)) && !dicYZZ8.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZF.ContainsKey(sFieldName.Substring(5)) && !dicYZZ4.ContainsKey(sFieldName.Substring(5)) && !dicYZZ5.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ6.ContainsKey(sFieldName.Substring(5)) && !dicYZZ7.ContainsKey(sFieldName.Substring(5)) && !dicYZZD.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ9.ContainsKey(sFieldName.Substring(5)) && !dicYZZA.ContainsKey(sFieldName.Substring(5)) && !dicYZZBZPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZCPWJPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZB.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ9.ContainsKey(sFieldName.Substring(5)) && !dicYZZA.ContainsKey(sFieldName.Substring(5)) && !dicYZZBZPF.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZCPWJPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZYF.ContainsKey(sFieldName.Substring(5)) && !dicYZZB.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZC.ContainsKey(sFieldName.Substring(5)) && !dicYZZ_.ContainsKey(sFieldName.Substring(5)) && !dicYZZ1.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZE.ContainsKey(sFieldName.Substring(5)) && !dicYZZG.ContainsKey(sFieldName.Substring(5)) && !dicYZZH.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZK.ContainsKey(sFieldName.Substring(5)) )
|
||||
@@ -18019,6 +18123,23 @@ namespace GThinking.N_XLXSBJ
|
||||
dicTJYZIDValue[tmpTJYZID] += tmpYZZ;
|
||||
}
|
||||
}
|
||||
foreach (string sYZID in dicYZZYF.Keys)
|
||||
{
|
||||
string tmpTJYZID = dicTJYZID[sYZID];
|
||||
double tmpYZZ = dicYZZYF[sYZID];
|
||||
string tmpTYZZYZID = dicTYZZYZID[sYZID];
|
||||
if (!tmpTYZZYZID.Equals(""))
|
||||
{
|
||||
tmpYZZ = GetTYZZ(tmpTYZZYZID, tmpYZZ, dicTYZZYZIDValue);
|
||||
}
|
||||
if (!dicValueContained(dicTYZZYZID, tmpTJYZID))
|
||||
{
|
||||
if (!dicTJYZIDValue.ContainsKey(tmpTJYZID))
|
||||
dicTJYZIDValue.Add(tmpTJYZID, tmpYZZ);
|
||||
else
|
||||
dicTJYZIDValue[tmpTJYZID] += tmpYZZ;
|
||||
}
|
||||
}
|
||||
foreach (string sYZID in dicYZZC.Keys)
|
||||
{
|
||||
string tmpTJYZID = dicTJYZID[sYZID];
|
||||
@@ -18063,7 +18184,8 @@ namespace GThinking.N_XLXSBJ
|
||||
if (!dicYZZ2.ContainsKey(sFieldName.Substring(5)) && !dicYZZ3.ContainsKey(sFieldName.Substring(5)) && !dicYZZE.ContainsKey(sFieldName.Substring(5)) && !dicYZZG.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZF.ContainsKey(sFieldName.Substring(5)) && !dicYZZ4.ContainsKey(sFieldName.Substring(5)) && !dicYZZ5.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ6.ContainsKey(sFieldName.Substring(5)) && !dicYZZ7.ContainsKey(sFieldName.Substring(5)) && !dicYZZ1.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ9.ContainsKey(sFieldName.Substring(5)) && !dicYZZA.ContainsKey(sFieldName.Substring(5)) && !dicYZZBZPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZCPWJPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZ8.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZ9.ContainsKey(sFieldName.Substring(5)) && !dicYZZA.ContainsKey(sFieldName.Substring(5)) && !dicYZZBZPF.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZCPWJPF.ContainsKey(sFieldName.Substring(5)) && !dicYZZYF.ContainsKey(sFieldName.Substring(5)) && !dicYZZ8.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZC.ContainsKey(sFieldName.Substring(5)) && !dicYZZ_.ContainsKey(sFieldName.Substring(5)) && !dicYZZB.ContainsKey(sFieldName.Substring(5))
|
||||
&& !dicYZZD.ContainsKey(sFieldName.Substring(5)) && !dicYZZH.ContainsKey(sFieldName.Substring(5)) && !dicYZZK.ContainsKey(sFieldName.Substring(5)))
|
||||
{
|
||||
@@ -18596,6 +18718,45 @@ namespace GThinking.N_XLXSBJ
|
||||
}
|
||||
}
|
||||
|
||||
Dictionary<string, double> dicYZZYF = new Dictionary<string, double>();
|
||||
//运费
|
||||
string sYFYZID = XLBJDUtils.GetBJFLSYYFYZID(sBJFLID);
|
||||
if (!sYFYZID.Equals(""))
|
||||
{
|
||||
sYFYZID = sYFYZID.Split('|')[0];
|
||||
string sXZQH = string.Empty;
|
||||
if (!e.MasterDataSet["cbxKHSZDCOUNTY"].Trim().Equals(""))
|
||||
{
|
||||
sXZQH = e.MasterDataSet["cbxKHSZDCOUNTY"].Trim();
|
||||
}
|
||||
else if (!e.MasterDataSet["cbxKHSZDCITY"].Trim().Equals(""))
|
||||
{
|
||||
sXZQH = e.MasterDataSet["cbxKHSZDCITY"].Trim();
|
||||
}
|
||||
else if (!e.MasterDataSet["cbxKHSZDPRO"].Trim().Equals(""))
|
||||
{
|
||||
sXZQH = e.MasterDataSet["cbxKHSZDPRO"].Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
sXZQH = "";
|
||||
}
|
||||
dicYZZYF = XLBJDUtils.GetYFYZZ(sYFYZID, sXZQH, sXLXHID, CMISproConvert.StrToFloat(e.MasterDataSet["txtTJ"].Trim()), CMISproConvert.StrToFloat(e.MasterDataSet["txtLJ"].Trim()));
|
||||
foreach (string sYZID in dicYZZYF.Keys)
|
||||
{
|
||||
e.ResultPairs.Add("TZYZ_" + sYZID, dicYZZYF[sYZID].ToString());
|
||||
AddChangedField(dicChangedField, "TZYZ_" + sYZID, dicYZZYF[sYZID].ToString());
|
||||
if (dicValueContained(dicTYZZYZID, sYZID))
|
||||
{
|
||||
if (!dicTYZZYZIDValue.ContainsKey(sYZID))
|
||||
dicTYZZYZIDValue.Add(sYZID, dicYZZYF[sYZID]);
|
||||
else
|
||||
dicTYZZYZIDValue[sYZID] += dicYZZYF[sYZID];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach (string sYZID in dicYZZ2.Keys)
|
||||
{
|
||||
@@ -23261,7 +23422,11 @@ namespace GThinking.N_XLXSBJ
|
||||
sText = sText + "(元)";
|
||||
}
|
||||
|
||||
if (ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("2") && !ds.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("C"))
|
||||
if (sYZMC=="资金比例")
|
||||
{
|
||||
btnBJ.Nodes.Add(new gtTreeNode("ZJBL|" + sYZID, sText));
|
||||
}
|
||||
else if (ds.Tables[0].Rows[i]["SY"].ToString().Trim().Equals("2") && !ds.Tables[0].Rows[i]["XLXSTZYZ_TJYS"].ToString().Trim().Equals("C"))
|
||||
{
|
||||
btnBJ.Nodes.Add(new gtTreeNode("Root|" + sYZID, sText));
|
||||
|
||||
@@ -23315,7 +23480,21 @@ namespace GThinking.N_XLXSBJ
|
||||
protected void btnBJ_MenuItemClick(object sender, string value)
|
||||
{
|
||||
BJFLXX bjflxx = XLBJDUtils.GetBJFLXX(cbxBJFLID.SelectedValue.Trim());
|
||||
if (!value.Equals("BJXF") && !value.Equals("BJSF")
|
||||
if (value.StartsWith("ZJBL"))
|
||||
{
|
||||
TPageParams tpp = new TPageParams();
|
||||
tpp.UrlPath = "../Components/N_XLBJPZ/BJDZQWHInfo.aspx";
|
||||
tpp.AddString("BJDID", txtBJDID.Text.Trim());
|
||||
tpp.AddString("YZID", value.Split('|')[1]);
|
||||
tpp.AddString("txtPLSZYZListCID", txtPLSZYZList.ClientID);
|
||||
tpp.AddString("btnRefreshCID", btnRefreshBJDYZ.ClientID);
|
||||
if (CMISproDataBase.ExistsRecord("DBERP", "select 1 from XLXSBJDZQZB where XLXSBJDZQZB_BJDID='" + txtBJDID.Text.Trim() + "'"))
|
||||
tpp.CallAction = TPageCallAction.pcaBrowse;
|
||||
else
|
||||
tpp.CallAction = TPageCallAction.pcaInsert;
|
||||
OpenDialog(tpp);
|
||||
}
|
||||
else if (!value.Equals("BJXF") && !value.Equals("BJSF")
|
||||
&& !value.Equals("BJJCLLX") && !value.Equals("LJJCLLX")
|
||||
&& !value.Equals("BJPLTJ") && !value.Equals("PFJE") && !value.Equals("JMBGS")
|
||||
&& !value.Equals("BJSL") && !value.Equals("BJSD")
|
||||
@@ -24286,6 +24465,46 @@ namespace GThinking.N_XLXSBJ
|
||||
pageParams.AddString("btnRefreshCID", btnRefreshYFYZ1.ClientID);
|
||||
OpenFuncModuleDialog(100860084, pageParams);
|
||||
}
|
||||
else
|
||||
{
|
||||
Confirm.Register("IsQD", string.Format(string.Format("将更新{0}，是否继续？", XLBJDUtils.GetBJFLSYYFYZID(cbxBJFLID.SelectedValue.Trim()).Split('|')[1].Trim())));
|
||||
Confirm.ShowBtnText = TConfirm.cBtnText.Yes_No;
|
||||
if (Confirm.GetValue("IsQD").Trim().Equals(""))
|
||||
{
|
||||
Confirm.Ask("IsQD");
|
||||
return;
|
||||
}
|
||||
else if (Confirm.GetValue("IsQD").Trim().Equals("N"))
|
||||
{
|
||||
//表示进行了提示并选择了取消，直接返回或其他处理
|
||||
Confirm.Clear();
|
||||
return;
|
||||
}
|
||||
else if (Confirm.GetValue("IsQD").Trim().Equals("Y"))
|
||||
{
|
||||
//表示进行了提示并选择了确认
|
||||
Confirm.Clear();
|
||||
}
|
||||
TDatabase dberp1 = TContextDatabases.GetDatabase("DBERP");
|
||||
TSQL SQL1 = new TSQL(dberp1);
|
||||
Dictionary<string, string> dicTJYZList = new Dictionary<string, string>();
|
||||
dicTJYZList.Add("sTJYSListYF", XLBJDUtils.GetBJFLSYYFYZID(cbxBJFLID.SelectedValue.Trim()).Split('|')[0].Trim());
|
||||
string sErrorMsg = "";
|
||||
XLBJDUtils.AddXLXSBJDYZZ0(dberp1, txtBJDID.Text.Trim(), cbxBJFLID.SelectedValue.Trim(), "M", dicTJYZList, false, "", 0, false, false, false, ref sErrorMsg);
|
||||
if (!sErrorMsg.Equals(""))
|
||||
{
|
||||
ShowMessage(sErrorMsg);
|
||||
return;
|
||||
}
|
||||
XLBJDCalcUtils.CalcAfterBJDYZZChange(dberp1, SQL1, txtBJDID.Text.Trim(), 1, "", false, false, false, "", DateTime.MinValue, GetOption("BJU002"), GetOption("BJU003"), CurSession.UserId, CurSession.UserName, ref sErrorMsg);
|
||||
if (!sErrorMsg.Equals(""))
|
||||
{
|
||||
ShowMessage(sErrorMsg);
|
||||
return;
|
||||
}
|
||||
ShowMessage("更新完成！");
|
||||
btnOnlyRefresh_Click(null, null);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user