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

提交说明10/13

Browse Source
This commit is contained in:
wangwei
2026-10-13 03:41:34 +08:00
parent 62119b5852
commit 068d733f3e
55 changed files with 263340 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XLBJD_WBBJDMXList.aspx.cs
+23 -26
View File
@@ -4636,17 +4636,24 @@ namespace GThinking.U20261363_N_XLXSBJ
//先匹配型号相同，规格为空的记录更新外部报价单明细
SQL.Clear();
SQL.Add("merge into XLWBBJDMX tar ");
SQL.Add(" using XLXSBJCPMRBZDY sor ");
SQL.Add(" on(XLXSBJCPMRBZDY_XLXHID=XLWBBJDMX_XLXHID and XLXSBJCPMRBZDY_XLGGID=' ' ");
SQL.Add(" and XLWBBJDMX_WHR='BZ_DY'");
SQL.Add(" using ( ");
SQL.Add(@" select XLWBBJDMX_WBBJDID, XLWBBJDMX_DRHH, XLWBBJDMX_BJDID,DYDJID
from XLWBBJDMX
left join XLXSBJXLGGTHB on XLXSBJXLGGTHB_XLGGID = XLWBBJDMX_XLGGID
left join XLXHB on XLXHB_XLXHID=XLWBBJDMX_XLXHID
left join XLGGB on XLXSBJXLGGTHB_XLGGIDCH=XLGGB_XLGGID and XLGGB_XLGGJDGZ=XLXHB_XLGGJDGZ
left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID
left join MRDYWH on XLXHID= XLWBBJDMX_XLXHID and ZXJMS<= ISNULL(XLDTJMZHB_DTJM1,0) and ((ZXJMZ<>0 and ZXJMZ>=ISNULL(XLDTJMZHB_DTJM1,0)) or ZXJMZ=0)
where XLWBBJDMX_WBBJDID=:pWBBJDID and XLWBBJDMX_BJDID=:pBJDID and DYDJID is not null and XLWBBJDMX_WHR='BZ_DY' ");
if (!sDRHHList.Equals(""))
{ //研发自测：王威 2025/11/02 21:35:46
SQL.Add(" and exists (select 1 from V_XLWBBJDMX where V_XLWBBJDMX_DRHH=XLWBBJDMX_DRHH and V_XLWBBJDMX_ID=:pNewID)");
SQL.ParamByName("pNewID").Value = VnewID;
}
SQL.Add(" and XLWBBJDMX_WBBJDID=:pWBBJDID and XLWBBJDMX_BJDID=:pBJDID ) ");
SQL.Add(" ) sor ");
SQL.Add(" on(tar.XLWBBJDMX_WBBJDID=sor.XLWBBJDMX_WBBJDID and tar.XLWBBJDMX_DRHH=sor.XLWBBJDMX_DRHH and tar.XLWBBJDMX_BJDID=sor.XLWBBJDMX_BJDID ) ");
SQL.Add(" when matched then update set ");
SQL.Add(" XLWBBJDMX_DYDJID=isnull(XLXSBJCPMRBZDY_DYDJID,' ') ");
SQL.Add(" XLWBBJDMX_DYDJID=DYDJID ");
SQL.ParamByName("pWBBJDID").Value = sWBBJDID;
@@ -4654,25 +4661,7 @@ namespace GThinking.U20261363_N_XLXSBJ
dberp.ExecSQL(SQL);
//后匹配型号、规格相等的记录更新外部报价单明细
SQL.Clear();
SQL.Add("merge into XLWBBJDMX tar ");
SQL.Add(" using XLXSBJCPMRBZDY sor ");
SQL.Add(" on(XLXSBJCPMRBZDY_XLXHID=XLWBBJDMX_XLXHID and XLXSBJCPMRBZDY_XLGGID=XLWBBJDMX_XLGGID ");
SQL.Add(" and XLWBBJDMX_WHR='BZ_DY'");
if (!sDRHHList.Equals(""))
{ //研发自测：王威 2025/11/02 21:35:46
SQL.Add(" and exists (select 1 from V_XLWBBJDMX where V_XLWBBJDMX_DRHH=XLWBBJDMX_DRHH and V_XLWBBJDMX_ID=:pNewID)");
SQL.ParamByName("pNewID").Value = VnewID;
}
SQL.Add(" and XLWBBJDMX_WBBJDID=:pWBBJDID and XLWBBJDMX_BJDID=:pBJDID ) ");
SQL.Add(" when matched then update set ");
SQL.Add(" XLWBBJDMX_DYDJID=isnull(XLXSBJCPMRBZDY_DYDJID,' ') ");
SQL.ParamByName("pWBBJDID").Value = sWBBJDID;
SQL.ParamByName("pBJDID").Value = sSELBJDID;
dberp.ExecSQL(SQL);
SQL.Clear();
SQL.Add("select XLXSBJKZXX_KZZF02 from XLXSBJKZXX where XLXSBJKZXX_BJDID=:pBJDID ");
SQL.ParamByName("pBJDID").Value = sSELBJDID;
@@ -4692,7 +4681,7 @@ namespace GThinking.U20261363_N_XLXSBJ
DataSet dsBZPP = dberp.OpenDataSet(SQL);
for (int i = 0; i < dsBZPP.Tables[0].Rows.Count; i++)
{
string sPPBZID = dsBZPP.Tables[0].Rows[0][0].ToString().Trim();
string sPPBZID = dsBZPP.Tables[0].Rows[i][0].ToString().Trim();
SQL.Clear();
SQL.Add("update XLWBBJDMX set XLWBBJDMX_XLBZID=:XLWBBJDMX_XLBZID ");
@@ -8559,19 +8548,27 @@ namespace GThinking.U20261363_N_XLXSBJ
protected void btnBZDY_MenuItemClick(object sender, string ItemIndex)
{
TPageParams tpp = new TPageParams();
int index = Int32.Parse(ItemIndex);
switch (index)
{
case 0:
//重新生成
SelectMatchForXLBZIDAndDYDJID(true, PageParam.GetRTrimString("JGBID"));
break;
case 1:
TPageParams tpp = new TPageParams();
tpp.UrlPath = "XLBJD_WBBJDMX_BBPPGZWHList.aspx";
tpp.CallAction = TPageCallAction.pcaBrowse;
OpenDialog(tpp);
break;
case 2:
tpp.UrlPath = "XLBJD_WBBJDMX_MRDYWHList.aspx";
tpp.CallAction = TPageCallAction.pcaBrowse;
OpenDialog(tpp);
break;
}
}
#endregion