diff --git a/CLQDYZInfo.aspx.cs b/CLQDYZInfo.aspx.cs index 62f9069..60b10fa 100644 --- a/CLQDYZInfo.aspx.cs +++ b/CLQDYZInfo.aspx.cs @@ -433,7 +433,7 @@ namespace GThinking.N_XLXSBJ { string num = item.Substring(2, 2); // 取出两位编号，如 "01" int index; - if (int.TryParse(num, out index) && index >= 1 && index <= 10) + if (int.TryParse(num, out index) && index >= 1 && index <= 20) { string id = "JZ" + num; // 构造 pYZID 的值，如 "JZ01" sql.ParamByName("pYZID").Value = id; @@ -543,7 +543,7 @@ namespace GThinking.N_XLXSBJ private int GetXSWS(string sYZID) { - int iXSWS = 2; + int iXSWS = 5; TDatabase dberp = TContextDatabases.GetDatabase("DBERP"); TSQL SQL = new TSQL(dberp); SQL.Clear(); diff --git a/CLQDYZList.aspx b/CLQDYZList.aspx index e7685d1..1708f01 100644 --- a/CLQDYZList.aspx +++ b/CLQDYZList.aspx @@ -44,13 +44,13 @@ - - - + Height="19px" ButtonType="DropDown" ShowCaption="True" runat="server" OnClick="btnAXJGZDR_Click" + Caption="鎸夌嚎寰勮鍒欒绠楀鍏" OnMenuItemClick="btnAXJGZDR_MenuItemClick" > + + + + + ' ') then TJYZJDKCB_KCHDYDJID else JGBDYDJID end ) as DYDJID,"); + + if (sJSFS.Equals("M")) + { + SQL.Add(" ( "); + SQL.Add(" case WHEN TJYZJDKCB_DYDJID=JGBDYDJID then TJYZJDKCB_JDZ "); + SQL.Add(" when TJYZJDKCB_DYDJID= ' ' and JGBDYDJID<> ' ' then TJYZJDKCB_JDZ "); + SQL.Add(" else 0 end "); + SQL.Add(" )*YZZ "); + } + else if (sJSFS.Equals("D")) + { + SQL.Add(" case when ( "); + SQL.Add(" case WHEN TJYZJDKCB_DYDJID=JGBDYDJID then TJYZJDKCB_JDZ "); + SQL.Add(" when TJYZJDKCB_DYDJID= ' ' and JGBDYDJID<> ' ' then TJYZJDKCB_JDZ "); + SQL.Add(" else 0 end "); + SQL.Add(" ) = 0 then 0 else RoundFix(YZZ/ ( "); + SQL.Add(" case WHEN TJYZJDKCB_DYDJID=JGBDYDJID then TJYZJDKCB_JDZ "); + SQL.Add(" when TJYZJDKCB_DYDJID= ' ' and JGBDYDJID<> ' ' then TJYZJDKCB_JDZ "); + SQL.Add(" else 0 end "); + SQL.Add(" ),2) end "); + } + else + { + SQL.Add(" 1*YZZ "); + } + SQL.Add(" as YZZ "); + SQL.Add(" from"); + SQL.Add(" ("); + SQL.Add(" select distinct XLXSJGBYZZ1_XLXHID as JGBXLXHID,XLXSJGBYZZ1_XLGGID as XLGGID,XLXSJGBYZZ1_XLBZID as XLBZID,"); + SQL.Add(" isnull(XLXSJGBYZZ1_DYDJID,' ') as JGBDYDJID,isnull(XLGGB_XXJGID,' ') as XXJGID, isnull(XLDTJMZHB_DTJM1,0) as ZXJM,"); + SQL.Add(" XLXSJGBYZZ1_TJDH as TJDH,XLXSJGBYZZ1_YZZ as YZZ "); + SQL.Add(" from XLXSJGBYZZ1"); + SQL.Add(" left join XLXHB on XLXHB_XLXHID=XLXSJGBYZZ1_XLXHID "); + SQL.Add(" left join XLGGB on XLGGB_XLGGID=REPLACE(XLXSJGBYZZ1_XLGGID,'*','×') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') "); + SQL.Add(" left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID "); + SQL.Add(" where XLXSJGBYZZ1_JGBID=:pJGBID and XLXSJGBYZZ1_YZID=:pYZID "); + SQL.Add(" ) jgbmx"); + SQL.Add(" left join TJYZJDKCB on TJYZJDKCB_YZID =:pYZID and TJYZJDKCB_KCQXLXHID=JGBXLXHID"); + SQL.Add(" where 1=1"); + // 电压等级 + SQL.Add(" and ( "); + SQL.Add(" case WHEN TJYZJDKCB_DYDJID=JGBDYDJID then 1 "); + SQL.Add(" when TJYZJDKCB_DYDJID= ' ' and JGBDYDJID<> ' ' then 2 "); + SQL.Add(" else -999 end "); + SQL.Add(" ) <> -999 "); + // 主芯截面区间 + SQL.Add(" and TJYZJDKCB_ZXJMXX<= ZXJM and ((TJYZJDKCB_ZXJMSX<>0 and TJYZJDKCB_ZXJMSX>=ZXJM) or TJYZJDKCB_ZXJMSX=0)"); + // 芯线结构 + SQL.Add(" and (TJYZJDKCB_XXJGID=XXJGID or TJYZJDKCB_XXJGID=' ')"); + SQL.Add(" ) DZB"); + SQL.Add(" where DZB.YZZ <= 0 "); + SQL.ParamByName("pJGBID").Value = sJGBID; + SQL.ParamByName("pYZID").Value = sYZID; + DataSet dsWKC = dberp.OpenDataSet(SQL); + string sYZMC = GetTJYZMC(sYZID, "JZJ"); + for (int i = 0; i < dsWKC.Tables[0].Rows.Count; i++) + { + DataRow drWKC = dtWKC.NewRow(); + drWKC["型号"] = dsWKC.Tables[0].Rows[i]["XLXHID"].ToString().Trim(); + drWKC["规格"] = dsWKC.Tables[0].Rows[i]["XLGGID"].ToString().Trim(); + drWKC["标准"] = dsWKC.Tables[0].Rows[i]["XLBZID"].ToString().Trim(); + drWKC["电压等级"] = dsWKC.Tables[0].Rows[i]["DYDJID"].ToString().Trim(); + drWKC["因子名称"] = sYZMC; + dtWKC.Rows.Add(drWKC); + } + SQL.Clear(); @@ -1876,8 +1976,8 @@ namespace GThinking.N_XLXSBJ SQL.Add(" and (TJYZJDKCB_XXJGID=XXJGID or TJYZJDKCB_XXJGID=' ')"); SQL.Add(" ) DZB"); - SQL.Add(" left join XLDYDJB on XLDYDJB_DYDJID=DYDJID ) sor "); - SQL.Add(" on( XLXSJGBYZZ1_JGBID=JGBID and XLXSJGBYZZ1_YZID=YZID and XLXSJGBYZZ1_XLXHID=XLXHID and XLXSJGBYZZ1_XLGGID=XLGGID and XLXSJGBYZZ1_XLBZID=XLBZID and XLXSJGBYZZ1_DYDJID=DYDJID and XLXSJGBYZZ1_YZZ>0 ) "); + SQL.Add(" left join XLDYDJB on XLDYDJB_DYDJID=DYDJID where DZB.YZZ>0 ) sor "); + SQL.Add(" on( XLXSJGBYZZ1_JGBID=JGBID and XLXSJGBYZZ1_YZID=YZID and XLXSJGBYZZ1_XLXHID=XLXHID and XLXSJGBYZZ1_XLGGID=XLGGID and XLXSJGBYZZ1_XLBZID=XLBZID and XLXSJGBYZZ1_DYDJID=DYDJID ) "); SQL.Add(" when matched then update set XLXSJGBYZZ1_XHKCBZ= XHKCBZ,XLXSJGBYZZ1_YZZ=YZZ,XLXSJGBYZZ1_TJDH=TJDH "); SQL.Add(" when not matched then insert "); SQL.Add(" ( "); @@ -1904,7 +2004,15 @@ namespace GThinking.N_XLXSBJ #endregion dberp.CommitTrans(); - ShowMessage("按调价因子加点扩充表扩充成功！"); + if (dtWKC.Rows.Count > 0) + { + DCWKCExcel(dtWKC); + ShowMessage("按调价因子加点扩充表扩充成功，其中" + dtWKC.Rows.Count.ToString() + "条记录因扩充后因子值小于等于0未扩充，已导出未扩充记录！"); + } + else + { + ShowMessage("按调价因子加点扩充表扩充成功！"); + } moduleGV_PageIndexChanging(null, null); } @@ -1919,6 +2027,55 @@ namespace GThinking.N_XLXSBJ } + //导出因扩充后因子值小于等于0而未扩充的记录 + private void DCWKCExcel(DataTable dtWKC) + { + string sFILENAME = "未扩充记录.xls"; + string m_tmpFilePath = FileService.CombineTempPath(Guid.NewGuid().ToString() + sFILENAME); + + DataSet dsDC = new DataSet(); + dsDC.Tables.Add(dtWKC); + string sError = ""; + + NpoiCellData cd = new NpoiCellData(); + cd.CellComment = new System.Collections.Generic.Dictionary(); + + NpoiSheetData sd = new NpoiSheetData(); + sd.ColumnType = new System.Collections.Generic.Dictionary(); + sd.ColumnType.Add("A", NpoiColumnType.String); + sd.ColumnType.Add("B", NpoiColumnType.String); + sd.ColumnType.Add("C", NpoiColumnType.String); + sd.ColumnType.Add("D", NpoiColumnType.String); + sd.ColumnType.Add("E", NpoiColumnType.String); + + sd.ColumnStyle = new System.Collections.Generic.Dictionary(); + NpoiColumnStyle ct = new NpoiColumnStyle(); + ct.DataFormat = "@"; + sd.ColumnStyle.Add("A", ct); + sd.ColumnStyle.Add("B", ct); + sd.ColumnStyle.Add("C", ct); + sd.ColumnStyle.Add("D", ct); + sd.ColumnStyle.Add("E", ct); + sd.FreezePaneRows = 1; + + TExcelData.CreateExcel_NPOI(m_tmpFilePath, dsDC, true, cd, sd, ref sError); + + if (string.IsNullOrEmpty(sError)) + { + System.IO.FileInfo file = new System.IO.FileInfo(m_tmpFilePath); + string URL = Page.ResolveClientUrl("~") + "/N_MODEL/Dialog/TempFileDownload.ashx?TempFileName=" + file.Name + "&FileName=未扩充记录" + file.Extension; + string jsript = @"var JLDCDiv = document.createElement('div');JLDCDiv.style.width=0;JLDCDiv.style.height=0;JLDCDiv.id = 'DivifrDownLoad';" + + " var ele=document.documentElement||document.body;ele.appendChild(JLDCDiv);var iJLDCfrm = document.createElement('iframe');iJLDCfrm.id = 'iJLDCfrmDownLoad';iJLDCfrm.src = '" + URL + "';" + + "iJLDCfrm.style.width = 0;iJLDCfrm.style.height = 0; JLDCDiv.appendChild(iJLDCfrm);"; + AJAXRunScript(this, "OPENWKC", jsript); + } + else + { + ShowMessage("导出未扩充记录失败！"); + } + } + + #endregion #region GridView增加列 diff --git a/CLQDYZList.aspx.designer.cs b/CLQDYZList.aspx.designer.cs index 0bdf309..a0458e5 100644 --- a/CLQDYZList.aspx.designer.cs +++ b/CLQDYZList.aspx.designer.cs @@ -100,15 +100,6 @@ namespace GThinking.N_XLXSBJ { /// protected global::GThinking.N_CONTROL.gtToolButton btnAXJGZDR; - /// - /// btnCKXJFY 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 - /// - protected global::GThinking.N_CONTROL.gtToolButton btnCKXJFY; - /// /// btnACLQDDR 鎺т欢銆 /// diff --git a/CLQDYZQuery.aspx.cs b/CLQDYZQuery.aspx.cs index 9477ac1..a6fd4b1 100644 --- a/CLQDYZQuery.aspx.cs +++ b/CLQDYZQuery.aspx.cs @@ -168,7 +168,12 @@ namespace GThinking.N_XLXSBJ sql.Add(" LEFT JOIN XLXSBJTJXHML AA ON AA.XLXSBJTJXHML_XLXHID = XLXSJGBYZZ1_XLXHID AND AA.XLXSBJTJXHML_DYDJID = isnull( XLXSJGBYZZ1_DYDJID, ' ' )"); sql.Add(" LEFT JOIN XLXSBJTJXHML BB ON BB.XLXSBJTJXHML_XLXHID = XLXSJGBYZZ1_XLXHID AND BB.XLXSBJTJXHML_DYDJID = ' '"); sql.Add(" LEFT JOIN XLXSCPML ON XLXSCPML_CPMLID = case when AA.XLXSBJTJXHML_CPMLID is not null then AA.XLXSBJTJXHML_CPMLID else BB.XLXSBJTJXHML_CPMLID end"); - sql.Add(" where XLXSJGBYZZ1_JGBID=:pJGBID and ISNULL(XLXSCPML_CPMLID, ' ') <>' '"); + sql.Add(" where XLXSJGBYZZ1_JGBID=:pJGBID "); + if (!string.IsNullOrEmpty(PageParam.GetRTrimString("TJYZID"))) + { + sql.Add(" and " + CMISproDataBase.GetWhereEqual("XLXSJGBYZZ1_YZID", PageParam.GetRTrimString("TJYZID").Trim())); + } + sql.Add(" and ISNULL(XLXSCPML_CPMLID, ' ') <>' '"); sql.Add(" ORDER BY XLXSCPML_CPMLID"); sql.ParamByName("pJGBID").Value = cbxJGBID.SelectedValue.Trim(); DataSet ds = dberp.OpenDataSet(sql); @@ -250,6 +255,10 @@ namespace GThinking.N_XLXSBJ sql.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID = XLXSJGBYZZ1_XLXHID and XLXSCLQD_XLGGID = XLXSJGBYZZ1_XLGGID"); sql.Add(" and XLXSCLQD_XLBZID = XLXSJGBYZZ1_XLBZID and XLXSCLQD_DYDJID = isnull(XLXSJGBYZZ1_DYDJID,' ')"); sql.Add(" where XLXSJGBYZZ1_JGBID=:pJGBID "); + if (!string.IsNullOrEmpty(PageParam.GetRTrimString("TJYZID"))) + { + sql.Add(" and " + CMISproDataBase.GetWhereEqual("XLXSJGBYZZ1_YZID", PageParam.GetRTrimString("TJYZID").Trim())); + } sql.Add(" and XLXSCLQD_WPID ='ZZZZ' and XLXSCLQD_JGCZBID=XLJGCZBML_JGCZBID and XLXSCLQD_JGCZBBBID=XLJGCZBML_JGCZBBBID "); if (!txtXLXHID.Text.Trim().Equals("")) { diff --git a/DRJGBYZZ1_AXJGZDR.aspx.cs b/DRJGBYZZ1_AXJGZDR.aspx.cs index 909d29e..a9b6514 100644 --- a/DRJGBYZZ1_AXJGZDR.aspx.cs +++ b/DRJGBYZZ1_AXJGZDR.aspx.cs @@ -203,7 +203,7 @@ namespace GThinking.N_XLXSBJ { string sXLXHID = sGetCellText(dtSheet1.Rows[i], 0); string sXLGGID = sGetCellText(dtSheet1.Rows[i], 1); - string sXLBZID = sGetCellText(dtSheet1.Rows[i], 2); + string sXLBZRaw = sGetCellText(dtSheet1.Rows[i], 2); string sDYDJID = sGetCellText(dtSheet1.Rows[i], 3); string sWJ = sGetCellText(dtSheet1.Rows[i], 4); string sLB = sGetCellText(dtSheet1.Rows[i], 5); @@ -238,9 +238,20 @@ namespace GThinking.N_XLXSBJ { sXLGGID = sXLGGID.Replace("x", "X").Replace("X", "*").Replace("×", "*"); } - sXLBZID = XLBJDUtils.GetBZXLZBZID(sXLBZID, sDefaultXLBZID, dicDRMXBZ); - if (sXLBZID.Equals("")) - sXLBZID = " "; + string sXLBZID = XLBJDUtils.GetBZXLZBZID(sXLBZRaw, sDefaultXLBZID, dicDRMXBZ); + + //标准为GA时，同步生成G、Q标准的记录，其他信息一致 + List listXLBZID = new List(); + listXLBZID.Add(sXLBZID); + if (sXLBZRaw.ToUpper().Equals("GA")) + { + string sGBZID = XLBJDUtils.GetBZXLZBZID("G", sDefaultXLBZID, dicDRMXBZ); + string sQBZID = XLBJDUtils.GetBZXLZBZID("Q", sDefaultXLBZID, dicDRMXBZ); + if (!sGBZID.Equals("") && !listXLBZID.Contains(sGBZID)) + listXLBZID.Add(sGBZID); + if (!sQBZID.Equals("") && !listXLBZID.Contains(sQBZID)) + listXLBZID.Add(sQBZID); + } //规则1：所有产品，包装要求按扎为单位的，均不考虑计算装盘数据 //if (sDW.Contains("扎")) @@ -312,49 +323,85 @@ namespace GThinking.N_XLXSBJ } Mac.MacLog.TraceFormat("DR4"); - if (!CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSJGBYZZ1 where XLXSJGBYZZ1_JGBID='{0}' and XLXSJGBYZZ1_XLXHID='{1}' and XLXSJGBYZZ1_XLGGID='{2}' and XLXSJGBYZZ1_DYDJID='{3}' and XLXSJGBYZZ1_XLBZID='{4}' and XLXSJGBYZZ1_YZID='{5}'", - sJGBID, sXLXHID, sXLGGID, sDYDJID, sXLBZID, sYZID))) + foreach (string sCurXLBZID in listXLBZID) { - sSQL.Clear(); - sSQL.Add("insert into XLXSJGBYZZ1(XLXSJGBYZZ1_JGBID,XLXSJGBYZZ1_XLXHID,XLXSJGBYZZ1_XLGGID,XLXSJGBYZZ1_DYDJID,XLXSJGBYZZ1_XLBZID,XLXSJGBYZZ1_YZID,XLXSJGBYZZ1_YZZ,XLXSJGBYZZ1_TJDH,XLXSJGBYZZ1_WHR,XLXSJGBYZZ1_WHRID,XLXSJGBYZZ1_WHSJ)"); - sSQL.Add(" values(:XLXSJGBYZZ1_JGBID,:XLXSJGBYZZ1_XLXHID,:XLXSJGBYZZ1_XLGGID,:XLXSJGBYZZ1_DYDJID,:XLXSJGBYZZ1_XLBZID,:XLXSJGBYZZ1_YZID,:XLXSJGBYZZ1_YZZ,:XLXSJGBYZZ1_TJDH,:XLXSJGBYZZ1_WHR,:XLXSJGBYZZ1_WHRID,:XLXSJGBYZZ1_WHSJ)"); - sSQL.ParamByName("XLXSJGBYZZ1_JGBID").Value = sJGBID; - sSQL.ParamByName("XLXSJGBYZZ1_XLXHID").Value = sXLXHID; - sSQL.ParamByName("XLXSJGBYZZ1_XLGGID").Value = sXLGGID; - sSQL.ParamByName("XLXSJGBYZZ1_DYDJID").Value = sDYDJID; - sSQL.ParamByName("XLXSJGBYZZ1_XLBZID").Value = sXLBZID; - sSQL.ParamByName("XLXSJGBYZZ1_YZID").Value = sYZID; - sSQL.ParamByName("XLXSJGBYZZ1_YZZ").Value = dAmount; - sSQL.ParamByName("XLXSJGBYZZ1_TJDH").Value = " "; - sSQL.ParamByName("XLXSJGBYZZ1_WHR").Value = tSession.UserName; - sSQL.ParamByName("XLXSJGBYZZ1_WHRID").Value = tSession.UserId; - sSQL.ParamByName("XLXSJGBYZZ1_WHSJ").Value = DateTime.Now; - dberp.ExecSQL(sSQL); + string sBZID = sCurXLBZID.Equals("") ? " " : sCurXLBZID; + + if (!CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from BJCPXX where BJCPXX_XLXHID='{0}' and BJCPXX_XLGGID='{1}' and BJCPXX_XLBZID='{2}' and BJCPXX_DYDJID='{3}'", sXLXHID, sXLGGID.Replace("*", "×"), sBZID, sDYDJID))) + { + sSQL.Clear(); + sSQL.Add("insert into BJCPXX(BJCPXX_XLXHID,BJCPXX_XLGGID,BJCPXX_XLBZID,BJCPXX_DYDJID,BJCPXX_WJ,BJCPXX_WHR,BJCPXX_WHRID,BJCPXX_WHSJ)"); + sSQL.Add(" values(:BJCPXX_XLXHID,:BJCPXX_XLGGID,:BJCPXX_XLBZID,:BJCPXX_DYDJID,:BJCPXX_WJ,:BJCPXX_WHR,:BJCPXX_WHRID,:BJCPXX_WHSJ)"); + sSQL.ParamByName("BJCPXX_XLXHID").Value = sXLXHID; + sSQL.ParamByName("BJCPXX_XLGGID").Value = sXLGGID.Replace("*", "×"); + sSQL.ParamByName("BJCPXX_XLBZID").Value = sBZID; + sSQL.ParamByName("BJCPXX_DYDJID").Value = sDYDJID; + sSQL.ParamByName("BJCPXX_WJ").Value = CMISproConvert.StrToFloat(sWJ); + sSQL.ParamByName("BJCPXX_WHR").Value = tSession.UserName; + sSQL.ParamByName("BJCPXX_WHRID").Value = tSession.UserId; + sSQL.ParamByName("BJCPXX_WHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + else + { + sSQL.Clear(); + sSQL.Add("update BJCPXX set BJCPXX_WJ=:BJCPXX_WJ,BJCPXX_WHR=:BJCPXX_WHR,BJCPXX_WHRID=:BJCPXX_WHRID,BJCPXX_WHSJ=:BJCPXX_WHSJ "); + sSQL.Add(" where BJCPXX_XLXHID=:BJCPXX_XLXHID and BJCPXX_XLGGID=:BJCPXX_XLGGID and BJCPXX_XLBZID=:BJCPXX_XLBZID and BJCPXX_DYDJID=:BJCPXX_DYDJID "); + sSQL.ParamByName("BJCPXX_XLXHID").Value = sXLXHID; + sSQL.ParamByName("BJCPXX_XLGGID").Value = sXLGGID.Replace("*", "×"); + sSQL.ParamByName("BJCPXX_XLBZID").Value = sBZID; + sSQL.ParamByName("BJCPXX_DYDJID").Value = sDYDJID; + sSQL.ParamByName("BJCPXX_WJ").Value = CMISproConvert.StrToFloat(sWJ); + sSQL.ParamByName("BJCPXX_WHR").Value = tSession.UserName; + sSQL.ParamByName("BJCPXX_WHRID").Value = tSession.UserId; + sSQL.ParamByName("BJCPXX_WHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + + if (!CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSJGBYZZ1 where XLXSJGBYZZ1_JGBID='{0}' and XLXSJGBYZZ1_XLXHID='{1}' and XLXSJGBYZZ1_XLGGID='{2}' and XLXSJGBYZZ1_DYDJID='{3}' and XLXSJGBYZZ1_XLBZID='{4}' and XLXSJGBYZZ1_YZID='{5}'", + sJGBID, sXLXHID, sXLGGID, sDYDJID, sBZID, sYZID))) + { + sSQL.Clear(); + sSQL.Add("insert into XLXSJGBYZZ1(XLXSJGBYZZ1_JGBID,XLXSJGBYZZ1_XLXHID,XLXSJGBYZZ1_XLGGID,XLXSJGBYZZ1_DYDJID,XLXSJGBYZZ1_XLBZID,XLXSJGBYZZ1_YZID,XLXSJGBYZZ1_YZZ,XLXSJGBYZZ1_TJDH,XLXSJGBYZZ1_WHR,XLXSJGBYZZ1_WHRID,XLXSJGBYZZ1_WHSJ)"); + sSQL.Add(" values(:XLXSJGBYZZ1_JGBID,:XLXSJGBYZZ1_XLXHID,:XLXSJGBYZZ1_XLGGID,:XLXSJGBYZZ1_DYDJID,:XLXSJGBYZZ1_XLBZID,:XLXSJGBYZZ1_YZID,:XLXSJGBYZZ1_YZZ,:XLXSJGBYZZ1_TJDH,:XLXSJGBYZZ1_WHR,:XLXSJGBYZZ1_WHRID,:XLXSJGBYZZ1_WHSJ)"); + sSQL.ParamByName("XLXSJGBYZZ1_JGBID").Value = sJGBID; + sSQL.ParamByName("XLXSJGBYZZ1_XLXHID").Value = sXLXHID; + sSQL.ParamByName("XLXSJGBYZZ1_XLGGID").Value = sXLGGID; + sSQL.ParamByName("XLXSJGBYZZ1_DYDJID").Value = sDYDJID; + sSQL.ParamByName("XLXSJGBYZZ1_XLBZID").Value = sBZID; + sSQL.ParamByName("XLXSJGBYZZ1_YZID").Value = sYZID; + sSQL.ParamByName("XLXSJGBYZZ1_YZZ").Value = dAmount; + sSQL.ParamByName("XLXSJGBYZZ1_TJDH").Value = " "; + sSQL.ParamByName("XLXSJGBYZZ1_WHR").Value = tSession.UserName; + sSQL.ParamByName("XLXSJGBYZZ1_WHRID").Value = tSession.UserId; + sSQL.ParamByName("XLXSJGBYZZ1_WHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + else + { + sSQL.Clear(); + sSQL.Add("update XLXSJGBYZZ1 set XLXSJGBYZZ1_YZZ=:XLXSJGBYZZ1_YZZ,XLXSJGBYZZ1_TJDH=:XLXSJGBYZZ1_TJDH,XLXSJGBYZZ1_WHR=:XLXSJGBYZZ1_WHR,XLXSJGBYZZ1_WHRID=:XLXSJGBYZZ1_WHRID,XLXSJGBYZZ1_WHSJ=:XLXSJGBYZZ1_WHSJ"); + sSQL.Add(" where XLXSJGBYZZ1_JGBID=:XLXSJGBYZZ1_JGBID"); + sSQL.Add(" and XLXSJGBYZZ1_XLXHID=:XLXSJGBYZZ1_XLXHID"); + sSQL.Add(" and XLXSJGBYZZ1_XLGGID=:XLXSJGBYZZ1_XLGGID"); + sSQL.Add(" and XLXSJGBYZZ1_DYDJID=:XLXSJGBYZZ1_DYDJID"); + sSQL.Add(" and XLXSJGBYZZ1_XLBZID=:XLXSJGBYZZ1_XLBZID"); + sSQL.Add(" and XLXSJGBYZZ1_YZID=:XLXSJGBYZZ1_YZID"); + sSQL.ParamByName("XLXSJGBYZZ1_JGBID").Value = sJGBID; + sSQL.ParamByName("XLXSJGBYZZ1_XLXHID").Value = sXLXHID; + sSQL.ParamByName("XLXSJGBYZZ1_XLGGID").Value = sXLGGID; + sSQL.ParamByName("XLXSJGBYZZ1_DYDJID").Value = sDYDJID; + sSQL.ParamByName("XLXSJGBYZZ1_XLBZID").Value = sBZID; + sSQL.ParamByName("XLXSJGBYZZ1_YZID").Value = sYZID; + sSQL.ParamByName("XLXSJGBYZZ1_YZZ").Value = dAmount; + sSQL.ParamByName("XLXSJGBYZZ1_TJDH").Value = " "; + sSQL.ParamByName("XLXSJGBYZZ1_WHR").Value = tSession.UserName; + sSQL.ParamByName("XLXSJGBYZZ1_WHRID").Value = tSession.UserId; + sSQL.ParamByName("XLXSJGBYZZ1_WHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + iInsertCount++; } - else - { - sSQL.Clear(); - sSQL.Add("update XLXSJGBYZZ1 set XLXSJGBYZZ1_YZZ=:XLXSJGBYZZ1_YZZ,XLXSJGBYZZ1_TJDH=:XLXSJGBYZZ1_TJDH,XLXSJGBYZZ1_WHR=:XLXSJGBYZZ1_WHR,XLXSJGBYZZ1_WHRID=:XLXSJGBYZZ1_WHRID,XLXSJGBYZZ1_WHSJ=:XLXSJGBYZZ1_WHSJ"); - sSQL.Add(" where XLXSJGBYZZ1_JGBID=:XLXSJGBYZZ1_JGBID"); - sSQL.Add(" and XLXSJGBYZZ1_XLXHID=:XLXSJGBYZZ1_XLXHID"); - sSQL.Add(" and XLXSJGBYZZ1_XLGGID=:XLXSJGBYZZ1_XLGGID"); - sSQL.Add(" and XLXSJGBYZZ1_DYDJID=:XLXSJGBYZZ1_DYDJID"); - sSQL.Add(" and XLXSJGBYZZ1_XLBZID=:XLXSJGBYZZ1_XLBZID"); - sSQL.Add(" and XLXSJGBYZZ1_YZID=:XLXSJGBYZZ1_YZID"); - sSQL.ParamByName("XLXSJGBYZZ1_JGBID").Value = sJGBID; - sSQL.ParamByName("XLXSJGBYZZ1_XLXHID").Value = sXLXHID; - sSQL.ParamByName("XLXSJGBYZZ1_XLGGID").Value = sXLGGID; - sSQL.ParamByName("XLXSJGBYZZ1_DYDJID").Value = sDYDJID; - sSQL.ParamByName("XLXSJGBYZZ1_XLBZID").Value = sXLBZID; - sSQL.ParamByName("XLXSJGBYZZ1_YZID").Value = sYZID; - sSQL.ParamByName("XLXSJGBYZZ1_YZZ").Value = dAmount; - sSQL.ParamByName("XLXSJGBYZZ1_TJDH").Value = " "; - sSQL.ParamByName("XLXSJGBYZZ1_WHR").Value = tSession.UserName; - sSQL.ParamByName("XLXSJGBYZZ1_WHRID").Value = tSession.UserId; - sSQL.ParamByName("XLXSJGBYZZ1_WHSJ").Value = DateTime.Now; - dberp.ExecSQL(sSQL); - } - iInsertCount++; } if (iInsertCount == 0) { diff --git a/N_XLXSBJA.csproj b/N_XLXSBJA.csproj index 63967df..9fc3306 100644 --- a/N_XLXSBJA.csproj +++ b/N_XLXSBJA.csproj @@ -1,4 +1,4 @@ -锘 + Debug AnyCPU @@ -146,6 +146,7 @@ + @@ -1035,6 +1036,14 @@ + + + ASPXCodeBehind + TZYZJJC_DRInfo.aspx + + + TZYZJJC_DRInfo.aspx + ASPXCodeBehind TZYZJJCInfo.aspx diff --git a/N_XLXSBJA.suo b/N_XLXSBJA.suo index b576594..0bd35aa 100644 Binary files a/N_XLXSBJA.suo and b/N_XLXSBJA.suo differ diff --git a/TZYZJJCList.aspx b/TZYZJJCList.aspx index ce31c9f..08cf9e3 100644 --- a/TZYZJJCList.aspx +++ b/TZYZJJCList.aspx @@ -7,7 +7,16 @@ - + + + + + + + + diff --git a/TZYZJJCList.aspx.cs b/TZYZJJCList.aspx.cs index fcea898..a7709e2 100644 --- a/TZYZJJCList.aspx.cs +++ b/TZYZJJCList.aspx.cs @@ -219,7 +219,7 @@ namespace GThinking.N_XLXSBJ if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("CPTX").Value.Trim())) { sSQL.AppendLine(" and YZZ1.XLXSJGBYZZC_CPTX = :pCPTX "); - entity.Param.Add("pCPTX", CurQueryEntity.FieldByName("CPTX").Value.Trim()); + entity.Param.Add("pCPTX", CurQueryEntity.FieldByName("CPTX").Value.Trim().Replace("锛", ",")); } if (!string.IsNullOrEmpty(sYZIDlist)) @@ -350,7 +350,29 @@ namespace GThinking.N_XLXSBJ pageParams.UrlPath = "XLXHCPTXWHList.aspx"; OpenDialog(pageParams); } - + + protected void btnDR_Click(object sender, EventArgs e) + { + base.InitEntityByCondition(); + if (CurQueryEntity.FieldByName("JGBID").Value.Trim().Equals("")) + { + ShowMessage("璋冧环琛ㄦ潯浠朵负绌猴紝璇峰厛杩涜鏌ヨ锛"); + return; + } + + TPageParams pageParams = new TPageParams(); + pageParams.UrlPath = "TZYZJJC_DRInfo.aspx"; + pageParams.Title = "瀵煎叆Excel鏂囦欢"; + pageParams.AddString("JGBID", CurQueryEntity.FieldByName("JGBID").Value.Trim()); + pageParams.AddString("btnRefreshCID", btnRefresh.ClientID); + OpenDialog(pageParams); + } + + protected void btnRefresh_Click(object sender, EventArgs e) + { + moduleGV_PageIndexChanging(null, null); + } + #endregion #region GridView澧炲姞鍒 diff --git a/TZYZJJCList.aspx.designer.cs b/TZYZJJCList.aspx.designer.cs index af6e0c1..a146407 100644 --- a/TZYZJJCList.aspx.designer.cs +++ b/TZYZJJCList.aspx.designer.cs @@ -36,6 +36,24 @@ namespace GThinking.N_XLXSBJ { /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 /// protected global::GThinking.N_CONTROL.gtToolButton btnXHTX; + + /// + /// btnDR 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtToolButton btnDR; + + /// + /// btnRefresh 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtButton btnRefresh; /// /// ContentGrid 鎺т欢銆 diff --git a/TZYZJJCQuery.aspx.cs b/TZYZJJCQuery.aspx.cs index 77d0cdd..32f1a64 100644 --- a/TZYZJJCQuery.aspx.cs +++ b/TZYZJJCQuery.aspx.cs @@ -80,37 +80,7 @@ namespace GThinking.N_XLXSBJ cbxJGBID.Items.Add(new ListItem(sJGBID + "|" + sYXQS + "鑷" + sYXQZ + "|" + sJGBMC, sJGBID)); } - Dictionary dict = new Dictionary(); - dict.Add("1", "鑰愮伀1"); - dict.Add("2", "鑰愮伀2"); - dict.Add("3", "灞忚斀"); - dict.Add("4", "閽㈠甫閾犺"); - dict.Add("5", "閽笣閾犺"); - dict.Add("6", "浣庣儫鏃犲崵"); - dict.Add("7", "ZC"); - dict.Add("8", "ZB"); - dict.Add("9", "ZA"); - dict.Add("A", "(B1)"); - dict.Add("B", "(B2)"); - dict.Add("C", "(F)"); - dict.Add("D", "1鍚庣紑R"); - dict.Add("E", "2鍚庣紑R"); - dict.Add("F", "闀閿￠摐"); - dict.Add("G", "NS"); - dict.Add("H", "NW"); - dict.Add("I", "NJ"); - dict.Add("J", "U"); - dict.Add("K", "(d0,t0)"); - dict.Add("L", "FSY"); - dict.Add("M", "S瀵圭粸"); - dict.Add("N", "P2P-22"); - dict.Add("O", "HD鑰愬瘨"); - - cbxCPTX.ClearItems(); - foreach(string skey in dict.Keys) - { - cbxCPTX.Items.Add(new ListItem(dict[skey], skey)); - } + TComboBox.SetComboBox("DBERP",cbxCPTX, "select distinct XLXSJGBYZZC_CPTX as ID,XLXSJGBYZZC_CPTX as NAME from XLXSJGBYZZC ", true); } diff --git a/TZYZJJC_DR.cs b/TZYZJJC_DR.cs new file mode 100644 index 0000000..90c36ea --- /dev/null +++ b/TZYZJJC_DR.cs @@ -0,0 +1,18 @@ +锘縰sing System; +using System.Data; +using System.Configuration; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using GThinking.N_MODEL.Page; + +namespace GThinking.N_XLXSBJ +{ + [TableMap(DB = "DBERP", DbTableName = "XLXSJGBYZZC", Umid = 100860166, IsWorkFlow = false, UseWhr = false)] + public class TZYZJJC_DR : EntityManager + { + } +} diff --git a/TZYZJJC_DRInfo.aspx b/TZYZJJC_DRInfo.aspx new file mode 100644 index 0000000..d92bd1c --- /dev/null +++ b/TZYZJJC_DRInfo.aspx @@ -0,0 +1,67 @@ +锘<%@ Page Language="C#" MasterPageFile="~/N_MODEL/Page/MasterSingleCard.Master" AutoEventWireup="true" + CodeBehind="TZYZJJC_DRInfo.aspx.cs" Inherits="GThinking.N_XLXSBJ.TZYZJJC_DRInfo" Title="瀵煎叆Excel鏂囦欢"%> + +<%@ MasterType VirtualPath="~/N_MODEL/Page/MasterSingleCard.Master " %> + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + +
+ Excel鏍忕洰渚濇涓猴細浜у搧鐗规с佷富鑺埅闈€佽皟浠峰洜瀛 +
+
+
+ + + + diff --git a/TZYZJJC_DRInfo.aspx.cs b/TZYZJJC_DRInfo.aspx.cs new file mode 100644 index 0000000..d6d14cd --- /dev/null +++ b/TZYZJJC_DRInfo.aspx.cs @@ -0,0 +1,240 @@ +锘縰sing System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; +using GThinking.N_MODEL.Page; +using GThinking.N_MISPRO.Data; +using GThinking.N_MISPRO.Utility; +using System.Collections.Generic; +using GThinking.N_CONTROL; +using GThinking.N_MISPROAS; + +namespace GThinking.N_XLXSBJ +{ + public partial class TZYZJJC_DRInfo : SingleCardBase + { + TZYZJJC_DR entity = new TZYZJJC_DR(); + + protected void Page_Load(object sender, EventArgs e) + { + this.UMID = 100860166; + this.UMName = "鎸変骇鍝佺壒鎬ц皟琛ㄤ环"; + base.CurMaster = Master; + base.CurEntity = entity; + this.PageHeight = 210; + this.PageWidth = 420; + Master.EnableAttachBtn = false; + Master.EnableCancelBtn = false; + Master.EnableCopyBtn = false; + Master.EnableDeleteBtn = false; + Master.EnableEditBtn = false; + Master.EnableInsertBtn = false; + Master.EnablePrintBtn = false; + Master.EnableRefreshBtn = false; + Master.EnableSaveBtn = false; + fupdPost.FileSaveType = gtAsyncFileUpload.DFileSaveType.SaveToPath; + fupdPost.Filter = "XLS,XLSX"; + this.Page.Title = "瀵煎叆Excel鏂囦欢"; + base.InitPage(); + + if (!IsPostBack) + { + GtLabel1.Text = "Excel鏍忕洰渚濇涓猴細浜у搧鐗规с佷富鑺埅闈€佽皟浠峰洜瀛"; + txtJGBID.Value = PageParam.GetRTrimString("JGBID"); + chkIns.Value = "Y"; + + TDatabase dberp = TContextDatabases.GetDatabase("DBERP"); + TSQL SQL = new TSQL(dberp); + SQL.Clear(); + SQL.Add("select XLXSTZYZ_YZID, XLXSTZYZ_YZMC, XLXSTZYZ_JJFS "); + SQL.Add(" from XLXSTZYZ"); + SQL.Add(" where XLXSTZYZ_MXBH = 'JZJ' and XLXSTZYZ_TJYS='C' "); + SQL.Add(" and XLXSTZYZ_JGBID = :pJGBID"); + SQL.Add("order by XLXSTZYZ_YZID,XLXSTZYZ_XSXH"); + SQL.ParamByName("pJGBID").Value = txtJGBID.Value; + DataSet ds = dberp.OpenDataSet(SQL); + cbxYZID.ClearItems(); + for (int i = 0; i < ds.Tables[0].Rows.Count; i++) + { + string sJJFSMC = ""; + if (ds.Tables[0].Rows[i]["XLXSTZYZ_JJFS"].ToString().Trim().Equals("JJ")) + { + sJJFSMC = "(鍏)"; + } + else if (ds.Tables[0].Rows[i]["XLXSTZYZ_JJFS"].ToString().Trim().Equals("JD") || ds.Tables[0].Rows[i]["XLXSTZYZ_JJFS"].ToString().Trim().Equals("KD")) + { + sJJFSMC = "(%)"; + } + cbxYZID.Items.Add(new ListItem(ds.Tables[0].Rows[i]["XLXSTZYZ_YZMC"].ToString().Trim() + sJJFSMC, ds.Tables[0].Rows[i]["XLXSTZYZ_YZID"].ToString().Trim())); + } + if (ds.Tables[0].Rows.Count == 1) + { + cbxYZID.SelectedValue = ds.Tables[0].Rows[0]["XLXSTZYZ_YZID"].ToString().Trim(); + } + } + } + + #region 鎺т欢浜嬩欢 + + protected void btnQD_Click(object sender, EventArgs e) + { + if (cbxYZID.SelectedValue.Trim().Equals("")) + { + ShowMessage("璇烽夋嫨寰呰缃殑璋冧环鍥犲瓙锛"); + return; + } + if (fupdPost.FilePath.Equals("")) + { + ShowMessage("璇烽夋嫨闇瑕佸鍏ョ殑鏂囦欢锛"); + return; + } + TDatabase dberp = TContextDatabases.GetDatabase("DBERP"); + TSQL sSQL = new TSQL(dberp); + try + { + lblTitle.Text = "姝ｅ湪瀵煎叆鏁版嵁锛岃绋嶅悗..."; + dberp.BeginTrans(); + DataSet aDataExcel = new DataSet(); + if (AppRuntime.BitType == AppBitType.Bit32) + { + aDataExcel = XLBJDUtils.ReadFromExcelFile(fupdPost.FilePath, 0, ""); + } + else // AppBitType.Bit64 + { + ReadWJ(fupdPost.FilePath, ref aDataExcel); + } + ExcelColumnValid(aDataExcel); + InsertYZZC(dberp, sSQL, aDataExcel); + dberp.CommitTrans(); + ShowMessage("瀵煎叆鎴愬姛锛"); + + //鎵ц瀹屾瘯鍚庡埛鏂扮埗椤甸潰骞跺叧闂綋鍓嶉〉闈 + DialogOperationScript dos = new DialogOperationScript(this); + dos.ClickOwnerButton(PageParam.GetRTrimString("btnRefreshCID")); + dos.CloseSelf(); + dos.Execute(); + } + catch (Exception ex) + { + lblTitle.Text = ""; + dberp.RollbackTrans(); + ShowMessage(ex.Message); + } + finally + { + if (!fupdPost.FilePath.Trim().Equals("") && System.IO.File.Exists(fupdPost.FilePath.Trim())) + System.IO.File.Delete(fupdPost.FilePath.Trim()); + } + } + + protected void btnQX_Click(object sender, EventArgs e) + { + CloseWindow(); + } + + #endregion + + #region 鑷畾涔夊嚱鏁 + + private void InsertYZZC(TDatabase dberp, TSQL sSQL, DataSet ds) + { + int rrrorNUM = 2; + foreach (DataRow Row in ds.Tables[0].Rows) + { + string sCPTX = sGetCellTest(Row, 0).Trim(); + string sZXJM = sGetCellTest(Row, 1).Trim(); + double dZXJM = CMISproConvert.StrToFloat(sZXJM); + double dYZZ = CMISproConvert.StrToFloat(sGetCellTest(Row, 2), 0); + if (sCPTX.Trim().Equals("")) + { + throw new Exception("绗" + rrrorNUM + "琛屼骇鍝佺壒鎬т负绌猴紒"); + } + if (!CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXHB where XLXHB_XLTXID='{0}' and ISNULL(XLXHB_TYBZ,'N') <> 'Y' ", sCPTX))) + { + throw new Exception("绗" + rrrorNUM + "琛屼骇鍝佺壒鎬" + sCPTX + "]涓嶅瓨鍦ㄦ垨宸插仠鐢紒"); + } + if (dZXJM <= 0) + { + throw new Exception("绗" + rrrorNUM + "琛屼富鑺埅闈" + sZXJM + "]涓嶅悎娉曪紒"); + } + + if (!CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSJGBYZZC where XLXSJGBYZZC_JGBID='{0}' and XLXSJGBYZZC_CPTX='{1}' and XLXSJGBYZZC_ZXJM={2} and XLXSJGBYZZC_YZID='{3}'", + txtJGBID.Value.Trim(), sCPTX, dZXJM, cbxYZID.SelectedValue.Trim()))) + { + if (chkIns.Checked)//涓嶅瓨鍦ㄧ殑璁板綍鑷姩鎻掑叆 + { + sSQL.Clear(); + sSQL.Add("insert into XLXSJGBYZZC(XLXSJGBYZZC_JGBID,XLXSJGBYZZC_CPTX,XLXSJGBYZZC_ZXJM,XLXSJGBYZZC_YZID,XLXSJGBYZZC_YZZ,XLXSJGBYZZC_WHR,XLXSJGBYZZC_WHRID,XLXSJGBYZZC_WHSJ)"); + sSQL.Add(" values(:pJGBID,:pCPTX,:pZXJM,:pYZID,:pYZZ,:pWHR,:pWHRID,:pWHSJ)"); + sSQL.ParamByName("pJGBID").Value = txtJGBID.Value.Trim(); + sSQL.ParamByName("pCPTX").Value = sCPTX; + sSQL.ParamByName("pZXJM").Value = dZXJM; + sSQL.ParamByName("pYZID").Value = cbxYZID.SelectedValue.Trim(); + sSQL.ParamByName("pYZZ").Value = dYZZ; + sSQL.ParamByName("pWHR").Value = tSession.UserName; + sSQL.ParamByName("pWHRID").Value = tSession.UserId; + sSQL.ParamByName("pWHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + } + else + { + sSQL.Clear(); + sSQL.Add("update XLXSJGBYZZC set XLXSJGBYZZC_YZZ = :pYZZ,XLXSJGBYZZC_WHR = :pWHR,XLXSJGBYZZC_WHRID =:pWHRID,XLXSJGBYZZC_WHSJ =:pWHSJ "); + sSQL.Add(" where XLXSJGBYZZC_JGBID=:pJGBID"); + sSQL.Add(" and XLXSJGBYZZC_CPTX=:pCPTX"); + sSQL.Add(" and XLXSJGBYZZC_ZXJM=:pZXJM"); + sSQL.Add(" and XLXSJGBYZZC_YZID=:pYZID"); + sSQL.ParamByName("pJGBID").Value = txtJGBID.Value.Trim(); + sSQL.ParamByName("pCPTX").Value = sCPTX; + sSQL.ParamByName("pZXJM").Value = dZXJM; + sSQL.ParamByName("pYZID").Value = cbxYZID.SelectedValue.Trim(); + sSQL.ParamByName("pYZZ").Value = dYZZ; + sSQL.ParamByName("pWHR").Value = tSession.UserName; + sSQL.ParamByName("pWHRID").Value = tSession.UserId; + sSQL.ParamByName("pWHSJ").Value = DateTime.Now; + dberp.ExecSQL(sSQL); + } + rrrorNUM++; + } + } + + private void ExcelColumnValid(DataSet ds) + { + Dictionary ColumnNames = new Dictionary(); + ColumnNames.Add("0", "浜у搧鐗规"); + ColumnNames.Add("1", "涓昏姱鎴潰"); + ColumnNames.Add("2", cbxYZID.SelectedItem.Text.Trim()); + for (int i = 0; i < 3; i++) + { + if (!ds.Tables[0].Columns[i].ColumnName.Trim().Equals(ColumnNames[i.ToString()].Trim())) + { + throw new Exception("瀵煎叆鏂囦欢鐨勫唴瀹规牸寮忎笉姝ｇ‘锛孍xcel鏍忕洰渚濇涓猴細浜у搧鐗规с佷富鑺埅闈€" + cbxYZID.SelectedItem.Text.Trim() + "锛"); + } + } + } + + private void ReadWJ(string sPath, ref DataSet aDataExcel) + { + string sMessage = ""; + aDataExcel = TExcelData.ReadExcel(sPath.Trim(), "", "", false, ref sMessage); + if (!sMessage.Trim().Equals("")) + { + throw new Exception("鏂囦欢璇诲彇澶辫触锛佸叿浣撳師鍥狅細" + sMessage); + } + } + + private string sGetCellTest(DataRow Row, int ColumnIndex) + { + return Row[ColumnIndex].ToString().Trim().Replace("\r\n", "").Replace("\n", ""); + } + + #endregion + } +} diff --git a/TZYZJJC_DRInfo.aspx.designer.cs b/TZYZJJC_DRInfo.aspx.designer.cs new file mode 100644 index 0000000..91cc02c --- /dev/null +++ b/TZYZJJC_DRInfo.aspx.designer.cs @@ -0,0 +1,133 @@ +锘//------------------------------------------------------------------------------ +// +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// 杩愯鏃剁増鏈:2.0.50727.9151 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋 +// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便 +// +//------------------------------------------------------------------------------ + +namespace GThinking.N_XLXSBJ { + + + /// + /// TZYZJJC_DRInfo 绫汇 + /// + /// + /// 鑷姩鐢熸垚鐨勭被銆 + /// + public partial class TZYZJJC_DRInfo { + + /// + /// tbl1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::System.Web.UI.WebControls.Table tbl1; + + /// + /// btnQD 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtToolButton btnQD; + + /// + /// btnQX 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtToolButton btnQX; + + /// + /// GtLabel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtLabel GtLabel2; + + /// + /// cbxYZID 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtComboBox cbxYZID; + + /// + /// lblWJ 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtLabel lblWJ; + + /// + /// fupdPost 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtAsyncFileUpload fupdPost; + + /// + /// chkIns 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtCheckBox chkIns; + + /// + /// GtLabel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtLabel GtLabel1; + + /// + /// lblTitle 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::System.Web.UI.WebControls.Label lblTitle; + + /// + /// txtJGBID 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::System.Web.UI.WebControls.HiddenField txtJGBID; + + /// + /// Master 灞炴с + /// + /// + /// 鑷姩鐢熸垚鐨勫睘鎬с + /// + public new GThinking.N_MODEL.Page.MasterSingleCard Master { + get { + return ((GThinking.N_MODEL.Page.MasterSingleCard)(base.Master)); + } + } + } +} diff --git a/XLBJDInfo.aspx.cs b/XLBJDInfo.aspx.cs index b8416b5..b332a55 100644 --- a/XLBJDInfo.aspx.cs +++ b/XLBJDInfo.aspx.cs @@ -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锛岄噸鏂板姞杞絚bxJGBID 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銆並M銆佺背銆佸崈绫炽並G銆乀銆佸崈鍏嬨佸叕鏂ゃ佸惃 @@ -17005,6 +17025,7 @@ namespace GThinking.N_XLXSBJ } else//琛ㄤ环瀹炴椂璁＄畻浠锋牸琛 { + Mac.MacLog.TraceFormat("grdXLBJDMX_CalculateField-4.0.7"); //M銆並M銆佺背銆佸崈绫炽並G銆乀銆佸崈鍏嬨佸叕鏂ゃ佸惃 if (XLBJDUtils.sJCJLDWList.IndexOf(sJGBJSDW.ToUpper()) >= 0 && XLBJDUtils.sJCJLDWList.IndexOf(sJLDW.ToUpper()) >= 0) @@ -17054,7 +17075,7 @@ namespace GThinking.N_XLXSBJ Dictionary dicXLJBXX_JGE = new Dictionary(); 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 棰滆壊 //濡傛灉绾跨紗棰滆壊鍙樹簡锛屽垯闇瑕侀噸鏂拌幏鍙栨寜鈥淒|棰滆壊鈥濊缃殑璋冧环鍥犲瓙鍊 @@ -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>(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(); 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 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)) diff --git a/XLBJDUtils.cs b/XLBJDUtils.cs index 5ff005c..30a8303 100644 --- a/XLBJDUtils.cs +++ b/XLBJDUtils.cs @@ -2565,23 +2565,27 @@ namespace GThinking.N_XLXSBJ sql.ParamByName("pTJ").Value = dLJ * 1000; } - DataSet dsQH = dberp.OpenDataSet(sql); - if (dsQH.Tables[0].Rows.Count > 0) + if (bTCP || bLCP) { - string sQH = dsQH.Tables[0].Rows[0][0].ToString().Trim(); - sql.Clear(); - sql.Add(" select XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID and XLXSBJDQYFB_YFJZQH=:XLXSBJDQYFB_YFJZQH "); - sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID; - sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = sQH; - DataSet ds = dberp.OpenDataSet(sql); - - for (int i = 0; i < ds.Tables[0].Rows.Count; i++) + DataSet dsQH = dberp.OpenDataSet(sql); + if (dsQH.Tables[0].Rows.Count > 0) { - double dYZZ = CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDQYFB_YSFL"].ToString()); - dicYZZBZPF[sYFYZID] = dYZZ; - } + string sQH = dsQH.Tables[0].Rows[0][0].ToString().Trim(); + sql.Clear(); + sql.Add(" select XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID and XLXSBJDQYFB_YFJZQH=:XLXSBJDQYFB_YFJZQH "); + sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID; + sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = sQH; + DataSet ds = dberp.OpenDataSet(sql); + for (int i = 0; i < ds.Tables[0].Rows.Count; i++) + { + double dYZZ = CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSBJDQYFB_YSFL"].ToString()); + dicYZZBZPF[sYFYZID] = dYZZ; + } + + } } + return dicYZZBZPF; } @@ -9037,11 +9041,15 @@ namespace GThinking.N_XLXSBJ double ZZSCB = (CMISproConvert.StrToFloat(strJJYZZ[indexPTF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexZJF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexFXYL - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexQTSH - 1]) + (CMISproConvert.StrToFloat(strJJYZZ[indexDF - 1]) + CMISproConvert.StrToFloat(strJJYZZ[indexGJ - 1])*10000 / 81.2655989526499 / 71.3980341706337)) * CMISproConvert.StrToFloat(strJJYZZ[indexZZSCB - 1]); strJJYZZ[indexZZSCB - 1] = ZZSCB.ToString(); + + Mac.MacLog.TraceFormat("indexZZSCB：" + ZZSCB.ToString()); } for (int i = 0; i < strJJYZZ.Length; i++) { sJJList += strJJYZZ[i] + "|"; + + Mac.MacLog.TraceFormat("sUpdJJYZList" + i.ToString() + ":" + strJJYZZ[i]); } @@ -9581,9 +9589,12 @@ namespace GThinking.N_XLXSBJ SQL.Add(" left join XLXSBJXLGGTHB on XLXSBJXLGGTHB_XLGGID = XLXSBJDMX_XLGGID "); SQL.Add(" left join XLGGB on XLGGB_XLGGID = XLXSBJXLGGTHB_XLGGIDCH and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') "); SQL.Add(" left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID "); + SQL.Add(" left join XLXSBJXHML on XLXSBJXHML_XLXHID=XLXSBJDMX_XLXHID and XLXSBJXHML_DYDJID=XLXSBJDMX_DYDJID "); SQL.Add(" where XLXSBJDMX_BJDID=:pBJDID "); SQL.Add(" and exists(select 1 from V_XSBJJSJGB where V_XSBJJSJGB_ID=:pID and V_XSBJJSJGB_BJDID=:pBJDID and V_XSBJJSJGB_WGCPBZ<>'Y' and V_XSBJJSJGB_JGFBZ<>'Y' and V_XSBJJSJGB_BJDID=XLXSBJDMX_BJDID and V_XSBJJSJGB_BJDXH=XLXSBJDMX_XH ) "); - SQL.Add(" and (XLXSBJDMX_JLDW='扎' or (XLXSBJDMX_JLDW in ('米','M') and XLDTJMZHB_DTJM1<=16 ) ) "); + SQL.Add(" and (XLXSBJDMX_JLDW='扎' or (XLXSBJDMX_JLDW in ('米','M') and XLDTJMZHB_DTJM1<=16 "); + SQL.Add(" and exists(select 1 from XLXSCPML where XLXSCPML_CPMLIDS like '%' ||XLXSBJXHML_CPMLID|| '%' and XLXSCPML_CPMLMC like '电线%' )"); + SQL.Add(" ) ) "); SQL.Add(" and " + CMISproDataBase.GetWhereEqual("XLXHB_DTCLID", sTcpList)); SQL.Add(" )sor on(XLXSBJDMX_BJDID=XLXSBJDJJYZ_BJDID and XLXSBJDMX_XH=XLXSBJDJJYZ_XH) "); SQL.Add(" when matched then update set XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + "= 0 "); diff --git a/XLBJD_PLTJList.aspx b/XLBJD_PLTJList.aspx index 5770b69..c1b3573 100644 --- a/XLBJD_PLTJList.aspx +++ b/XLBJD_PLTJList.aspx @@ -9,6 +9,11 @@ + + + protected global::GThinking.N_CONTROL.gtToolButton btnPLTJ; + /// + /// btnPLSCMX 控件。 + /// + /// + /// 自动生成的字段。 + /// 要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::GThinking.N_CONTROL.gtToolButton btnPLSCMX; + /// /// btnGXBJCP 控件。 /// diff --git a/XLJGB_JGBMXList.aspx b/XLJGB_JGBMXList.aspx index 73cab96..00ed5b6 100644 --- a/XLJGB_JGBMXList.aspx +++ b/XLJGB_JGBMXList.aspx @@ -34,10 +34,6 @@ - - - diff --git a/XLJGB_JGBMXList.aspx.cs b/XLJGB_JGBMXList.aspx.cs index eed1380..0063aaa 100644 --- a/XLJGB_JGBMXList.aspx.cs +++ b/XLJGB_JGBMXList.aspx.cs @@ -202,10 +202,7 @@ namespace GThinking.N_XLXSBJ btnPLSZ.Visible = false; btnCLJJ.Visible = false; } - if (jgbxx.XLXSJGB_TJYS.Equals("1") && jgbxx.XLXSJGB_JJLY.Equals("A") && jgbxx.XLXSJGB_BJLY.Equals("J")) - btnBJZSDC.Visible = true; - else - btnBJZSDC.Visible = false; + } else { @@ -214,7 +211,7 @@ namespace GThinking.N_XLXSBJ btnDR.Visible = false; btnPLSZ.Visible = false; btnCLJJ.Visible = false; - btnBJZSDC.Visible = false; + } //3|表价(现行价)=基价(出厂价+材料价价差)&调价----按型号加点对照表扩充 btnXHJDDZKC.Visible = false; @@ -5345,20 +5342,7 @@ namespace GThinking.N_XLXSBJ #endregion - protected void btnBJZSDC_Click(object sender, EventArgs e) - { - base.InitEntityByCondition(); - string sJGBID = CurQueryEntity.FieldByName("JGBID").Value.Trim(); - if (sJGBID.Equals("")) - { - ShowMessage("请先查询价格表！"); - return; - } - TPageParams pageParams = new TPageParams(); - pageParams.UrlPath = "XLJGB_BJZSDCList.aspx"; - pageParams.AddString("JGBID", sJGBID); - OpenDialog(pageParams); - } + #endregion diff --git a/XLJGB_JGBMXList.aspx.designer.cs b/XLJGB_JGBMXList.aspx.designer.cs index 70b342b..086b2bc 100644 --- a/XLJGB_JGBMXList.aspx.designer.cs +++ b/XLJGB_JGBMXList.aspx.designer.cs @@ -64,15 +64,6 @@ namespace GThinking.N_XLXSBJ { /// protected global::GThinking.N_CONTROL.gtToolButton btnDR; - /// - /// btnBJZSDC 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 - /// - protected global::GThinking.N_CONTROL.gtToolButton btnBJZSDC; - /// /// btnBJCPXD 鎺т欢銆 /// diff --git a/XLJGB_PLDRList.aspx.cs b/XLJGB_PLDRList.aspx.cs index d3e608a..6f2e80a 100644 --- a/XLJGB_PLDRList.aspx.cs +++ b/XLJGB_PLDRList.aspx.cs @@ -480,6 +480,12 @@ namespace GThinking.N_XLXSBJ sSQL += " left join XLBZ on XLBZ_XLBZID=XLXSCLQD_XLBZID "; sSQL += " left join XLXHB on XLXHB_XLXHID = XLXSCLQD_XLXHID "; sSQL += " left join XLXSBJXLGGTHB on XLXSBJXLGGTHB_XLGGID = XLXSCLQD_XLGGID "; + if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("CPMLID").Value.Trim())) + { + sSQL += " left join XLXSBJTJXHML AA on AA.XLXSBJTJXHML_XLXHID = XLXSCLQD_XLXHID and AA.XLXSBJTJXHML_DYDJID = isnull(XLXSCLQD_DYDJID, ' ') "; + sSQL += " left join XLXSBJTJXHML BB on BB.XLXSBJTJXHML_XLXHID = XLXSCLQD_XLXHID and BB.XLXSBJTJXHML_DYDJID = ' ' "; + } + sSQL += " where 1=1 and XLXSCLQD_WPID ='ZZZZ' and isnull(XLXHB_TYBZ,'N') <> 'Y'"; if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("JGCZBID").Value.Trim())) @@ -504,7 +510,7 @@ namespace GThinking.N_XLXSBJ if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("CPMLID").Value.Trim())) { - sSQL += "\r\n and XLXSCLQD_CPMLID = :pCPMLID "; + sSQL += "\r\n and (case when AA.XLXSBJTJXHML_CPMLID is not null then AA.XLXSBJTJXHML_CPMLID else BB.XLXSBJTJXHML_CPMLID end = :pCPMLID)"; entity.Param.Add("pCPMLID", CurQueryEntity.FieldByName("CPMLID").Value.Trim()); } //型号模糊 diff --git a/XLXHCPTXWHList.aspx.cs b/XLXHCPTXWHList.aspx.cs index ae4ffcd..ade519c 100644 --- a/XLXHCPTXWHList.aspx.cs +++ b/XLXHCPTXWHList.aspx.cs @@ -99,6 +99,11 @@ namespace GThinking.N_XLXSBJ strSQL.AppendLine(" and XLXSBJCPYS_XLJBXHID = :pXLXHID "); entity.Param.Add("pXLXHID", CurQueryEntity.FieldByName("XLXHID").Value.Trim()); } + if (!string.IsNullOrEmpty(CurQueryEntity.FieldByName("DYDJ").Value.Trim())) + { + strSQL.AppendLine(" and XLXSBJCPYS_DYDJID = :XLXSBJCPYS_DYDJID "); + entity.Param.Add("XLXSBJCPYS_DYDJID", CurQueryEntity.FieldByName("DYDJ").Value.Trim()); + } strSQL.AppendLine(" order by XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID "); return strSQL.ToString(); } diff --git a/XLXHCPTXWHQuery.aspx b/XLXHCPTXWHQuery.aspx index 571b17c..bf87717 100644 --- a/XLXHCPTXWHQuery.aspx +++ b/XLXHCPTXWHQuery.aspx @@ -14,6 +14,16 @@ + + + + 鐢靛帇绛夌骇锛 + + + + + + diff --git a/XLXHCPTXWHQuery.aspx.cs b/XLXHCPTXWHQuery.aspx.cs index a86738b..e84e3a2 100644 --- a/XLXHCPTXWHQuery.aspx.cs +++ b/XLXHCPTXWHQuery.aspx.cs @@ -42,6 +42,7 @@ namespace GThinking.N_XLXSBJ private void InitControl() { TComboBox.SetComboBox("DBERP", this.cbxXLXHID, "select XLXHB_XLXHID as ID,XLXHB_XLXHID as Name from XLXHB where isnull(XLXHB_TYBZ,'N')<>'Y' order by ID ", true); + TComboBox.SetComboBox("DBERP", this.cbxDYDJID, "select distinct XLXSBJCPYS_DYDJID as ID,XLXSBJCPYS_DYDJID as Name from XLXSBJCPYS where 1=1 order by ID ", true); } } } diff --git a/XLXHCPTXWHQuery.aspx.designer.cs b/XLXHCPTXWHQuery.aspx.designer.cs index b8dff12..77dd8de 100644 --- a/XLXHCPTXWHQuery.aspx.designer.cs +++ b/XLXHCPTXWHQuery.aspx.designer.cs @@ -46,6 +46,24 @@ namespace GThinking.N_XLXSBJ { /// protected global::GThinking.N_CONTROL.gtComboBox cbxXLXHID; + /// + /// GtLabel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtLabel GtLabel2; + + /// + /// cbxDYDJID 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 瑕佽繘琛屼慨鏀癸紝璇峰皢瀛楁澹版槑浠庤璁″櫒鏂囦欢绉诲埌浠ｇ爜闅愯棌鏂囦欢銆 + /// + protected global::GThinking.N_CONTROL.gtComboBox cbxDYDJID; + /// /// lblXLXHFJSX 鎺т欢銆 /// diff --git a/XLXHCPTXWH_M.cs b/XLXHCPTXWH_M.cs index 4dae814..e69af38 100644 --- a/XLXHCPTXWH_M.cs +++ b/XLXHCPTXWH_M.cs @@ -16,6 +16,7 @@ namespace GThinking.N_XLXSBJ public XLXHCPTXWH_M() { AddFieldDefs("XLXHID", "鍨嬪彿"); + AddFieldDefs("DYDJ", "鐢靛帇绛夌骇"); AddFieldDefs("XLXHFJSX", "闄勪欢灞炴"); } } diff --git a/obj/Debug/N_XLXSBJA.dll b/obj/Debug/N_XLXSBJA.dll index 5382612..870993b 100644 Binary files a/obj/Debug/N_XLXSBJA.dll and b/obj/Debug/N_XLXSBJA.dll differ diff --git a/obj/Debug/N_XLXSBJA.pdb b/obj/Debug/N_XLXSBJA.pdb index 3133df4..b8f425a 100644 Binary files a/obj/Debug/N_XLXSBJA.pdb and b/obj/Debug/N_XLXSBJA.pdb differ diff --git a/obj/Debug/ResolveAssemblyReference.cache b/obj/Debug/ResolveAssemblyReference.cache index bf187d3..afc91c7 100644 Binary files a/obj/Debug/ResolveAssemblyReference.cache and b/obj/Debug/ResolveAssemblyReference.cache differ