From 5ef31cf4c25789a27080e69be4848a71ac781053 Mon Sep 17 00:00:00 2001
From: wang1163 <1163568462@qq.com>
Date: Thu, 3 Sep 2026 11:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=A0=E5=AD=90=EF=BC=8C?=
=?UTF-8?q?=E7=89=B9=E6=80=A7=E5=8A=A0=E7=82=B9=E5=A2=9E=E5=8A=A0=E4=B8=BB?=
=?UTF-8?q?=E8=8A=AF=E6=88=AA=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BJFL_ZDXJGSInfo.aspx | 112 +++++--
BJFL_ZDXJGSInfo.aspx.cs | Bin 30512 -> 22666 bytes
BJFL_ZDXJGSInfo.aspx.designer.cs | 128 +++++++-
BJYFDRInfo.aspx.cs | 124 ++++++--
BJYFJZQJList.aspx.cs | 11 +
BJYF_TLJQJ.cs | 108 +++++++
BJYF_TLJQJInfo.aspx | 76 +++++
BJYF_TLJQJInfo.aspx.cs | 377 +++++++++++++++++++++++
BJYF_TLJQJInfo.aspx.designer.cs | 142 +++++++++
BJYF_TLJQJList.aspx | 49 +++
BJYF_TLJQJList.aspx.cs | 223 ++++++++++++++
BJYF_TLJQJList.aspx.designer.cs | 88 ++++++
BJYF_TLJQJQuery.aspx | 8 +
BJYF_TLJQJQuery.aspx.cs | 30 ++
BJYF_TLJQJQuery.aspx.designer.cs | 43 +++
BJYF_TLJQJ_M.cs | 21 ++
CLQDYZInfo.aspx | 90 ++++++
CLQDYZInfo.aspx.cs | 78 ++---
CLQDYZInfo.aspx.designer.cs | 182 ++++++++++-
CLYLZDSQ.cs | 182 ++++++++++-
CX_JGBMXList.aspx.cs | 9 +-
DRXLXHCPTXWH.aspx.cs | 25 +-
JGBMLInfo.aspx.cs | 39 ++-
MAC8.cs | 1 +
N_XLXSBJA.csproj | 28 +-
N_XLXSBJA.suo | Bin 23552 -> 23552 bytes
TZYZJJ2.cs | 26 +-
TZYZJJ2Info.aspx | 20 ++
TZYZJJ2Info.aspx.cs | 103 ++-----
TZYZJJ2Info.aspx.designer.cs | 2 +-
TZYZJJ3Info.aspx | 91 +++++-
TZYZJJ3Info.aspx.cs | 240 +++++----------
TZYZJJ3Info.aspx.designer.cs | 182 ++++++++++-
XLBJDCalcUtils.cs | 51 ++-
XLBJDInfo.aspx.cs | 100 ++++--
XLBJDUtils.cs | 69 +++--
XLBJD_BDOBill.cs | 44 ++-
XLBJD_CLCBInfo.aspx.cs | 107 +++----
XLJGB_CLJGTZList.aspx.cs | 42 ++-
XLJGB_JGBMX.cs | 2 +-
XLJGB_JGBMXInfo.aspx.cs | 10 +
XLJGB_JGBMXList.aspx.cs | 8 +-
XLXHCPTXWHList.aspx | 6 +
XLXHCPTXWHList.aspx.cs | 8 +-
obj/Debug/N_XLXSBJA.dll | Bin 8970240 -> 8998912 bytes
obj/Debug/N_XLXSBJA.pdb | Bin 11212288 -> 11265536 bytes
obj/Debug/ResolveAssemblyReference.cache | Bin 286244 -> 286244 bytes
47 files changed, 2736 insertions(+), 549 deletions(-)
create mode 100644 BJYF_TLJQJ.cs
create mode 100644 BJYF_TLJQJInfo.aspx
create mode 100644 BJYF_TLJQJInfo.aspx.cs
create mode 100644 BJYF_TLJQJInfo.aspx.designer.cs
create mode 100644 BJYF_TLJQJList.aspx
create mode 100644 BJYF_TLJQJList.aspx.cs
create mode 100644 BJYF_TLJQJList.aspx.designer.cs
create mode 100644 BJYF_TLJQJQuery.aspx
create mode 100644 BJYF_TLJQJQuery.aspx.cs
create mode 100644 BJYF_TLJQJQuery.aspx.designer.cs
create mode 100644 BJYF_TLJQJ_M.cs
diff --git a/BJFL_ZDXJGSInfo.aspx b/BJFL_ZDXJGSInfo.aspx
index 76d8553..23da980 100644
--- a/BJFL_ZDXJGSInfo.aspx
+++ b/BJFL_ZDXJGSInfo.aspx
@@ -48,23 +48,23 @@
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
@@ -73,48 +73,100 @@
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
|
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
@@ -123,23 +175,23 @@
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
@@ -148,23 +200,23 @@
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
@@ -173,23 +225,23 @@
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
+ OnClick="LinkButton_Click">
|
diff --git a/BJFL_ZDXJGSInfo.aspx.cs b/BJFL_ZDXJGSInfo.aspx.cs
index 1eb2180a0cb37f57a222926124cd579169617533..951c14b276fa3d9d4f31a23935c44cd72fbdf077 100644
GIT binary patch
delta 503
zcmdn+jy@C6cnE%V8UnuVoWaJ*O>gkxoq+SA(_bzISP~gigG50
z@XKsoCn&-=xj;w+tUeH|*mkl(hR9?Cj!Bbi3OP0x2uE>Dz94NknWunfa)D`?ygq|I
zg8~Cvi~>V3Ln=caLkf^A0*d7HCna0?DNHsj5as0f-xN6~T|W)X<4|B|DZAUv`G0Z)
zhYZL}piz9XNem@G%?b>*K#XcoB17?H#scxlm)PWh&gEbQtDKx)qCeTdQ*H7)NjYw9
zur7%BeHoxQ2M5^Aeo{P>1teG|M`-9wmMQ0$tjEqVc|(B6=6{Z7#KDRZg0&_mM6fZM
zO`aGjJlQHxY_dTl3!^y_k8kpLuM3WJOL(tkNP0`t-rQLX-
zsTbob2saz^dOP6Zp3AfS_;7~j%YFWg41XfShg29}?kwOq$YZ}fz^mgZCX#u4S=kAH
z(}`$o(%I|v2BYrLB|b&dc)hl@*oHDFRE0+zWe<{va0~Zv2kq&n_mWq_LN=Hw-=Tb_
zDh^d)s_IZxrfLpVW2){@b*35))nKaWP)(*<4%M1d3d*9=`|Pi7=kd+U;&-MP`?#5O
zPEY2tY%ZO{g&2l*6K4P4*=dZUH010!#!(z{b{^v>4>>!KaTJK0oya&!M9z+697Q5$
zXEKg5k+VY?N1=?9QfWu2#zAKKR7?{kJQic=vCvJqi2~k4f!svz^NkhAP4v#4+(ZFy
zqCjq_=Z9b3copBf#n-bO7E
// ´˴úÂëÓɹ¤¾ßÉú³ɡ£
-// ÔËÐÐʱ°汾:2.0.50727.9174
+// ÔËÐÐʱ°汾:2.0.50727.9179
//
// ¶ԴËÎļþµĸü¸ĿÉÄܻᵼÖ²»ÕýȷµÄÐÐΪ£¬²¢ÇÒÈç¹û
// ÖØÐÂÉú³ɴúÂ룬ÕâЩ¸ü¸Ľ«»ᶪʧ¡£
@@ -226,6 +226,132 @@ namespace GThinking.N_XLXSBJ {
///
protected global::System.Web.UI.WebControls.LinkButton LinkJJ10;
+ ///
+ /// tr3 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow tr3;
+
+ ///
+ /// trJJYZ3 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trJJYZ3;
+
+ ///
+ /// LinkJJ11 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ11;
+
+ ///
+ /// LinkJJ12 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ12;
+
+ ///
+ /// LinkJJ13 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ13;
+
+ ///
+ /// LinkJJ14 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ14;
+
+ ///
+ /// LinkJJ15 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ15;
+
+ ///
+ /// tr5 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow tr5;
+
+ ///
+ /// trJJYZ4 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trJJYZ4;
+
+ ///
+ /// LinkJJ16 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ16;
+
+ ///
+ /// LinkJJ17 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ17;
+
+ ///
+ /// LinkJJ18 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ18;
+
+ ///
+ /// LinkJJ19 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ19;
+
+ ///
+ /// LinkJJ20 ¿ؼþ¡£
+ ///
+ ///
+ /// ×Զ¯Éú³ɵÄ×ֶΡ£
+ /// Ҫ½øÐÐÐģ¬Ç뽫×ֶÎÉùÃ÷´ÓÉè¼ÆÆ÷ÎļþÒƵ½´úÂëÒþ²ØÎļþ¡£
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton LinkJJ20;
+
///
/// LinkYZ01 ¿ؼþ¡£
///
diff --git a/BJYFDRInfo.aspx.cs b/BJYFDRInfo.aspx.cs
index 7ab6c6d..d6b0678 100644
--- a/BJYFDRInfo.aspx.cs
+++ b/BJYFDRInfo.aspx.cs
@@ -122,7 +122,10 @@ namespace GThinking.N_XLXSBJ
private void ClearExistingData(TDatabase database, TSQL sql)
{
sql.Clear();
- sql.Add(" DELETE FROM XLXSBJYFJZQJ where XLXSBJYFJZQJ_YFJSGS='Ô˼Û*ÔËÖØ' ");
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS") == "6")
+ sql.Add(" DELETE FROM XLXSBJYFJZQJ where XLXSBJYFJZQJ_YFJSGS='6' ");
+ else
+ sql.Add(" DELETE FROM XLXSBJYFJZQJ where XLXSBJYFJZQJ_YFJSGS='Ô˼Û*ÔËÖØ' ");
database.ExecSQL(sql);
}
@@ -172,8 +175,29 @@ namespace GThinking.N_XLXSBJ
try
{
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS") == "6")
+ {
+ string separator = columnName.Contains("-") ? "-" :
+ (columnName.Contains("~") ? "~" : "ÖÁ");
+
+ string cleanName = columnName.Replace("ͭ¼Û", "").Replace("ÂÁ¼Û", "");
+
+ string[] parts = cleanName.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries);
+
+ if (parts.Length >= 2)
+ {
+ double minValue, maxValue;
+ if (double.TryParse(parts[0], out minValue) && double.TryParse(parts[1], out maxValue))
+ {
+ column.MinValue = minValue;
+ column.MaxValue = maxValue;
+
+ return column;
+ }
+ }
+ }
// ³¢ÊԽâÎö¸÷ÖÖÖØÁ¿Çø¼ä¸ñʽ
- if (columnName.Contains("ÒÔÏÂ") || columnName.Contains("ÒÔÄÚ"))
+ else if (columnName.Contains("ÒÔÏÂ") || columnName.Contains("ÒÔÄÚ"))
{
// ´¦Àí "X¶ÖÒÔÏÂ" ¸ñʽ
string valueStr = columnName.Replace("¶ÖÒÔÏÂ", "").Replace("¶ÖÒÔÄÚ", "").Replace("Á㵣±¨¼Û","");
@@ -204,6 +228,7 @@ namespace GThinking.N_XLXSBJ
(columnName.Contains("~") ? "~" : "ÖÁ");
string cleanName = columnName.Substring(0, columnName.IndexOf("¶Ö")).Replace("¶Ö", "").Replace("Á㵣±¨¼Û", "");
+
string[] parts = cleanName.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length >= 2)
@@ -248,6 +273,8 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("XLXSBJYFJZQJ_YFJZXX").Value = column.MinValue;
sql.ParamByName("XLXSBJYFJZQJ_YFJZSX").Value = column.MaxValue;
sql.ParamByName("XLXSBJYFJZQJ_YFJSGS").Value = "Ô˼Û*ÔËÖØ";
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS")=="6")
+ sql.ParamByName("XLXSBJYFJZQJ_YFJSGS").Value = "6";
sql.ParamByName("XLXSBJYFJZQJ_WHR").Value = tSession.UserName;
sql.ParamByName("XLXSBJYFJZQJ_WHRID").Value = tSession.UserId;
sql.ParamByName("XLXSBJYFJZQJ_WHSJ").Value = DateTime.Now;
@@ -289,6 +316,8 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("XLXSBJDQYFZB_XZQHID").Value = sXZQHID;
sql.ParamByName("XLXSBJDQYFZB_YFJSFS").Value = "1";
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS") == "6")
+ sql.ParamByName("XLXSBJDQYFZB_YFJSFS").Value = "6";
sql.ParamByName("XLXSBJDQYFZB_WHR").Value = tSession.UserName;
sql.ParamByName("XLXSBJDQYFZB_WHRID").Value = tSession.UserId;
sql.ParamByName("XLXSBJDQYFZB_WHSJ").Value = DateTime.Now;
@@ -304,20 +333,36 @@ namespace GThinking.N_XLXSBJ
!string.IsNullOrEmpty(row[weightColumn.ColumnIndex].ToString()))
{
double YFDJ = 0;
- if (double.TryParse(row[weightColumn.ColumnIndex].ToString(), out YFDJ))
+ if (double.TryParse(row[weightColumn.ColumnIndex].ToString().Replace("%",""), out YFDJ))
{
int JZQH = intervalIdMap[weightColumn.ColumnName];
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS") == "6")
+ {
+ sql.Clear();
+ sql.Add(@"INSERT INTO XLXSBJDQYFB (XLXSBJDQYFB_XZQHID, XLXSBJDQYFB_YFJZQH, XLXSBJDQYFB_YSFL, XLXSBJDQYFB_WHR, XLXSBJDQYFB_WHRID, XLXSBJDQYFB_WHSJ)
+ VALUES (:XLXSBJDQYFB_XZQHID, :XLXSBJDQYFB_YFJZQH, :XLXSBJDQYFB_YSFL, :XLXSBJDQYFB_WHR, :XLXSBJDQYFB_WHRID, :XLXSBJDQYFB_WHSJ) ");
- sql.Clear();
- sql.Add(@"INSERT INTO XLXSBJDQYFB (XLXSBJDQYFB_XZQHID, XLXSBJDQYFB_YFJZQH, XLXSBJDQYFB_YFDJ, XLXSBJDQYFB_WHR, XLXSBJDQYFB_WHRID, XLXSBJDQYFB_WHSJ)
+ sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID;
+ sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = JZQH;
+ sql.ParamByName("XLXSBJDQYFB_YSFL").Value = YFDJ;
+ sql.ParamByName("XLXSBJDQYFB_WHR").Value = tSession.UserName;
+ sql.ParamByName("XLXSBJDQYFB_WHRID").Value = tSession.UserId;
+ sql.ParamByName("XLXSBJDQYFB_WHSJ").Value = DateTime.Now;
+ }
+ else
+ {
+ sql.Clear();
+ sql.Add(@"INSERT INTO XLXSBJDQYFB (XLXSBJDQYFB_XZQHID, XLXSBJDQYFB_YFJZQH, XLXSBJDQYFB_YFDJ, XLXSBJDQYFB_WHR, XLXSBJDQYFB_WHRID, XLXSBJDQYFB_WHSJ)
VALUES (:XLXSBJDQYFB_XZQHID, :XLXSBJDQYFB_YFJZQH, :XLXSBJDQYFB_YFDJ, :XLXSBJDQYFB_WHR, :XLXSBJDQYFB_WHRID, :XLXSBJDQYFB_WHSJ) ");
- sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID;
- sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = JZQH;
- sql.ParamByName("XLXSBJDQYFB_YFDJ").Value = YFDJ;
- sql.ParamByName("XLXSBJDQYFB_WHR").Value = tSession.UserName;
- sql.ParamByName("XLXSBJDQYFB_WHRID").Value = tSession.UserId;
- sql.ParamByName("XLXSBJDQYFB_WHSJ").Value = DateTime.Now;
+ sql.ParamByName("XLXSBJDQYFB_XZQHID").Value = sXZQHID;
+ sql.ParamByName("XLXSBJDQYFB_YFJZQH").Value = JZQH;
+ sql.ParamByName("XLXSBJDQYFB_YFDJ").Value = YFDJ;
+ sql.ParamByName("XLXSBJDQYFB_WHR").Value = tSession.UserName;
+ sql.ParamByName("XLXSBJDQYFB_WHRID").Value = tSession.UserId;
+ sql.ParamByName("XLXSBJDQYFB_WHSJ").Value = DateTime.Now;
+ }
+
database.ExecSQL(sql);
}
@@ -330,33 +375,46 @@ namespace GThinking.N_XLXSBJ
private void ExcelColumnValid(DataSet dataSet)
{
DataTable dataTable = dataSet.Tables[0];
- if (dataTable.Rows.Count < 2)
+ if (PageParam.ContainsKey("YFJSFS") && PageParam.GetRTrimString("YFJSFS") == "6")
{
- throw new Exception("ExcelÎļþÐÐÊý²»×㣬ÖÁÉÙÐèҪ2Ðбíͷ");
- }
- DataRow headerRow1 = dataTable.Rows[0];
- DataRow headerRow2 = dataTable.Rows[1];
-
- // ´¦ÀíÖØÁ¿Çø¼äÁУ¨´ÓË÷Òý2¿ªʼ£©
- for (int i = 2; i < dataTable.Columns.Count; i++)
- {
- string header1 = headerRow1[i].ToString().Trim();
- string header2 = headerRow2[i].ToString().Trim();
-
- // ºϲ¢Á½ÐбíͷÄÚÈÝ
- string combinedHeader = header1.Trim();
- if (!string.IsNullOrEmpty(header2))
+ if (dataTable.Rows.Count < 1)
{
- combinedHeader +=header2.Trim();
+ throw new Exception("ExcelÎļþÐÐÊý²»×㣬ÖÁÉÙÐèҪ1Ðбíͷ");
+ }
+
+ }
+ else
+ {
+ if (dataTable.Rows.Count < 2)
+ {
+ throw new Exception("ExcelÎļþÐÐÊý²»×㣬ÖÁÉÙÐèҪ2Ðбíͷ");
+ }
+ DataRow headerRow1 = dataTable.Rows[0];
+ DataRow headerRow2 = dataTable.Rows[1];
+
+ // ´¦ÀíÖØÁ¿Çø¼äÁУ¨´ÓË÷Òý2¿ªʼ£©
+ for (int i = 2; i < dataTable.Columns.Count; i++)
+ {
+ string header1 = headerRow1[i].ToString().Trim();
+ string header2 = headerRow2[i].ToString().Trim();
+
+ // ºϲ¢Á½ÐбíͷÄÚÈÝ
+ string combinedHeader = header1.Trim();
+ if (!string.IsNullOrEmpty(header2))
+ {
+ combinedHeader += header2.Trim();
+ }
+
+ // ¸üÐÂÁÐÃû
+ dataTable.Columns[i].ColumnName = combinedHeader;
}
- // ¸üÐÂÁÐÃû
- dataTable.Columns[i].ColumnName = combinedHeader;
+ // ÒƳý±íͷÐУ¬±£ÁôÊý¾ÝÐÐ
+ dataTable.Rows.RemoveAt(0);
+ dataTable.Rows.RemoveAt(0);
}
-
- // ÒƳý±íͷÐУ¬±£ÁôÊý¾ÝÐÐ
- dataTable.Rows.RemoveAt(0);
- dataTable.Rows.RemoveAt(0);
+
+
}
private void ReadWJ(string sPath, ref DataSet aDataExcel)
diff --git a/BJYFJZQJList.aspx.cs b/BJYFJZQJList.aspx.cs
index ff1d72e..f79fe6a 100644
--- a/BJYFJZQJList.aspx.cs
+++ b/BJYFJZQJList.aspx.cs
@@ -50,6 +50,12 @@ namespace GThinking.N_XLXSBJ
grdContentGrid.Columns[2].HeaderText = ">(¶Ö)";
grdContentGrid.Columns[3].HeaderText = "<=(¶Ö)";
}
+
+ if (PageParam.GetRTrimString("YFJSFS").Equals("6"))
+ {
+ grdContentGrid.Columns[2].HeaderText = ">(Ԫ)";
+ grdContentGrid.Columns[3].HeaderText = "<=(Ԫ)";
+ }
Master_OnStandardQuery(null, null);
}
TPageParams pageParams = new TPageParams();
@@ -144,6 +150,11 @@ namespace GThinking.N_XLXSBJ
grdContentGrid.FindColumnByFieldName("XLXSBJYFJZQJ_YFJSGS").Visible = false;
grdContentGrid.FindColumnByFieldName("XLXSBJYFJZQJ_YFJSGS3").Visible = true;
}
+ else if (PageParam.GetRTrimString("YFJSFS").Equals("6"))
+ {
+ grdContentGrid.FindColumnByFieldName("XLXSBJYFJZQJ_YFJSGS").Visible = false;
+ grdContentGrid.FindColumnByFieldName("XLXSBJYFJZQJ_YFJSGS3").Visible = false;
+ }
}
#endregion
diff --git a/BJYF_TLJQJ.cs b/BJYF_TLJQJ.cs
new file mode 100644
index 0000000..0bb2629
--- /dev/null
+++ b/BJYF_TLJQJ.cs
@@ -0,0 +1,108 @@
+using 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;
+using GThinking.N_MISPRO.Data;
+
+namespace GThinking.N_XLXSBJ
+{
+ #region 数据表级映射
+ [TableMap(DB = "DBERP", DbTableName = "XLXSBJDQYFB", Umid = 100860173, IsWorkFlow = false, IsAttach = false, UseWhr = true,
+ QuerySelSql = " select XLXSBJDQYFB_XZQHID,XLXSBJDQYFB_YFJZQH,XLXSBJDQYFB_YSFL, " +
+ " XLXSBJDQYFB_WHR,XLXSBJDQYFB_WHRID,XLXSBJDQYFB_WHSJ " +
+ " from XLXSBJDQYFB where 1=1",
+ EntitySelSql = " select XLXSBJDQYFB_XZQHID,XLXSBJDQYFB_YFJZQH,XLXSBJDQYFB_YSFL, " +
+ " XLXSBJDQYFB_WHR,XLXSBJDQYFB_WHRID,XLXSBJDQYFB_WHSJ " +
+ " from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID",
+ UpdateSql = "",
+ InsertSql = "",
+ DeleteSql = " delete from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:XLXSBJDQYFB_XZQHID ")]
+ #endregion
+ public class BJYF_TLJQJ : EntityManager
+ {
+ #region 字段级映射
+
+ private string _XLXSBJDQYFB_XZQHID;
+ [ColumnMap(DbField = "XLXSBJDQYFB_XZQHID", CtrlName = "txtXZQHID", DbTitle = "行政区划ID", Type = FieldType.HiddenField, DefaultValue = "",
+ IsAllowNull = false, IsKey = true, Length = 20)]
+ public string XLXSBJDQYFB_XZQHID
+ {
+ get { return _XLXSBJDQYFB_XZQHID; }
+ set { _XLXSBJDQYFB_XZQHID = value; }
+ }
+
+ private string _XLXSBJDQYFB_YFJZQH;
+ [ColumnMap(DbField = "XLXSBJDQYFB_YFJZQH", CtrlName = "txtYFJZQH", DbTitle = "运费计重区号", Type = FieldType.C, DefaultValue = "",
+ IsAllowNull = true, IsKey = false, Length = 10)]
+ public string XLXSBJDQYFB_YFJZQH
+ {
+ get { return _XLXSBJDQYFB_YFJZQH; }
+ set { _XLXSBJDQYFB_YFJZQH = value; }
+ }
+
+ private string _XLXSBJDQYFB_YSFL;
+ [ColumnMap(DbField = "XLXSBJDQYFB_YSFL", CtrlName = "txtYSFL", DbTitle = "运输费率", Type = FieldType.F, DefaultValue = "0",
+ IsAllowNull = true, IsKey = false, Length = 0)]
+ public string XLXSBJDQYFB_YSFL
+ {
+ get { return _XLXSBJDQYFB_YSFL; }
+ set { _XLXSBJDQYFB_YSFL = value; }
+ }
+
+ private string _XLXSBJDQYFB_WHR;
+ [ColumnMap(DbField = "XLXSBJDQYFB_WHR", CtrlName = "txtWHR", DbTitle = "维护人", Type = FieldType.C, DefaultValue = "",
+ IsAllowNull = true, IsKey = false, Length = 30)]
+ public string XLXSBJDQYFB_WHR
+ {
+ get { return _XLXSBJDQYFB_WHR; }
+ set { _XLXSBJDQYFB_WHR = value; }
+ }
+
+ private string _XLXSBJDQYFB_WHRID;
+ [ColumnMap(DbField = "XLXSBJDQYFB_WHRID", CtrlName = "txtWHRID", DbTitle = "维护人工号", Type = FieldType.HiddenField, DefaultValue = "",
+ IsAllowNull = true, IsKey = false, Length = 10)]
+ public string XLXSBJDQYFB_WHRID
+ {
+ get { return _XLXSBJDQYFB_WHRID; }
+ set { _XLXSBJDQYFB_WHRID = value; }
+ }
+
+ private string _XLXSBJDQYFB_WHSJ;
+ [ColumnMap(DbField = "XLXSBJDQYFB_WHSJ", CtrlName = "datWHSJ", DbTitle = "维护时间", Type = FieldType.DT, DefaultValue = "",
+ IsAllowNull = true, IsKey = false, Length = 0)]
+ public string XLXSBJDQYFB_WHSJ
+ {
+ get { return _XLXSBJDQYFB_WHSJ; }
+ set { _XLXSBJDQYFB_WHSJ = value; }
+ }
+
+ #endregion
+ }
+
+ [EntityType(Db = "DBERP", Table = "XLXSBJYFJZQJ", IsWf = false, IsWhr = false, WhrPrefix = "", IsAttach = false)]
+ public class BJYF_TLJQJ_Grid : EntityObject
+ {
+ public string sXZQHID = "";
+
+ public override TSQL SetQuerySql()
+ {
+ TSQL SQL = base.SetQuerySql();
+ SQL.Add("select XLXSBJYFJZQJ_YFJZQH,XLXSBJYFJZQJ_YFJZQJMC,isnull(XLXSBJDQYFB_YSFL,0) as YSFL ");
+ SQL.Add(" from XLXSBJYFJZQJ");
+ SQL.Add(" left join (select XLXSBJDQYFB_YFJZQH,XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:pXZQHID and XLXSBJDQYFB_YFJZQH<>' ') a");
+ SQL.Add(" on a.XLXSBJDQYFB_YFJZQH=XLXSBJYFJZQJ_YFJZQH");
+ SQL.Add(" where XLXSBJYFJZQJ_YFJSGS = '6' ");
+ SQL.Add("order by XLXSBJYFJZQJ_YFJZQH");
+ SQL.ParamByName("pXZQHID").Value = sXZQHID;
+ return SQL;
+ }
+ }
+
+
+}
diff --git a/BJYF_TLJQJInfo.aspx b/BJYF_TLJQJInfo.aspx
new file mode 100644
index 0000000..af4baf0
--- /dev/null
+++ b/BJYF_TLJQJInfo.aspx
@@ -0,0 +1,76 @@
+<%@ Page Language="C#" AutoEventWireup="True" Codebehind="BJYF_TLJQJInfo.aspx.cs" Inherits="GThinking.N_XLXSBJ.BJYF_TLJQJInfo"
+ MasterPageFile="~/N_MODEL/Page/MasterOperation.Master" Title="按运距铜铝价区间维护运费比例" %>
+
+<%@ MasterType VirtualPath="~/N_MODEL/Page/MasterOperation.Master" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BJYF_TLJQJInfo.aspx.cs b/BJYF_TLJQJInfo.aspx.cs
new file mode 100644
index 0000000..6a10a26
--- /dev/null
+++ b/BJYF_TLJQJInfo.aspx.cs
@@ -0,0 +1,377 @@
+using 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_MISPRO;
+using GThinking.N_MISPRO.Data;
+using GThinking.N_MODEL.Page;
+using GThinking.N_MISPRO.Utility;
+using GThinking.N_CONTROL;
+using GThinking.N_PUBLIC;
+
+namespace GThinking.N_XLXSBJ
+{
+ public partial class BJYF_TLJQJInfo : OperationBase
+ {
+ BJYF_TLJQJ_Grid entity = new BJYF_TLJQJ_Grid();
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ this.UMID = 100860173;
+ this.UMName = "按运距铜铝价区间维护运费比例";
+ this.CurMaster = Master;
+ this.Tabs = Tab;
+ this.PageHeight = 500;
+ this.PageWidth = 700;
+ AddListSetMap(new ListSet(pagSHD.ID, null, grdSHD, entity, UPSHD));
+
+ if (!IsPostBack)
+ {
+ this.Master.PnlQuery.GroupingText = "查询条件";
+ this.Master.PnlBill.GroupingText = "单据信息";
+ this.Master.PnlQuery.Visible = false;
+ Master.BtnQueryVisible = false;
+
+ InitControls();
+
+ if (!PageParam.GetRTrimString("XLXSBJDQYFB_XZQHID").Equals(""))
+ {
+ txtXZQHID.Value = PageParam.GetRTrimString("XLXSBJDQYFB_XZQHID");
+ txtOLD_XZQHID.Value = PageParam.GetRTrimString("XLXSBJDQYFB_XZQHID");
+ LoadXZQH(txtXZQHID.Value);
+ btnDel.Visible = true;
+ }
+ else
+ {
+ btnDel.Visible = false;
+ }
+ }
+
+ base.InitPage();
+
+ if (!IsPostBack)
+ {
+ Master_OnQuery();
+ GridDataBind();
+ }
+ }
+
+ #region 模板继承事件
+ protected override void Master_OnQuery()
+ {
+ entity.sXZQHID = txtXZQHID.Value.Trim();
+ base.Master_OnQuery();
+ }
+
+ protected override void GridDataBind()
+ {
+ base.GridDataBind();
+ }
+
+ protected override bool DataLogicValid()
+ {
+ if (cbxKHSZDPRO.SelectedValue.Trim().Equals("") && cbxKHSZDCITY.SelectedValue.Trim().Equals("") && cbxKHSZDCOUNTY.SelectedValue.Trim().Equals(""))
+ {
+ ShowMessage("地区--不允许为空!");
+ return false;
+ }
+
+ 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 = "";
+
+ if (!txtOLD_XZQHID.Value.Trim().Equals(txtXZQHID.Value.Trim()))
+ {
+ if (CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID='{0}' and XLXSBJDQYFB_YFJZQH<>' ' ", txtXZQHID.Value)))
+ {
+ ShowMessage("所选地区已设置运费!");
+ return false;
+ }
+ }
+
+ return base.DataLogicValid();
+ }
+
+ protected override bool Master_OnOK()
+ {
+ TDatabase DBERP = null;
+ try
+ {
+ string sXZQHID = txtXZQHID.Value.Trim();
+ DBERP = TContextDatabases.GetDatabase("DBERP");
+ DBERP.BeginTrans();
+ InsertXLXSBJDQYFB(DBERP);
+ DBERP.CommitTrans();
+ ShowMessage("设置成功!");
+ DialogOperationScript dos = new DialogOperationScript(this);
+ dos.CloseSelf();
+ dos.Execute();
+ }
+ catch (Exception ex)
+ {
+ ShowMessage(ex.Message);
+ DBERP.RollbackTrans();
+ return false;
+ }
+ return true;
+ }
+ #endregion
+
+ #region 控件事件
+ protected void btnDel_Click(object sender, EventArgs e)
+ {
+ Confirm.Register("IsQD", "将删除当前记录,是否继续?");
+ 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 dberp = TContextDatabases.GetDatabase("DBERP");
+ dberp.BeginTrans();
+ TSQL SQL = new TSQL(dberp);
+ SQL.Add("delete from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:pXZQHID and XLXSBJDQYFB_YFJZQH<>' '");
+ SQL.ParamByName("pXZQHID").Value = txtXZQHID.Value.Trim();
+ dberp.ExecSQL(SQL);
+ dberp.CommitTrans();
+ ShowMessage("删除成功!");
+ CloseWindow();
+ }
+
+ protected void cbxKHSZDPRO_OnSelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ return;
+ cbxKHSZDCITY.ClearItems();
+ cbxKHSZDCITY.SelectedValue = "";
+ cbxKHSZDCOUNTY.ClearItems();
+ cbxKHSZDCOUNTY.SelectedValue = "";
+ if (!cbxKHSZDPRO.SelectedValue.Trim().Equals(""))
+ {
+ TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
+ TSQL SQL = new TSQL(dberp);
+ SQL.Clear();
+ SQL.Add(" select XZQH_XZQHID,XZQH_CITY from XZQH where XZQH_FID = :pFID ");
+ SQL.Add(" order by XZQH_XZQHID ");
+ SQL.ParamByName("pFID").Value = cbxKHSZDPRO.SelectedValue.Trim();
+ DataSet ds = dberp.OpenDataSet(SQL);
+ cbxKHSZDCITY.Items.Add(new ListItem("", ""));
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (!ds.Tables[0].Rows[i]["XZQH_CITY"].ToString().Trim().Equals(""))
+ {
+ cbxKHSZDCITY.Items.Add(new ListItem(ds.Tables[0].Rows[i]["XZQH_CITY"].ToString().Trim(), ds.Tables[0].Rows[i]["XZQH_XZQHID"].ToString().Trim()));
+ }
+ }
+ if (cbxKHSZDCITY.Items.Count == 2)
+ {
+ cbxKHSZDCITY.SelectedIndex = 1;
+ }
+ }
+ }
+ RefreshGrid();
+ }
+
+ protected void cbxKHSZDCITY_OnSelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ return;
+ cbxKHSZDCOUNTY.ClearItems();
+ cbxKHSZDCOUNTY.SelectedValue = "";
+ if (!cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
+ {
+ TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
+ TSQL SQL = new TSQL(dberp);
+ SQL.Clear();
+ SQL.Add(" select XZQH_XZQHID,XZQH_COUNTY from XZQH where XZQH_FID = :pFID ");
+ SQL.Add(" order by XZQH_XZQHID ");
+ SQL.ParamByName("pFID").Value = cbxKHSZDCITY.SelectedValue.Trim();
+ DataSet ds = dberp.OpenDataSet(SQL);
+ cbxKHSZDCOUNTY.Items.Add(new ListItem("", ""));
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (!ds.Tables[0].Rows[i]["XZQH_COUNTY"].ToString().Trim().Equals(""))
+ {
+ cbxKHSZDCOUNTY.Items.Add(new ListItem(ds.Tables[0].Rows[i]["XZQH_COUNTY"].ToString().Trim(), ds.Tables[0].Rows[i]["XZQH_XZQHID"].ToString().Trim()));
+ }
+ }
+ if (cbxKHSZDCOUNTY.Items.Count == 2)
+ {
+ cbxKHSZDCOUNTY.SelectedIndex = 1;
+ }
+ }
+ }
+ RefreshGrid();
+ }
+
+ protected void cbxKHSZDCOUNTY_OnSelectedIndexChanged(object sender, EventArgs e)
+ {
+ RefreshGrid();
+ }
+ #endregion
+
+ #region 自定义函数
+ private void InitControls()
+ {
+ TComboBox.SetComboBox("DBERP", cbxKHSZDPRO, "select XZQH_XZQHID,XZQH_PROVINCE from XZQH where XZQH_FID = '86' ORDER BY XZQH_XZQHID ", false);
+ }
+
+ private void LoadXZQH(string sXZQHID)
+ {
+ TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
+ TSQL SQL = new TSQL(dberp);
+ SQL.Clear();
+ SQL.Add("select XZQH_XZQHID,XZQH_FID,XZQH_PROVINCE,XZQH_CITY,XZQH_COUNTY from XZQH where XZQH_XZQHID = :pXZQHID ");
+ SQL.ParamByName("pXZQHID").Value = sXZQHID;
+ DataSet ds = dberp.OpenDataSet(SQL);
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["XZQH_FID"].ToString().Trim().Equals("86"))
+ {
+ cbxKHSZDPRO.SelectedValue = ds.Tables[0].Rows[0]["XZQH_XZQHID"].ToString().Trim();
+ cbxKHSZDCITY.SelectedValue = "";
+ cbxKHSZDCOUNTY.SelectedValue = "";
+ }
+ else if (ds.Tables[0].Rows[0]["XZQH_FID"].ToString().Trim().EndsWith("0000"))
+ {
+ cbxKHSZDPRO.SelectedValue = ds.Tables[0].Rows[0]["XZQH_FID"].ToString().Trim();
+ cbxKHSZDCITY.SelectedValue = ds.Tables[0].Rows[0]["XZQH_XZQHID"].ToString().Trim();
+ }
+ else
+ {
+ cbxKHSZDCITY.SelectedValue = ds.Tables[0].Rows[0]["XZQH_FID"].ToString().Trim();
+ cbxKHSZDCOUNTY.SelectedValue = ds.Tables[0].Rows[0]["XZQH_XZQHID"].ToString().Trim();
+ TSQL sSQL = new TSQL(dberp);
+ sSQL.Clear();
+ sSQL.Add("select XZQH_XZQHID,XZQH_FID from XZQH where XZQH_XZQHID = :pXZQHID ");
+ sSQL.ParamByName("pXZQHID").Value = cbxKHSZDCITY.SelectedValue.Trim();
+ DataSet dsPRO = dberp.OpenDataSet(sSQL);
+ if (dsPRO.Tables[0].Rows.Count > 0)
+ {
+ cbxKHSZDPRO.SelectedValue = dsPRO.Tables[0].Rows[0]["XZQH_FID"].ToString().Trim();
+ }
+ }
+
+ SQL.Clear();
+ SQL.Add(" select XZQH_XZQHID,XZQH_CITY from XZQH where XZQH_FID = :pFID ");
+ SQL.Add(" order by XZQH_XZQHID ");
+ SQL.ParamByName("pFID").Value = cbxKHSZDPRO.SelectedValue.Trim();
+ DataSet ds1 = dberp.OpenDataSet(SQL);
+ cbxKHSZDCITY.Items.Add(new ListItem("", ""));
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ for (int i = 0; i < ds1.Tables[0].Rows.Count; i++)
+ {
+ if (!ds1.Tables[0].Rows[i]["XZQH_CITY"].ToString().Trim().Equals(""))
+ {
+ cbxKHSZDCITY.Items.Add(new ListItem(ds1.Tables[0].Rows[i]["XZQH_CITY"].ToString().Trim(), ds1.Tables[0].Rows[i]["XZQH_XZQHID"].ToString().Trim()));
+ }
+ }
+ }
+
+ SQL.Clear();
+ SQL.Add(" select XZQH_XZQHID,XZQH_COUNTY from XZQH where XZQH_FID = :pFID ");
+ SQL.Add(" order by XZQH_XZQHID ");
+ SQL.ParamByName("pFID").Value = cbxKHSZDCITY.SelectedValue.Trim();
+ DataSet dsCOUNTY = dberp.OpenDataSet(SQL);
+ cbxKHSZDCOUNTY.Items.Add(new ListItem("", ""));
+ if (dsCOUNTY.Tables[0].Rows.Count > 0)
+ {
+ for (int i = 0; i < dsCOUNTY.Tables[0].Rows.Count; i++)
+ {
+ if (!dsCOUNTY.Tables[0].Rows[i]["XZQH_COUNTY"].ToString().Trim().Equals(""))
+ {
+ cbxKHSZDCOUNTY.Items.Add(new ListItem(dsCOUNTY.Tables[0].Rows[i]["XZQH_COUNTY"].ToString().Trim(), dsCOUNTY.Tables[0].Rows[i]["XZQH_XZQHID"].ToString().Trim()));
+ }
+ }
+ }
+ }
+ }
+
+ private void InsertXLXSBJDQYFB(TDatabase dberp)
+ {
+ string sXZQHID = txtXZQHID.Value.Trim();
+
+ TSQL SQL = new TSQL(dberp);
+ SQL.Add("delete from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:pXZQHID and XLXSBJDQYFB_YFJZQH<>' '");
+ SQL.ParamByName("pXZQHID").Value = sXZQHID;
+ dberp.ExecSQL(SQL);
+
+ foreach (GridViewRow row in grdSHD.NewRows)
+ {
+ double dYSFL = CMISproConvert.StrToFloat(grdSHD.GetValueByFieldName("YSFL", row), 0);
+ string sYFJZQH = grdSHD.GetValueByFieldName("XLXSBJYFJZQJ_YFJZQH", row).Trim();
+ if (string.IsNullOrEmpty(sYFJZQH))
+ continue;
+
+ SQL.Clear();
+ SQL.Add("insert into XLXSBJDQYFB(XLXSBJDQYFB_XZQHID,XLXSBJDQYFB_YFJZQH,XLXSBJDQYFB_YSFL,XLXSBJDQYFB_WHR,XLXSBJDQYFB_WHRID,XLXSBJDQYFB_WHSJ)");
+ SQL.Add(string.Format("select '{0}' as XZQHID,'{1}' as YFJZQH,'{2}' AS YSFL, '{3}' as WHR,'{4}' as WHRID,'{5}' as WHSJ ",
+ sXZQHID, sYFJZQH, dYSFL, CurSession.UserName, CurSession.UserId, DateTime.Now));
+ dberp.ExecSQL(SQL);
+ }
+ }
+
+ private void RefreshGrid()
+ {
+ string sXZQHID = "";
+ if (!cbxKHSZDCOUNTY.SelectedValue.Trim().Equals(""))
+ sXZQHID = cbxKHSZDCOUNTY.SelectedValue.Trim();
+ else if (!cbxKHSZDCITY.SelectedValue.Trim().Equals(""))
+ sXZQHID = cbxKHSZDCITY.SelectedValue.Trim();
+ else if (!cbxKHSZDPRO.SelectedValue.Trim().Equals(""))
+ sXZQHID = cbxKHSZDPRO.SelectedValue.Trim();
+ grdSHD.DataSource = GetGridTable(sXZQHID);
+ grdSHD.DataBind();
+ grdSHD.SaveDataInfo.SaveDataFlag = DSaveDataFlag.sdNormal;
+ FormAreaUpdate();
+ }
+
+ private DataTable GetGridTable(string sXZQHID)
+ {
+ DataTable dt = new DataTable();
+ TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
+ TSQL SQL = new TSQL(dberp);
+ SQL.Clear();
+ SQL.Add("select XLXSBJYFJZQJ_YFJZQH,XLXSBJYFJZQJ_YFJZQJMC,isnull(XLXSBJDQYFB_YSFL,0) as YSFL ");
+ SQL.Add(" from XLXSBJYFJZQJ");
+ SQL.Add(" left join (select XLXSBJDQYFB_YFJZQH,XLXSBJDQYFB_YSFL from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID=:pXZQHID and XLXSBJDQYFB_YFJZQH<>' ') a");
+ SQL.Add(" on a.XLXSBJDQYFB_YFJZQH=XLXSBJYFJZQJ_YFJZQH");
+ SQL.Add(" where XLXSBJYFJZQJ_YFJSGS = '6' ");
+ SQL.Add("order by XLXSBJYFJZQJ_YFJZQH");
+ SQL.ParamByName("pXZQHID").Value = sXZQHID;
+ DataSet ds = dberp.OpenDataSet(SQL);
+ if (ds.Tables.Count > 0)
+ {
+ dt = ds.Tables[0];
+ }
+ return dt;
+ }
+ #endregion
+ }
+}
diff --git a/BJYF_TLJQJInfo.aspx.designer.cs b/BJYF_TLJQJInfo.aspx.designer.cs
new file mode 100644
index 0000000..0e3db2d
--- /dev/null
+++ b/BJYF_TLJQJInfo.aspx.designer.cs
@@ -0,0 +1,142 @@
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:2.0.50727.9179
+//
+// 对此文件的更改可能会导致不正确的行为,并且如果
+// 重新生成代码,这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace GThinking.N_XLXSBJ {
+
+
+ ///
+ /// BJYF_TLJQJInfo 类。
+ ///
+ ///
+ /// 自动生成的类。
+ ///
+ public partial class BJYF_TLJQJInfo {
+
+ ///
+ /// CustomButton 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Table CustomButton;
+
+ ///
+ /// btnDel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtToolButton btnDel;
+
+ ///
+ /// GtLabel3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel GtLabel3;
+
+ ///
+ /// cbxKHSZDPRO 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtComboBox cbxKHSZDPRO;
+
+ ///
+ /// cbxKHSZDCITY 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtComboBox cbxKHSZDCITY;
+
+ ///
+ /// cbxKHSZDCOUNTY 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtComboBox cbxKHSZDCOUNTY;
+
+ ///
+ /// Tab 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtPageControl Tab;
+
+ ///
+ /// pagSHD 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtPagePanel pagSHD;
+
+ ///
+ /// UPSHD 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.UpdatePanel UPSHD;
+
+ ///
+ /// grdSHD 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtAjaxGridView grdSHD;
+
+ ///
+ /// txtXZQHID 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField txtXZQHID;
+
+ ///
+ /// txtOLD_XZQHID 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField txtOLD_XZQHID;
+
+ ///
+ /// Master 属性。
+ ///
+ ///
+ /// 自动生成的属性。
+ ///
+ public new GThinking.N_MODEL.Page.MasterOperation Master {
+ get {
+ return ((GThinking.N_MODEL.Page.MasterOperation)(base.Master));
+ }
+ }
+ }
+}
diff --git a/BJYF_TLJQJList.aspx b/BJYF_TLJQJList.aspx
new file mode 100644
index 0000000..d5d586c
--- /dev/null
+++ b/BJYF_TLJQJList.aspx
@@ -0,0 +1,49 @@
+<%@ Page Language="C#" MasterPageFile="~/N_MODEL/Page/MasterSingleGrid.Master" AutoEventWireup="true"
+ Codebehind="BJYF_TLJQJList.aspx.cs" Inherits="GThinking.N_XLXSBJ.BJYF_TLJQJList" Title="按运距铜铝价区间维护运费比例" %>
+
+<%@ MasterType VirtualPath="~/N_MODEL/Page/MasterSingleGrid.Master" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BJYF_TLJQJList.aspx.cs b/BJYF_TLJQJList.aspx.cs
new file mode 100644
index 0000000..20f37c3
--- /dev/null
+++ b/BJYF_TLJQJList.aspx.cs
@@ -0,0 +1,223 @@
+using 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_MISPRO;
+using GThinking.N_MODEL.Page;
+using GThinking.N_MISPRO.Data;
+using GThinking.N_MISPRO.Utility;
+using System.Text;
+using GThinking.N_CONTROL;
+
+namespace GThinking.N_XLXSBJ
+{
+ public partial class BJYF_TLJQJList : SingleGridBase
+ {
+ BJYF_TLJQJ entity = new BJYF_TLJQJ();
+ BJYF_TLJQJ_M qryEntity = new BJYF_TLJQJ_M();
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ this.UMID = 100860173;
+ this.UMName = "按运距铜铝价区间维护运费比例";
+ this.CurMaster = Master;
+ this.ModuleGV = grdContentGrid;
+ this.CurEntity = entity;
+ this.CurQueryEntity = qryEntity;
+ this.sURLTarget = "BJYF_TLJQJInfo.aspx";
+ this.sQueryURLTarget = "BJYF_TLJQJQuery.aspx";
+ this.PageHeight = 600;
+ this.PageWidth = 750;
+ base.DataKeyNames = new string[] { "XLXSBJDQYFB_XZQHID" };
+ Master.EnableCopyBtn = false;
+
+ base.InitPage();
+
+ if (!IsPostBack)
+ {
+ Master_OnStandardQuery(null, null);
+ }
+ }
+
+ #region 模板事件
+ protected override void Master_OnStandardQuery(object sender, EventArgs e)
+ {
+ base.InitEntityByCondition();
+ InitGridView();
+ entity.EntityTable.QuerySelSql = GetSql();
+ base.Master_OnStandardQuery(sender, e);
+ entity.GridDataBind(grdContentGrid, tSession);
+ }
+
+ protected override void moduleGV_PageIndexChanging(object sender, GridViewPageEventArgs e)
+ {
+ base.InitEntityByCondition();
+ InitGridView();
+ entity.EntityTable.QuerySelSql = GetSql();
+ base.moduleGV_PageIndexChanging(sender, e);
+ grdContentGrid.SelectedIndex = -1;
+ }
+
+ protected override void moduleGV_RowDataBound(object sender, GridViewRowEventArgs e)
+ {
+ if (e.Row.RowType == DataControlRowType.DataRow)
+ {
+ LinkPageParam.AddString("XLXSBJDQYFB_XZQHID", grdContentGrid.DataKeys[e.Row.RowIndex]["XLXSBJDQYFB_XZQHID"].ToString().Trim());
+ LinkPageParam.AddString("YFJZQHList", txtYFJZQHList.Value.Trim());
+ }
+ base.moduleGV_RowDataBound(sender, e);
+ }
+
+ protected override bool Master_BeforeDeleteAction(object sender, EventArgs e)
+ {
+ entity.Param.Add("XLXSBJDQYFB_XZQHID", grdContentGrid.SelectedDataKey["XLXSBJDQYFB_XZQHID"].ToString().Trim());
+ return base.Master_BeforeDeleteAction(sender, e);
+ }
+
+ protected override void AfterDelete(TDatabase db, ref bool ActionIsDone)
+ {
+ string sXZQHID = grdContentGrid.SelectedDataKey["XLXSBJDQYFB_XZQHID"].ToString().Trim();
+ string[] sYFJZQHs = txtYFJZQHList.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ if (sYFJZQHs.Length > 0)
+ {
+ string sIn = "'" + string.Join("','", sYFJZQHs) + "'";
+ db.ExecSQL(string.Format("delete from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID='{0}' and XLXSBJDQYFB_YFJZQH in ({1})", sXZQHID, sIn));
+ }
+ ActionIsDone = true;
+ base.AfterDelete(db, ref ActionIsDone);
+ }
+
+ protected override bool Master_AfterDeleteAction(object sender, EventArgs e)
+ {
+ if (!base.Master_AfterDeleteAction(sender, e))
+ { return false; }
+ base.InitEntityByCondition();
+ InitGridView();
+ entity.EntityTable.QuerySelSql = GetSql();
+ entity.GridDataBind(grdContentGrid, tSession);
+ grdContentGrid.SelectedIndex = -1;
+ return true;
+ }
+ #endregion
+
+ protected void btnYFJZQJ_Click(object sender, EventArgs e)
+ {
+ TPageParams tpp = new TPageParams();
+ tpp.UrlPath = "BJYFJZQJList.aspx";
+ tpp.AddString("YFJSFS", "6");
+ OpenModuleDialog(100860071, tpp, btnRefresh.ClientID);
+ }
+
+ protected void btnRefresh_Click(object sender, EventArgs e)
+ {
+ moduleGV_PageIndexChanging(null, null);
+ }
+
+
+ protected void btnDR_Click(object sender, EventArgs e)
+ {
+ TPageParams tpp = new TPageParams();
+ tpp.UrlPath = "BJYFDRInfo.aspx";
+ tpp.AddString("YFJSFS", "6");
+ OpenDialog(tpp);
+ }
+
+
+ #region 自定义函数
+ private string GetSql()
+ {
+ string[] sYFJZQHs = txtYFJZQHList.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ StringBuilder strSQL = new StringBuilder();
+ strSQL.AppendLine(" select A.XZQH_XZQHID as XLXSBJDQYFB_XZQHID,");
+ strSQL.AppendLine(" isnull(A.XZQH_PROVINCE,'') as XZQH_PROVINCE,");
+ strSQL.AppendLine(" isnull(A.XZQH_CITY,'') as XZQH_CITY,");
+ for (int i = 0; i < sYFJZQHs.Length; i++)
+ {
+ strSQL.AppendLine(string.Format(" isnull(sum(case when B.XLXSBJDQYFB_YFJZQH='{0}' then B.XLXSBJDQYFB_YSFL else 0 end),0) as YL_{0},", sYFJZQHs[i].Trim()));
+ }
+ strSQL.AppendLine(" max(B.XLXSBJDQYFB_WHR) as XLXSBJDQYFB_WHR,");
+ strSQL.AppendLine(" max(B.XLXSBJDQYFB_WHSJ) as XLXSBJDQYFB_WHSJ");
+ strSQL.AppendLine(" from XZQH A");
+ strSQL.AppendLine(" left join XLXSBJDQYFB B on B.XLXSBJDQYFB_XZQHID = A.XZQH_XZQHID");
+ if (sYFJZQHs.Length > 0)
+ {
+ string sIn = "'" + string.Join("','", sYFJZQHs) + "'";
+ strSQL.AppendLine(" and B.XLXSBJDQYFB_YFJZQH in (" + sIn + ")");
+ strSQL.AppendLine(" where exists(select 1 from XLXSBJDQYFB where XLXSBJDQYFB_XZQHID = A.XZQH_XZQHID and XLXSBJDQYFB_YFJZQH in (" + sIn + "))");
+ }
+ else
+ {
+ strSQL.AppendLine(" where 1<>1");
+ }
+ strSQL.AppendLine(" group by A.XZQH_XZQHID, A.XZQH_PROVINCE, A.XZQH_CITY");
+ strSQL.AppendLine(" order by A.XZQH_PROVINCE, A.XZQH_CITY");
+ return strSQL.ToString();
+ }
+
+ private void InitGridView()
+ {
+ // 移除已存在的动态列,避免重复添加
+ for (int i = grdContentGrid.Columns.Count - 1; i >= 0; i--)
+ {
+ BoundField bf = grdContentGrid.Columns[i] as BoundField;
+ if (bf != null && bf.DataField.StartsWith("YL_"))
+ {
+ grdContentGrid.Columns.RemoveAt(i);
+ }
+ }
+ for (int i = grdContentGrid.ColumnsEx.Count - 1; i >= 0; i--)
+ {
+ if (grdContentGrid.ColumnsEx[i].DataField.StartsWith("YL_"))
+ {
+ grdContentGrid.ColumnsEx.RemoveAt(i);
+ }
+ }
+
+ TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
+ TSQL SQL = new TSQL(dberp);
+ SQL.Clear();
+ SQL.Add("select XLXSBJYFJZQJ_YFJZQH, XLXSBJYFJZQJ_YFJZQJMC ");
+ SQL.Add(" from XLXSBJYFJZQJ");
+ SQL.Add(" where XLXSBJYFJZQJ_YFJSGS = '6'");
+ SQL.Add(" order by XLXSBJYFJZQJ_YFJZQH");
+ DataSet ds = dberp.OpenDataSet(SQL);
+
+ StringBuilder sbYFJZQH = new StringBuilder();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ string sYFJZQH = ds.Tables[0].Rows[i]["XLXSBJYFJZQJ_YFJZQH"].ToString().Trim();
+ string sYFJZQJMC = ds.Tables[0].Rows[i]["XLXSBJYFJZQJ_YFJZQJMC"].ToString().Trim();
+ if (sbYFJZQH.Length > 0)
+ sbYFJZQH.Append(",");
+ sbYFJZQH.Append(sYFJZQH);
+ AddColumn("YL_" + sYFJZQH, sYFJZQJMC, 2, 120);
+ }
+ txtYFJZQHList.Value = sbYFJZQH.ToString();
+ }
+
+ private void AddColumn(string sDataField, string HeadText, int NumberDecimalPlace, int Width)
+ {
+ BoundField Column = new BoundField();
+ Column.DataField = sDataField;
+ Column.HeaderText = HeadText;
+ Column.ItemStyle.Width = (Unit)Width;
+ Column.HeaderStyle.Width = (Unit)Width;
+ Column.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
+ grdContentGrid.Columns.Add(Column);
+
+ gtGridView_Column ColumnEx = new gtGridView_Column();
+ ColumnEx.DataField = sDataField;
+ ColumnEx.EditType = TEditType.etNumber;
+ ColumnEx.ShowHint = true;
+ ColumnEx.NumberDecimalPlace = NumberDecimalPlace;
+ grdContentGrid.ColumnsEx.Add(ColumnEx);
+ }
+ #endregion
+ }
+}
diff --git a/BJYF_TLJQJList.aspx.designer.cs b/BJYF_TLJQJList.aspx.designer.cs
new file mode 100644
index 0000000..1a71b4d
--- /dev/null
+++ b/BJYF_TLJQJList.aspx.designer.cs
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:2.0.50727.9179
+//
+// 对此文件的更改可能会导致不正确的行为,并且如果
+// 重新生成代码,这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace GThinking.N_XLXSBJ {
+
+
+ ///
+ /// BJYF_TLJQJList 类。
+ ///
+ ///
+ /// 自动生成的类。
+ ///
+ public partial class BJYF_TLJQJList {
+
+ ///
+ /// CustomButton 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Table CustomButton;
+
+ ///
+ /// btnYFJZQJ 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtToolButton btnYFJZQJ;
+
+ ///
+ /// btnDR 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtToolButton btnDR;
+
+ ///
+ /// btnRefresh 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtButton btnRefresh;
+
+ ///
+ /// grdContentGrid 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtGridView grdContentGrid;
+
+ ///
+ /// txtYFJZQHList 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField txtYFJZQHList;
+
+ ///
+ /// Master 属性。
+ ///
+ ///
+ /// 自动生成的属性。
+ ///
+ public new GThinking.N_MODEL.Page.MasterSingleGrid Master {
+ get {
+ return ((GThinking.N_MODEL.Page.MasterSingleGrid)(base.Master));
+ }
+ }
+ }
+}
diff --git a/BJYF_TLJQJQuery.aspx b/BJYF_TLJQJQuery.aspx
new file mode 100644
index 0000000..e5755f9
--- /dev/null
+++ b/BJYF_TLJQJQuery.aspx
@@ -0,0 +1,8 @@
+<%@ Page Language="C#" MasterPageFile="~/N_MODEL/Page/MasterSingleQuery.Master" AutoEventWireup="true"
+ Codebehind="BJYF_TLJQJQuery.aspx.cs" Inherits="GThinking.N_XLXSBJ.BJYF_TLJQJQuery" Title="按运距铜铝价区间维护运费比例" %>
+
+<%@ MasterType VirtualPath="~/N_MODEL/Page/MasterSingleQuery.Master" %>
+
+
+
+
diff --git a/BJYF_TLJQJQuery.aspx.cs b/BJYF_TLJQJQuery.aspx.cs
new file mode 100644
index 0000000..dce61a1
--- /dev/null
+++ b/BJYF_TLJQJQuery.aspx.cs
@@ -0,0 +1,30 @@
+using 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;
+
+namespace GThinking.N_XLXSBJ
+{
+ public partial class BJYF_TLJQJQuery : SingleQueryBase
+ {
+ BJYF_TLJQJ_M qryEntity = new BJYF_TLJQJ_M();
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ this.UMID = 100860173;
+ this.UMName = "按运距铜铝价区间维护运费比例";
+ this.CurMaster = Master;
+ this.CurQueryTable = QueryTable;
+ this.CurQueryEntity = qryEntity;
+
+ base.InitPage();
+ }
+ }
+}
diff --git a/BJYF_TLJQJQuery.aspx.designer.cs b/BJYF_TLJQJQuery.aspx.designer.cs
new file mode 100644
index 0000000..17b1e00
--- /dev/null
+++ b/BJYF_TLJQJQuery.aspx.designer.cs
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:2.0.50727.9179
+//
+// 对此文件的更改可能会导致不正确的行为,并且如果
+// 重新生成代码,这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace GThinking.N_XLXSBJ {
+
+
+ ///
+ /// BJYF_TLJQJQuery 类。
+ ///
+ ///
+ /// 自动生成的类。
+ ///
+ public partial class BJYF_TLJQJQuery {
+
+ ///
+ /// QueryTable 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Table QueryTable;
+
+ ///
+ /// Master 属性。
+ ///
+ ///
+ /// 自动生成的属性。
+ ///
+ public new GThinking.N_MODEL.Page.MasterSingleQuery Master {
+ get {
+ return ((GThinking.N_MODEL.Page.MasterSingleQuery)(base.Master));
+ }
+ }
+ }
+}
diff --git a/BJYF_TLJQJ_M.cs b/BJYF_TLJQJ_M.cs
new file mode 100644
index 0000000..c524e1d
--- /dev/null
+++ b/BJYF_TLJQJ_M.cs
@@ -0,0 +1,21 @@
+using 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
+{
+ public class BJYF_TLJQJ_M : TBaseNamedQuery
+ {
+ public BJYF_TLJQJ_M()
+ {
+ }
+
+ }
+}
diff --git a/CLQDYZInfo.aspx b/CLQDYZInfo.aspx
index b73faa1..491633d 100644
--- a/CLQDYZInfo.aspx
+++ b/CLQDYZInfo.aspx
@@ -148,6 +148,96 @@
|
+
+
+
+ |
+ 调价因子11:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子12:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子13:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子14:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子15:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子16:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子17:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子18:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子19:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子20:
+ |
+
+
+ |
diff --git a/CLQDYZInfo.aspx.cs b/CLQDYZInfo.aspx.cs
index 679fdfc..62f9069 100644
--- a/CLQDYZInfo.aspx.cs
+++ b/CLQDYZInfo.aspx.cs
@@ -428,65 +428,27 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("pWHRID").Value = tSession.UserId;
sql.ParamByName("pWHSJ").Value = tNow;
- if (sTJYZList[i].StartsWith("JZ01|"))
+ string item = sTJYZList[i];
+ if (item.Length >= 5 && item.StartsWith("JZ") && char.IsDigit(item[2]) && char.IsDigit(item[3]) && item[4] == '|')
{
- sql.ParamByName("pYZID").Value = "JZ01";
- sql.ParamByName("pYZZ").Value = txtTJYZ1.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ02|"))
- {
- sql.ParamByName("pYZID").Value = "JZ02";
- sql.ParamByName("pYZZ").Value = txtTJYZ2.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ03|"))
- {
- sql.ParamByName("pYZID").Value = "JZ03";
- sql.ParamByName("pYZZ").Value = txtTJYZ3.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ04|"))
- {
- sql.ParamByName("pYZID").Value = "JZ04";
- sql.ParamByName("pYZZ").Value = txtTJYZ4.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ05|"))
- {
- sql.ParamByName("pYZID").Value = "JZ05";
- sql.ParamByName("pYZZ").Value = txtTJYZ5.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ06|"))
- {
- sql.ParamByName("pYZID").Value = "JZ06";
- sql.ParamByName("pYZZ").Value = txtTJYZ6.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ07|"))
- {
- sql.ParamByName("pYZID").Value = "JZ07";
- sql.ParamByName("pYZZ").Value = txtTJYZ7.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ08|"))
- {
- sql.ParamByName("pYZID").Value = "JZ08";
- sql.ParamByName("pYZZ").Value = txtTJYZ8.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ09|"))
- {
- sql.ParamByName("pYZID").Value = "JZ09";
- sql.ParamByName("pYZZ").Value = txtTJYZ9.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ10|"))
- {
- sql.ParamByName("pYZID").Value = "JZ10";
- sql.ParamByName("pYZZ").Value = txtTJYZ10.Value;
- dberp.ExecSQL(sql);
+ string num = item.Substring(2, 2); // ȡ³öÁ½λ±àºţ¬Èç "01"
+ int index;
+ if (int.TryParse(num, out index) && index >= 1 && index <= 10)
+ {
+ string id = "JZ" + num; // ¹¹Ôì pYZID µÄֵ£¬Èç "JZ01"
+ sql.ParamByName("pYZID").Value = id;
+
+ // ¸ù¾ݱàºŶ¯̬²éÕҶÔӦµÄÊäÈë¿ؼþ
+ Control ctrl = FindControl("txtTJYZ" + num);
+ if (ctrl != null && ctrl is gtNumTextBox)
+ {
+ double value = ((gtNumTextBox)ctrl).Value;
+ sql.ParamByName("pYZZ").Value = value;
+ dberp.ExecSQL(sql);
+ }
+ // ÒòΪһ¸ö sTJYZList[i] ֻ»áƥÅäһ¸ö·Ö֧£¬Õҵ½ºÉÌø³öµ±ǰԪËصĴ¦Àí
+ break;
+ }
}
}
#endregion
diff --git a/CLQDYZInfo.aspx.designer.cs b/CLQDYZInfo.aspx.designer.cs
index 97f78e3..2edaaca 100644
--- a/CLQDYZInfo.aspx.designer.cs
+++ b/CLQDYZInfo.aspx.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
-// 运行时版本:2.0.50727.9174
+// 运行时版本:2.0.50727.9179
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@@ -289,6 +289,186 @@ namespace GThinking.N_XLXSBJ {
///
protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ10;
+ ///
+ /// lblTJYZ11 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ11;
+
+ ///
+ /// txtTJYZ11 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ11;
+
+ ///
+ /// lblTJYZ12 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ12;
+
+ ///
+ /// txtTJYZ12 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ12;
+
+ ///
+ /// lblTJYZ13 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ13;
+
+ ///
+ /// txtTJYZ13 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ13;
+
+ ///
+ /// lblTJYZ14 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ14;
+
+ ///
+ /// txtTJYZ14 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ14;
+
+ ///
+ /// lblTJYZ15 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ15;
+
+ ///
+ /// txtTJYZ15 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ15;
+
+ ///
+ /// lblTJYZ16 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ16;
+
+ ///
+ /// txtTJYZ16 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ16;
+
+ ///
+ /// lblTJYZ17 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ17;
+
+ ///
+ /// txtTJYZ17 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ17;
+
+ ///
+ /// lblTJYZ18 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ18;
+
+ ///
+ /// txtTJYZ18 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ18;
+
+ ///
+ /// lblTJYZ19 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ19;
+
+ ///
+ /// txtTJYZ19 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ19;
+
+ ///
+ /// lblTJYZ20 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ20;
+
+ ///
+ /// txtTJYZ20 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ20;
+
///
/// GtLabel5 控件。
///
diff --git a/CLYLZDSQ.cs b/CLYLZDSQ.cs
index 88c2081..e614a6b 100644
--- a/CLYLZDSQ.cs
+++ b/CLYLZDSQ.cs
@@ -1308,6 +1308,96 @@ namespace GThinking.N_XLXSBJ
set { SetField("JZ10", value); }
}
+ [DataMember(DbField = "JZ11", DbTitle = "JZ11", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ11",
+ CtlType = FieldType.F)]
+ public string JZ11
+ {
+ get { return GetField("JZ11").ToString().Trim(); }
+ set { SetField("JZ11", value); }
+ }
+
+ [DataMember(DbField = "JZ12", DbTitle = "JZ12", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ12",
+ CtlType = FieldType.F)]
+ public string JZ12
+ {
+ get { return GetField("JZ12").ToString().Trim(); }
+ set { SetField("JZ12", value); }
+ }
+
+ [DataMember(DbField = "JZ13", DbTitle = "JZ13", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ13",
+ CtlType = FieldType.F)]
+ public string JZ13
+ {
+ get { return GetField("JZ13").ToString().Trim(); }
+ set { SetField("JZ13", value); }
+ }
+
+ [DataMember(DbField = "JZ14", DbTitle = "JZ14", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ14",
+ CtlType = FieldType.F)]
+ public string JZ14
+ {
+ get { return GetField("JZ14").ToString().Trim(); }
+ set { SetField("JZ14", value); }
+ }
+
+ [DataMember(DbField = "JZ15", DbTitle = "JZ15", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ15",
+ CtlType = FieldType.F)]
+ public string JZ15
+ {
+ get { return GetField("JZ15").ToString().Trim(); }
+ set { SetField("JZ15", value); }
+ }
+
+ [DataMember(DbField = "JZ16", DbTitle = "JZ16", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ16",
+ CtlType = FieldType.F)]
+ public string JZ16
+ {
+ get { return GetField("JZ16").ToString().Trim(); }
+ set { SetField("JZ16", value); }
+ }
+
+ [DataMember(DbField = "JZ17", DbTitle = "JZ17", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ17",
+ CtlType = FieldType.F)]
+ public string JZ17
+ {
+ get { return GetField("JZ17").ToString().Trim(); }
+ set { SetField("JZ17", value); }
+ }
+
+ [DataMember(DbField = "JZ18", DbTitle = "JZ18", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ18",
+ CtlType = FieldType.F)]
+ public string JZ18
+ {
+ get { return GetField("JZ18").ToString().Trim(); }
+ set { SetField("JZ18", value); }
+ }
+
+ [DataMember(DbField = "JZ19", DbTitle = "JZ19", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ19",
+ CtlType = FieldType.F)]
+ public string JZ19
+ {
+ get { return GetField("JZ19").ToString().Trim(); }
+ set { SetField("JZ19", value); }
+ }
+
+ [DataMember(DbField = "JZ20", DbTitle = "JZ20", IsKey = false, DbType = TGtdbType.Float,
+ Len = 8, IsNullable = true, DefValue = "0", CtlName = "txtJZ20",
+ CtlType = FieldType.F)]
+ public string JZ20
+ {
+ get { return GetField("JZ20").ToString().Trim(); }
+ set { SetField("JZ20", value); }
+ }
+
#endregion
@@ -1598,6 +1688,96 @@ namespace GThinking.N_XLXSBJ
set { SetField("JZ10_TJDH", value); }
}
+ [DataMember(DbField = "JZ11_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ11", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ11_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ11_TJDH
+ {
+ get { return GetField("JZ11_TJDH").ToString().Trim(); }
+ set { SetField("JZ11_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ12_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ12", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ12_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ12_TJDH
+ {
+ get { return GetField("JZ12_TJDH").ToString().Trim(); }
+ set { SetField("JZ12_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ13_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ13", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ13_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ13_TJDH
+ {
+ get { return GetField("JZ13_TJDH").ToString().Trim(); }
+ set { SetField("JZ13_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ14_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ14", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ14_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ14_TJDH
+ {
+ get { return GetField("JZ14_TJDH").ToString().Trim(); }
+ set { SetField("JZ14_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ15_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ15", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ15_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ15_TJDH
+ {
+ get { return GetField("JZ15_TJDH").ToString().Trim(); }
+ set { SetField("JZ15_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ16_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ16", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ16_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ16_TJDH
+ {
+ get { return GetField("JZ16_TJDH").ToString().Trim(); }
+ set { SetField("JZ16_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ17_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ17", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ17_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ17_TJDH
+ {
+ get { return GetField("JZ17_TJDH").ToString().Trim(); }
+ set { SetField("JZ17_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ18_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ18", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ18_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ18_TJDH
+ {
+ get { return GetField("JZ18_TJDH").ToString().Trim(); }
+ set { SetField("JZ18_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ19_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ19", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ19_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ19_TJDH
+ {
+ get { return GetField("JZ19_TJDH").ToString().Trim(); }
+ set { SetField("JZ19_TJDH", value); }
+ }
+
+ [DataMember(DbField = "JZ20_TJDH", DbTitle = "µ÷¼۵¥ºÅJZ20", IsKey = false, DbType = TGtdbType.VarChar,
+ Len = 10, IsNullable = true, DefValue = "", CtlName = "txtJZ20_TJDH",
+ CtlType = FieldType.C)]
+ public string JZ20_TJDH
+ {
+ get { return GetField("JZ20_TJDH").ToString().Trim(); }
+ set { SetField("JZ20_TJDH", value); }
+ }
+
#endregion
[DataMember(DbField = "XLXSBJYLZDMX_YZZWSZ", DbTitle = "Òò×ÓֵδÉèÖÃ", IsKey = false, DbType = TGtdbType.VarChar,
@@ -1708,7 +1888,7 @@ namespace GThinking.N_XLXSBJ
}
}
- for (int i = 1; i <= 10; i++)
+ for (int i = 1; i <= 20; i++)
{
string sYZID = "JZ" + i.ToString().PadLeft(2, '0');
if (!YZDIC.ContainsKey(sYZID))
diff --git a/CX_JGBMXList.aspx.cs b/CX_JGBMXList.aspx.cs
index b7ca152..ff807c9 100644
--- a/CX_JGBMXList.aspx.cs
+++ b/CX_JGBMXList.aspx.cs
@@ -149,9 +149,14 @@ namespace GThinking.N_XLXSBJ
{
sSQL.AppendLine("select XLXSJGBMX_JGBID,XLXSJGBMX_XH,XLXSJGBMX_XLXHID,XLXSJGBMX_XLGGID,XLXSJGBMX_XLBZID,XLXSJGBMX_DYDJID,");
sSQL.AppendLine(" XLXSJGBMX_YXQS,XLXSJGBMX_YXQZ,XLXSJGBMX_HSJJ,XLXSJGBMX_HSBJ,XLXSJGBMX_WSBJ,XLXSJGBMX_BZ,XLXSJGBMX_WHR,XLXSJGBMX_WHRID,XLXSJGBMX_WHSJ,XLXSJGBMX_XLBZID || '|' || XLBZ_XLBZLXMC as XLBZ ");
+
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×֣º01, 02, ... 20
+ sSQL.AppendFormat(",XLXSJGBYZZ0_YZZ{0} as TZYZ_JZ{0}", num);
+
+ }
- sSQL.AppendLine(" ,XLXSJGBYZZ0_YZZ01 as TZYZ_JZ01,XLXSJGBYZZ0_YZZ02 as TZYZ_JZ02,XLXSJGBYZZ0_YZZ03 as TZYZ_JZ03,XLXSJGBYZZ0_YZZ04 as TZYZ_JZ04,XLXSJGBYZZ0_YZZ05 as TZYZ_JZ05 ");
- sSQL.AppendLine(" ,XLXSJGBYZZ0_YZZ06 as TZYZ_JZ06,XLXSJGBYZZ0_YZZ07 as TZYZ_JZ07,XLXSJGBYZZ0_YZZ08 as TZYZ_JZ08,XLXSJGBYZZ0_YZZ09 as TZYZ_JZ09,XLXSJGBYZZ0_YZZ10 as TZYZ_JZ10 ");
sSQL.AppendLine(" from XLXSJGBMX ");
sSQL.AppendLine(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID=XLXSJGBMX_JGBID and XLXSJGBYZZ0_XH=XLXSJGBMX_XH ");
}
diff --git a/DRXLXHCPTXWH.aspx.cs b/DRXLXHCPTXWH.aspx.cs
index c9a42e9..4cde7c2 100644
--- a/DRXLXHCPTXWH.aspx.cs
+++ b/DRXLXHCPTXWH.aspx.cs
@@ -125,6 +125,7 @@ namespace GThinking.N_XLXSBJ
{
string sXLXHID = ds.Tables[0].Rows[i][0].ToString().Trim();
string sDYDJID = ds.Tables[0].Rows[i][1].ToString().Trim();
+ string sZXJM = ds.Tables[0].Rows[i][2].ToString().Trim();
#region 校验数据
@@ -136,9 +137,12 @@ namespace GThinking.N_XLXSBJ
if (sDYDJID.Equals(""))
sDYDJID = " ";
+ if (sZXJM.Equals(""))
+ sZXJM = " ";
+
#endregion
- string sSQL = string.Format("delete from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID='{0}' and XLXSBJCPYS_DYDJID='{1}'", sXLXHID, sDYDJID);
+ string sSQL = string.Format("delete from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID='{0}' and XLXSBJCPYS_DYDJID='{1}' and ,XLXSBJCPYS_XLYSID='{2}' ", sXLXHID, sDYDJID,sZXJM);
SQL.Clear();
SQL.Add(sSQL);
@@ -147,7 +151,8 @@ namespace GThinking.N_XLXSBJ
#region 按矩阵列生成属性记录
string sXLTXID = string.Empty;
- for (int j = 2; j < ds.Tables[0].Columns.Count; j++)
+ int XH = 1;
+ for (int j = 3; j < ds.Tables[0].Columns.Count; j++)
{
object objValue = ds.Tables[0].Rows[i][j];
if (objValue == null || objValue == DBNull.Value)
@@ -162,12 +167,13 @@ namespace GThinking.N_XLXSBJ
if (sCellValue.Equals(""))
continue;
- int XH = 1;
+
SQL.Clear();
- SQL.Add(@" insert into XLXSBJCPYS(XLXSBJCPYS_CPYT, XLXSBJCPYS_XLJBXHID, XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID,XLXSBJCPYS_WHR,XLXSBJCPYS_WHRID,XLXSBJCPYS_WHSJ)
- values(:XLXSBJCPYS_CPYT,:XLXSBJCPYS_XLJBXHID,:XLXSBJCPYS_DYDJID,:XLXSBJCPYS_XXJGID,:XLXSBJCPYS_WHR,:XLXSBJCPYS_WHRID,:XLXSBJCPYS_WHSJ)");
+ SQL.Add(@" insert into XLXSBJCPYS(XLXSBJCPYS_CPYT, XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_XLYSID, XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID,XLXSBJCPYS_WHR,XLXSBJCPYS_WHRID,XLXSBJCPYS_WHSJ)
+ values(:XLXSBJCPYS_CPYT,:XLXSBJCPYS_XLJBXHID,:XLXSBJCPYS_XLYSID,:XLXSBJCPYS_DYDJID,:XLXSBJCPYS_XXJGID,:XLXSBJCPYS_WHR,:XLXSBJCPYS_WHRID,:XLXSBJCPYS_WHSJ)");
SQL.ParamByName("XLXSBJCPYS_XLJBXHID").Value = sXLXHID;
SQL.ParamByName("XLXSBJCPYS_DYDJID").Value = sDYDJID;
+ SQL.ParamByName("XLXSBJCPYS_XLYSID").Value = sZXJM;
SQL.ParamByName("XLXSBJCPYS_XXJGID").Value = sXLXHFJSX;
SQL.ParamByName("XLXSBJCPYS_CPYT").Value = XH++;
SQL.ParamByName("XLXSBJCPYS_WHR").Value = tSession.UserName;
@@ -196,9 +202,9 @@ namespace GThinking.N_XLXSBJ
private void ExcelColumnValid(DataSet ds)
{
- if (ds.Tables[0].Columns.Count < 3)
+ if (ds.Tables[0].Columns.Count < 4)
{
- throw new Exception("Excel 列数不正确,至少需要包含“型号”、“电压等级”列和一列属性列!");
+ throw new Exception("Excel 列数不正确,至少需要包含“型号”、“电压等级”、“主芯截面”列和一列属性列!");
}
if (!ds.Tables[0].Columns[0].ColumnName.Trim().Equals("型号"))
@@ -210,6 +216,11 @@ namespace GThinking.N_XLXSBJ
{
throw new Exception(string.Format("第 2 列标题错误,当前为({0}),应为(电压等级)", ds.Tables[0].Columns[0].ColumnName.Trim()));
}
+
+ if (!ds.Tables[0].Columns[2].ColumnName.Trim().Equals("主芯截面"))
+ {
+ throw new Exception(string.Format("第 3 列标题错误,当前为({0}),应为(主芯截面)", ds.Tables[0].Columns[0].ColumnName.Trim()));
+ }
}
private void ReadWJ(string sPath, ref DataSet aDataExcel)
diff --git a/JGBMLInfo.aspx.cs b/JGBMLInfo.aspx.cs
index 7d5776f..c557387 100644
--- a/JGBMLInfo.aspx.cs
+++ b/JGBMLInfo.aspx.cs
@@ -715,10 +715,21 @@ namespace GThinking.N_XLXSBJ
//ͬ²½¸´ÖÆXLXSJGBYZZ0
SQL.Clear();
- SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,");
- SQL.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10)");
- SQL.Add(" select :pJGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05, ");
- SQL.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×֣º01, 02, ... 20
+ SQL.Add(string.Format(",XLXSJGBYZZ0_YZZ{0}", num));
+
+ }
+ SQL.Add(" ) ");
+ SQL.Add(" select :pJGBID,XLXSJGBYZZ0_XH ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×֣º01, 02, ... 20
+ SQL.Add(string.Format(",XLXSJGBYZZ0_YZZ{0}", num));
+
+ }
SQL.Add(" from XLXSJGBYZZ0 ");
SQL.Add(" where XLXSJGBYZZ0_JGBID=:pbeforeJGBID ");
SQL.ParamByName("pJGBID").Value = txtJGBID.Text.Trim();
@@ -802,11 +813,23 @@ namespace GThinking.N_XLXSBJ
dberp.ExecSQL(SQL);
//ͬ²½¸´ÖÆXLXSJGBYZZ0
+
SQL.Clear();
- SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,");
- SQL.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10)");
- SQL.Add(" select :pJGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05, ");
- SQL.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×֣º01, 02, ... 20
+ SQL.Add(string.Format(",XLXSJGBYZZ0_YZZ{0}", num));
+
+ }
+ SQL.Add(" ) ");
+ SQL.Add(" select :pJGBID,XLXSJGBYZZ0_XH ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×֣º01, 02, ... 20
+ SQL.Add(string.Format(",XLXSJGBYZZ0_YZZ{0}", num));
+
+ }
SQL.Add(" from XLXSJGBYZZ0 ");
SQL.Add(" where XLXSJGBYZZ0_JGBID=:pbeforeJGBID ");
SQL.ParamByName("pJGBID").Value = txtJGBID.Text.Trim();
diff --git a/MAC8.cs b/MAC8.cs
index 7f31c8d..6832f71 100644
--- a/MAC8.cs
+++ b/MAC8.cs
@@ -203,6 +203,7 @@ namespace GThinking.N_XLXSBJ
AddModuleInfo(100860165, 0, "按主芯截面范围调表价", "F", "TZYZJJBList.aspx");
AddModuleInfo(100860166, 0, "按产品特性调表价", "F", "TZYZJJCList.aspx");
//AddModuleInfo(100860167, 0, "线缆型号附加属性维护", "F", "XLXHCPTXWHList.aspx");
+ AddModuleInfo(100860173, 0, "按运距铜铝价区间维护运费比例", "F", "BJYF_TLJQJList.aspx");
}
}
diff --git a/N_XLXSBJA.csproj b/N_XLXSBJA.csproj
index 04eb285..63967df 100644
--- a/N_XLXSBJA.csproj
+++ b/N_XLXSBJA.csproj
@@ -1,4 +1,4 @@
-
+
Debug
AnyCPU
@@ -92,6 +92,9 @@
+
+
+
@@ -643,6 +646,29 @@
BJYFDRInfo.aspx
+
+
+ BJYF_TLJQJInfo.aspx
+ ASPXCodeBehind
+
+
+ BJYF_TLJQJInfo.aspx
+
+
+ BJYF_TLJQJList.aspx
+ ASPXCodeBehind
+
+
+ BJYF_TLJQJList.aspx
+
+
+ BJYF_TLJQJQuery.aspx
+ ASPXCodeBehind
+
+
+ BJYF_TLJQJQuery.aspx
+
+
BJYF_YZYJTJInfo.aspx
ASPXCodeBehind
diff --git a/N_XLXSBJA.suo b/N_XLXSBJA.suo
index f377c1741f3f72019f4fecfe8602ba2f59cf7e71..b45d073db52542a54c1c86eaa5af73a2b85211a3 100644
GIT binary patch
delta 1037
zcmZXTUr5tY6vuye{x-L{={BcZ=uGFd6;fL1B#kx|(>e1Wso5Xx|BDZm52XceXb}be
zI}!B~B0fYI2)}{_LJPy9my~+6|Mnt55AC6ZTHiD0Lv-Q8`FHQR_uPAKFf4*$G21Jr
z&MqaLudjF~k|as;?x6v>p5~1uR4mK%Q*M?`a8sn-tr1Y}Ni?9Y*9j|hIS~l3@(S?y
z6N|-EkerNlHKYc70$QL0>`#F-fYTrqqyhGmS2Gr1Wgi?KP!1YF6Q}@{paxWdTHpmd
zpQ(m^C}G2l%|Rb;u{#bzvfT{X3OYa=Xa_NBNlvfqf_4-f0bjr|a2)gi&U^y$Bsi6@
z&p@69K|qtqli~*Xw3lhjXR=t`p#WFS8}h(}_gd#fT3D9>Zzh(xdn${KW3oe~o-YhARykQkR
zHx{c)VTY;T<=2UHsQgCp5|g1s=$EUBUOI|2dtr^JXrLhef0SrJKt*z1ow!Nnat}q^
zL6V(8ifjcPi{x_J>0Gs)yj_v0BE2qz#ql<#-yR#~mMzL3c$a9|b<@X<5EqRx;k44E
zN2ai+ZoJ1jaky9MEx%=4VVRT^TI6JEMG@)~
zed>cqAA}%`OC@GxR6;KwGA;UI1@lx*q
zQ9k09bc4^AXX-O%c^G5Nvx7RMB6_4xr!+~TuTq&54L3~`SyUWiKtUbKA`Sb2CWQu^
zLW}^>{1{NciplIi2~2EvygvIVevLt6NYpdG*&@|D0I0F|H&RDde59~@*%!TeMn9%aItfmRFm9Qf5g
z4DIhPkEg-#L4K9GB6?`j9I1NzzWd88r+4ZEeucWyYh0zsKmk5l3){@`~m^7(an)D{H`=u@^0#C$C{|gID0!w}Tm7?J+it1#}L?CC7Zfc%x_S
zUym|oVAm;6eVV?YCvE2&=e!Whl3xvZFA)S)er4DbYsEhd`h
z@;B`s74MVtqP&t?lv0#XjLW_lE$72BkDca6OIRIBv>I(0VsRnHS|qfYwLrVkvq8IY
z*#eO^{f^Y-JG8WbY3o2EI0f24Ke!5Rf-!Ipj5DkyPQk?nRhr;fq;{i2!$m$~&=pG~
zpRt>dQoG4P`AO-jl)!8B&D6_(ry?%%X~$iWia+xh+_giL7f%iU7f~T9*o-y*8_`PV
z$+UUQegwFHh~_M~2JV1|V3M-UJ#RUEH?KOAD5RuW64sE|vQ3o(ZB
zCk4*E>`QVgBrz*_$~PKC`nG^=AOnaqEe1uSU6x(kOZP2a`l!>B-quP|m7T0PDU_D1
zrwNNYb_$P+?K=%-fY{P+z+0NCP9>@41DWkcoejU1d|(F!T=s8PL@0w_P-ZOz*W$}M
z-(RU8NQkDvY{?+9EB4GHSOPeW#fEN(9?%QUf%A01l1=*UDRNuRrAV?TSZS!rO!`c-
R>?yWt$(sC9?yGJM`w1$Uj1>R?
diff --git a/TZYZJJ2.cs b/TZYZJJ2.cs
index 6d60e3c..cd567c2 100644
--- a/TZYZJJ2.cs
+++ b/TZYZJJ2.cs
@@ -33,24 +33,22 @@ DeleteSql = " delete from XLXSJGBYZZ2 where XLXSJGBYZZ2_JGBID=:XLXSJGBYZZ2_JGBID
{
TSQL SQL = base.SetQuerySql();
SQL.Add("select XLXSBJCL_BJCLID,XLXSBJCL_BJCLMC,");
- SQL.Add("isnull(TZYZ_JZ01,0) as TZYZ_JZ01,isnull(TZYZ_JZ02,0) as TZYZ_JZ02,isnull(TZYZ_JZ03,0) as TZYZ_JZ03,");
- SQL.Add("isnull(TZYZ_JZ04,0) as TZYZ_JZ04,isnull(TZYZ_JZ05,0) as TZYZ_JZ05,isnull(TZYZ_JZ06,0) as TZYZ_JZ06,");
- SQL.Add("isnull(TZYZ_JZ07,0) as TZYZ_JZ07,isnull(TZYZ_JZ08,0) as TZYZ_JZ08,isnull(TZYZ_JZ09,0) as TZYZ_JZ09,");
- SQL.Add("isnull(TZYZ_JZ10,0) as TZYZ_JZ10 ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2");
+ SQL.Add(string.Format("isnull(TZYZ_JZ{0},0) as TZYZ_JZ{0}", num));
+ if (i < 20) SQL.Add(",");
+ }
SQL.Add(" from XLXSBJCL");
SQL.Add(" left join");
SQL.Add(" (");
SQL.Add(" select XLXSJGBYZZ2_BJCLID,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ01' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ01,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ02' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ02,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ03' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ03,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ04' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ04,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ05' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ05,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ06' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ06,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ07' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ07,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ08' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ08,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ09' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ09,");
- SQL.Add(" sum(case XLXSJGBYZZ2_YZID when 'JZ10' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ10 ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2");
+ SQL.Add(string.Format(" sum(case XLXSJGBYZZ2_YZID when 'JZ{0}' then XLXSJGBYZZ2_YZZ else 0 end) as TZYZ_JZ{0}", num));
+ if (i < 20) SQL.Add(",");
+ }
SQL.Add(" from XLXSJGBYZZ2");
SQL.Add(" where XLXSJGBYZZ2_JGBID=:pJGBID and XLXSJGBYZZ2_CPYT=:pCPYT and XLXSJGBYZZ2_DYDJFL=:pDYDJFL and XLXSJGBYZZ2_DTCLID=:pDTCLID ");
SQL.Add(" group by XLXSJGBYZZ2_BJCLID");
diff --git a/TZYZJJ2Info.aspx b/TZYZJJ2Info.aspx
index b218028..d7cdad4 100644
--- a/TZYZJJ2Info.aspx
+++ b/TZYZJJ2Info.aspx
@@ -87,6 +87,26 @@
Width="100px">
+
+
+
+
+
+
+
+
+
+
diff --git a/TZYZJJ2Info.aspx.cs b/TZYZJJ2Info.aspx.cs
index e474b05..c6fb069 100644
--- a/TZYZJJ2Info.aspx.cs
+++ b/TZYZJJ2Info.aspx.cs
@@ -349,91 +349,38 @@ namespace GThinking.N_XLXSBJ
private void InitGrdColumn()
{
- grdSHD.FindColumnByFieldName("TZYZ_JZ01").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ02").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ03").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ04").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ05").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ06").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ07").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ08").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ09").Visible = false;
- grdSHD.FindColumnByFieldName("TZYZ_JZ10").Visible = false;
+ for (int i = 1; i <= 20; i++)
+ {
+ string fieldName = "TZYZ_JZ" + i.ToString("D2");
+ gtAjaxGridViewColumn col = grdSHD.FindColumnByFieldName(fieldName);
+ if (col != null)
+ {
+ col.Visible = false;
+ }
+ }
string[] sTJYZList = PageParam.GetRTrimString("TJYZList").Split(',');
for (int i = 0; i < sTJYZList.Length; i++)
{
- if (sTJYZList[i].StartsWith("JZ01|"))
+ string item = sTJYZList[i];
+
+ // ¼ì²éÊǷñÒÔ "JZ" + Á½λÊý×Ö + "|" ¿ªͷ
+ if (item.Length >= 5 && item.StartsWith("JZ") && char.IsDigit(item[2]) && char.IsDigit(item[3]) && item[4] == '|')
{
- grdSHD.FindColumnByFieldName("TZYZ_JZ01").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ01").HeaderText = sTJYZList[i].Replace("JZ01|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ01").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ02|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ02").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ02").HeaderText = sTJYZList[i].Replace("JZ02|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ02").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ03|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ03").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ03").HeaderText = sTJYZList[i].Replace("JZ03|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ03").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ04|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ04").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ04").HeaderText = sTJYZList[i].Replace("JZ04|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ04").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ05|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ05").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ05").HeaderText = sTJYZList[i].Replace("JZ05|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ05").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ06|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ06").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ06").HeaderText = sTJYZList[i].Replace("JZ06|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ06").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ07|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ07").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ07").HeaderText = sTJYZList[i].Replace("JZ07|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ07").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ08|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ08").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ08").HeaderText = sTJYZList[i].Replace("JZ08|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ08").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ09|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ09").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ09").HeaderText = sTJYZList[i].Replace("JZ09|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ09").NumberDecimalPlace = 5;
- }
- else if (sTJYZList[i].StartsWith("JZ10|"))
- {
- grdSHD.FindColumnByFieldName("TZYZ_JZ10").Visible = true;
- grdSHD.FindColumnByFieldName("TZYZ_JZ10").HeaderText = sTJYZList[i].Replace("JZ10|", "");
- if (sTJYZList[i].EndsWith("(Ԫ)"))
- grdSHD.FindColumnByFieldName("TZYZ_JZ10").NumberDecimalPlace = 5;
+ string num = item.Substring(2, 2); // Ìáȡ "01" ~ "10"
+ string fieldName = "TZYZ_JZ" + num; // ¹¹ÔìÁÐÃû
+
+ gtAjaxGridViewColumn col = grdSHD.FindColumnByFieldName(fieldName);
+ if (col != null)
+ {
+ col.Visible = true;
+ col.HeaderText = item.Substring(5); // ȥµô "JZxx|" ǰ
+ if (item.EndsWith("(Ԫ)"))
+ col.NumberDecimalPlace = 5;
+ }
}
}
+
}
private void InsertXLXSJGBYZZ2(TDatabase dberp)
diff --git a/TZYZJJ2Info.aspx.designer.cs b/TZYZJJ2Info.aspx.designer.cs
index 3de99a2..7251ea0 100644
--- a/TZYZJJ2Info.aspx.designer.cs
+++ b/TZYZJJ2Info.aspx.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
-// 运行时版本:2.0.50727.9151
+// 运行时版本:2.0.50727.9179
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
diff --git a/TZYZJJ3Info.aspx b/TZYZJJ3Info.aspx
index ec814da..710c564 100644
--- a/TZYZJJ3Info.aspx
+++ b/TZYZJJ3Info.aspx
@@ -140,7 +140,96 @@
-
+
+
+ |
+ 调价因子11:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子12:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子13:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子14:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子15:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子16:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子17:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子18:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子19:
+ |
+
+
+ |
+
+
+
+ |
+ 调价因子20:
+ |
+
+
+ |
+
diff --git a/TZYZJJ3Info.aspx.cs b/TZYZJJ3Info.aspx.cs
index 520dabb..5fc0f2d 100644
--- a/TZYZJJ3Info.aspx.cs
+++ b/TZYZJJ3Info.aspx.cs
@@ -14,6 +14,7 @@ using GThinking.N_MODEL.Page;
using GThinking.N_MISPRO.Utility;
using GThinking.N_PUBLIC;
using GThinking.N_MODEL.Dialog;
+using GThinking.N_CONTROL;
namespace GThinking.N_XLXSBJ
{
@@ -86,64 +87,41 @@ namespace GThinking.N_XLXSBJ
datWHSJ.Enabled = false;
# region ¸øµ÷¼ÛÒò×ӿؼþÉèֻ¶ÁÐÔ
+
if (ControlState == TControlState.ctsInsert || ControlState == TControlState.ctsCopy || ControlState == TControlState.ctsEdit)
{
- txtTJYZ1.Enabled = false;
- txtTJYZ2.Enabled = false;
- txtTJYZ3.Enabled = false;
- txtTJYZ4.Enabled = false;
- txtTJYZ5.Enabled = false;
- txtTJYZ6.Enabled = false;
- txtTJYZ7.Enabled = false;
- txtTJYZ8.Enabled = false;
- txtTJYZ9.Enabled = false;
- txtTJYZ10.Enabled = false;
-
- string[] sTJYZList = PageParam.GetRTrimString("TJYZList").Split(',');
- for (int i = 0; i < sTJYZList.Length; i++)
+ // 1. ÏȽûÓÃËùÓÐ txtTJYZ1 ~ txtTJYZ10
+ for (int i = 1; i <= 20; i++)
{
- if (sTJYZList[i].StartsWith("JZ01|"))
+ gtNumTextBox txt = FindControl("txtTJYZ" + i) as gtNumTextBox;
+ if (txt != null)
{
- txtTJYZ1.Enabled = true;
+ txt.Enabled = false;
}
- else if (sTJYZList[i].StartsWith("JZ02|"))
+ }
+
+ // 2. ½âÎö TJYZList£¬ÆôÓÃƥÅäµĿؼþ
+ string[] sTJYZList = PageParam.GetRTrimString("TJYZList").Split(',');
+ foreach (string item in sTJYZList)
+ {
+ // ¼ì²é¸ñʽ£ºÒÔ "JZ" + Á½λÊý×Ö + "|" ¿ªͷ
+ if (item.Length >= 5 && item.StartsWith("JZ") && char.IsDigit(item[2]) && char.IsDigit(item[3]) && item[4] == '|')
{
- txtTJYZ2.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ03|"))
- {
- txtTJYZ3.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ04|"))
- {
- txtTJYZ4.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ05|"))
- {
- txtTJYZ5.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ06|"))
- {
- txtTJYZ6.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ07|"))
- {
- txtTJYZ7.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ08|"))
- {
- txtTJYZ8.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ09|"))
- {
- txtTJYZ9.Enabled = true;
- }
- else if (sTJYZList[i].StartsWith("JZ10|"))
- {
- txtTJYZ10.Enabled = true;
+ string numStr = item.Substring(2, 2); // Ìáȡ "01" ~ "10"
+ int index;
+ if (int.TryParse(numStr, out index))
+ {
+ // עÒâ¿ؼþID²»´øǰµ¼Á㣬Èç "txtTJYZ1"
+ gtNumTextBox txt = FindControl("txtTJYZ" + index) as gtNumTextBox;
+ if (txt != null)
+ {
+ txt.Enabled = true;
+ }
+ }
}
}
}
+
#endregion
}
@@ -192,26 +170,21 @@ namespace GThinking.N_XLXSBJ
double dYZZ = CMISproConvert.StrToFloat(ds.Tables[0].Rows[i]["XLXSJGBYZZ3_YZZ"].ToString().Trim());
if (PageParam.GetRTrimString("TJYZList").Contains(sYZID + "|"))
{
- if (sYZID.Equals("JZ01"))
- txtTJYZ1.Value = dYZZ;
- else if (sYZID.Equals("JZ02"))
- txtTJYZ2.Value = dYZZ;
- else if (sYZID.Equals("JZ03"))
- txtTJYZ3.Value = dYZZ;
- else if (sYZID.Equals("JZ04"))
- txtTJYZ4.Value = dYZZ;
- else if (sYZID.Equals("JZ05"))
- txtTJYZ5.Value = dYZZ;
- else if (sYZID.Equals("JZ06"))
- txtTJYZ6.Value = dYZZ;
- else if (sYZID.Equals("JZ07"))
- txtTJYZ7.Value = dYZZ;
- else if (sYZID.Equals("JZ08"))
- txtTJYZ8.Value = dYZZ;
- else if (sYZID.Equals("JZ09"))
- txtTJYZ9.Value = dYZZ;
- else if (sYZID.Equals("JZ10"))
- txtTJYZ10.Value = dYZZ;
+
+ if (sYZID.StartsWith("JZ") && sYZID.Length == 4) // ȷ±£¸ñʽΪ "JZ01" ~ "JZ10"
+ {
+ string numStr = sYZID.Substring(2, 2); // Ìáȡ "01" ~ "10"
+ int index;
+ if (int.TryParse(numStr, out index) )
+ {
+ // עÒâ¿ؼþID²»´øǰµ¼Á㣬Èç "txtTJYZ1"
+ gtNumTextBox txt = FindControl("txtTJYZ" + index) as gtNumTextBox;
+ if (txt != null)
+ {
+ txt.Value = dYZZ;
+ }
+ }
+ }
}
}
#endregion
@@ -306,65 +279,24 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("pWHRID").Value = tSession.UserId;
sql.ParamByName("pWHSJ").Value = tNow;
- if (sTJYZList[i].StartsWith("JZ01|"))
+ string item = sTJYZList[i];
+
+ // ¼ì²éÊǷñÒÔ "JZ" + Á½λÊý×Ö + "|" ¿ªͷ
+ if (item.Length >= 5 && item.StartsWith("JZ") && char.IsDigit(item[2]) && char.IsDigit(item[3]) && item[4] == '|')
{
- sql.ParamByName("pYZID").Value = "JZ01";
- sql.ParamByName("pYZZ").Value = txtTJYZ1.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ02|"))
- {
- sql.ParamByName("pYZID").Value = "JZ02";
- sql.ParamByName("pYZZ").Value = txtTJYZ2.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ03|"))
- {
- sql.ParamByName("pYZID").Value = "JZ03";
- sql.ParamByName("pYZZ").Value = txtTJYZ3.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ04|"))
- {
- sql.ParamByName("pYZID").Value = "JZ04";
- sql.ParamByName("pYZZ").Value = txtTJYZ4.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ05|"))
- {
- sql.ParamByName("pYZID").Value = "JZ05";
- sql.ParamByName("pYZZ").Value = txtTJYZ5.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ06|"))
- {
- sql.ParamByName("pYZID").Value = "JZ06";
- sql.ParamByName("pYZZ").Value = txtTJYZ6.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ07|"))
- {
- sql.ParamByName("pYZID").Value = "JZ07";
- sql.ParamByName("pYZZ").Value = txtTJYZ7.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ08|"))
- {
- sql.ParamByName("pYZID").Value = "JZ08";
- sql.ParamByName("pYZZ").Value = txtTJYZ8.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ09|"))
- {
- sql.ParamByName("pYZID").Value = "JZ09";
- sql.ParamByName("pYZZ").Value = txtTJYZ9.Value;
- dberp.ExecSQL(sql);
- }
- else if (sTJYZList[i].StartsWith("JZ10|"))
- {
- sql.ParamByName("pYZID").Value = "JZ10";
- sql.ParamByName("pYZZ").Value = txtTJYZ10.Value;
- dberp.ExecSQL(sql);
+ string numStr = item.Substring(2, 2); // Ìáȡ "01" ~ "10"
+ int index;
+ if (int.TryParse(numStr, out index) )
+ {
+ // ¶¯̬¹¹Ôì¿ؼþID£¨²»´øǰµ¼Á㣩
+ gtNumTextBox txt = FindControl("txtTJYZ" + index) as gtNumTextBox;
+ if (txt != null)
+ {
+ sql.ParamByName("pYZID").Value = "JZ" + numStr; // ±£³Ö "JZ01" ¸ñʽ
+ sql.ParamByName("pYZZ").Value = txt.Value;
+ dberp.ExecSQL(sql);
+ }
+ }
}
}
#endregion
@@ -404,45 +336,23 @@ namespace GThinking.N_XLXSBJ
string[] sTJYZList = PageParam.GetRTrimString("TJYZList").Split(',');
for (int i = 0; i < sTJYZList.Length; i++)
{
- if (sTJYZList[i].StartsWith("JZ01|"))
+ string item = sTJYZList[i];
+
+ // ¼ì²é¸ñʽ£ºÒÔ "JZ" + Á½λÊý×Ö + "|" ¿ªͷ
+ if (item.Length >= 5 && item.StartsWith("JZ") && char.IsDigit(item[2]) && char.IsDigit(item[3]) && item[4] == '|')
{
- lblTJYZ1.Text = sTJYZList[i].Replace("JZ01|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ02|"))
- {
- lblTJYZ2.Text = sTJYZList[i].Replace("JZ02|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ03|"))
- {
- lblTJYZ3.Text = sTJYZList[i].Replace("JZ03|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ04|"))
- {
- lblTJYZ4.Text = sTJYZList[i].Replace("JZ04|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ05|"))
- {
- lblTJYZ5.Text = sTJYZList[i].Replace("JZ05|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ06|"))
- {
- lblTJYZ6.Text = sTJYZList[i].Replace("JZ06|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ07|"))
- {
- lblTJYZ7.Text = sTJYZList[i].Replace("JZ07|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ08|"))
- {
- lblTJYZ8.Text = sTJYZList[i].Replace("JZ08|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ09|"))
- {
- lblTJYZ9.Text = sTJYZList[i].Replace("JZ09|", "") + "£º";
- }
- else if (sTJYZList[i].StartsWith("JZ10|"))
- {
- lblTJYZ10.Text = sTJYZList[i].Replace("JZ10|", "") + "£º";
+ string numStr = item.Substring(2, 2); // Ìáȡ "01" ~ "10"
+ int index;
+ if (int.TryParse(numStr, out index))
+ {
+ // ¶¯̬¹¹Ôì¿ؼþID£¨²»´øǰµ¼Á㣩
+ gtLabel lbl = FindControl("lblTJYZ" + index) as gtLabel;
+ if (lbl != null)
+ {
+ // ȥµô "JZxx|" ǰ£¬¼ÓÉÏ "£º"
+ lbl.Text = item.Substring(5) + "£º";
+ }
+ }
}
}
}
diff --git a/TZYZJJ3Info.aspx.designer.cs b/TZYZJJ3Info.aspx.designer.cs
index c11d5ba..78d9dd6 100644
--- a/TZYZJJ3Info.aspx.designer.cs
+++ b/TZYZJJ3Info.aspx.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
-// 运行时版本:2.0.50727.9151
+// 运行时版本:2.0.50727.9179
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@@ -271,6 +271,186 @@ namespace GThinking.N_XLXSBJ {
///
protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ10;
+ ///
+ /// lblTJYZ11 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ11;
+
+ ///
+ /// txtTJYZ11 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ11;
+
+ ///
+ /// lblTJYZ12 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ12;
+
+ ///
+ /// txtTJYZ12 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ12;
+
+ ///
+ /// lblTJYZ13 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ13;
+
+ ///
+ /// txtTJYZ13 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ13;
+
+ ///
+ /// lblTJYZ14 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ14;
+
+ ///
+ /// txtTJYZ14 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ14;
+
+ ///
+ /// lblTJYZ15 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ15;
+
+ ///
+ /// txtTJYZ15 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ15;
+
+ ///
+ /// lblTJYZ16 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ16;
+
+ ///
+ /// txtTJYZ16 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ16;
+
+ ///
+ /// lblTJYZ17 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ17;
+
+ ///
+ /// txtTJYZ17 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ17;
+
+ ///
+ /// lblTJYZ18 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ18;
+
+ ///
+ /// txtTJYZ18 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ18;
+
+ ///
+ /// lblTJYZ19 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ19;
+
+ ///
+ /// txtTJYZ19 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ19;
+
+ ///
+ /// lblTJYZ20 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtLabel lblTJYZ20;
+
+ ///
+ /// txtTJYZ20 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::GThinking.N_CONTROL.gtNumTextBox txtTJYZ20;
+
///
/// GtLabel5 控件。
///
diff --git a/XLBJDCalcUtils.cs b/XLBJDCalcUtils.cs
index c312091..f3abff3 100644
--- a/XLBJDCalcUtils.cs
+++ b/XLBJDCalcUtils.cs
@@ -4643,8 +4643,18 @@ namespace GThinking.N_XLXSBJ
dberp.ExecSQL(SQL);
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 V_XSBJJSJGB_BJDID,V_XSBJJSJGB_BJDXH,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),V_XSBJJSJGB_JGBYSJDZ ");
+ string sYZZFields_1 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_1 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("insert into XLXSBJDJJYZ(XLXSBJDJJYZ_BJDID, XLXSBJDJJYZ_XH, " + sYZZFields_1 + ",XLXSBJDJJYZ_YSJDZ) ");
+ string sYZZFields_2 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_2 += "isnull(XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + ",0)" + (i < 20 ? "," : "");
+ }
+ SQL.Add("select V_XSBJJSJGB_BJDID,V_XSBJJSJGB_BJDXH," + sYZZFields_2 + ",V_XSBJJSJGB_JGBYSJDZ ");
SQL.Add(" from V_XSBJJSJGB");
SQL.Add(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID=:pJGBID and XLXSJGBYZZ0_XH=V_XSBJJSJGB_SYJGBXH");
SQL.Add(" where V_XSBJJSJGB_ID=:pID and V_XSBJJSJGB_BJDID=:pBJDID ");
@@ -4692,10 +4702,20 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into V_XSBJJSJGB tar ");
SQL.Add(" using ( ");
- SQL.Add("select BJDID,BJDXH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10 ");
+ string sYZZFields_3 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_3 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select BJDID,BJDXH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ," + sYZZFields_3 + " ");
SQL.Add(" from ");
SQL.Add("(");
- SQL.Add(" select XLXSBJDJJYZ_BJDID as BJDID,XLXSBJDJJYZ_XH as BJDXH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,");
+ string sYZZFields_4 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_4 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" select XLXSBJDJJYZ_BJDID as BJDID,XLXSBJDJJYZ_XH as BJDXH," + sYZZFields_4 + ",");
SQL.Add(" (");
SQL.Add(string.Format("XLXSBJDJJYZ_YZZ{0}", dsJGBYZ.Tables[0].Rows[0]["XLXSJGBYZ_YZID"].ToString().Trim().Replace("JZ", "")));
@@ -4925,10 +4945,20 @@ namespace GThinking.N_XLXSBJ
//¼۸ñ±íµ÷¼ÛÒòËØ3£¬ֱ½ÓʹÓü۸ñ±íµ÷¼ÛÒò×Óֵ
if (!sJGBIDS.Equals(""))
{
-
+
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 V_XSBJJSJGB_BJDID,V_XSBJJSJGB_BJDXH,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),V_XSBJJSJGB_JGBYSJDZ ");
+ string sYZZFields_5 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_5 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("insert into XLXSBJDJJYZ(XLXSBJDJJYZ_BJDID, XLXSBJDJJYZ_XH, " + sYZZFields_5 + ",XLXSBJDJJYZ_YSJDZ) ");
+ string sYZZFields_6 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_6 += "isnull(XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + ",0)" + (i < 20 ? "," : "");
+ }
+ SQL.Add("select V_XSBJJSJGB_BJDID,V_XSBJJSJGB_BJDXH," + sYZZFields_6 + ",V_XSBJJSJGB_JGBYSJDZ ");
SQL.Add(" from V_XSBJJSJGB");
SQL.Add(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID=:pJGBID3 and XLXSJGBYZZ0_XH=V_XSBJJSJGB_SYJGBXH");
SQL.Add(" where V_XSBJJSJGB_ID=:pID and V_XSBJJSJGB_BJDID=:pBJDID and V_XSBJJSJGB_SYJGBID=:pJGBID1");
@@ -5529,7 +5559,7 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" and V_XSBJJSJGB_WGCPBZ<>'Y' and V_XSBJJSJGB_JGFBZ<>'Y' ");
SQL.Add(" and XLXSTZYZ_MXBH='JZJ' and XLXSTZYZ_YZID=:pYZID");
SQL.Add(" and XLXSTZYZ_TJYS='A' and XLXSJGBYZZA_JGBID=XLXSTZYZ_JGBID and XLXSJGBYZZA_YZID=XLXSTZYZ_YZID ");
- SQL.Add(" and XLXSCPML_CPMLIDS like '%'||rtrim(case when A.XLXSBJTJXHML_CPMLID is null then B.XLXSBJTJXHML_CPMLID else A.XLXSBJTJXHML_CPMLID end)||'%' and XLXSJGBYZZA_XLGGID=convert(char,XLDTJMZHB_DTJM1) ");
+ SQL.Add(" and XLXSCPML_CPMLIDS like '%'||rtrim(case when A.XLXSBJTJXHML_CPMLID is null then B.XLXSBJTJXHML_CPMLID else A.XLXSBJTJXHML_CPMLID end)||'%' and CONVERT(float,XLXSJGBYZZA_XLGGID)=XLDTJMZHB_DTJM1 ");
SQL.Add(" ) sor ");
SQL.Add(" on( ");
SQL.Add(" XLXSBJDJJYZ_BJDID=:pBJDID and XLXSBJDJJYZ_XH=BJDXH ");
@@ -5604,7 +5634,10 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" select V_XSBJJSJGB_BJDID as BJDID,V_XSBJJSJGB_BJDXH as BJDXH");
SQL.Add(string.Format(",ISNULL(SUM(XLXSJGBYZZC_YZZ) ,0) as YZZ{0}", sTJYZ[i].Trim().Replace("JZ", "")));
SQL.Add(" from V_XSBJJSJGB ");
- SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=V_XSBJJSJGB_XLXHID and XLXSBJCPYS_DYDJID=V_XSBJJSJGB_DYDJID ");
+ SQL.Add(" left join XLXHB on XLXHB_XLXHID=V_XSBJJSJGB_XLXHID ");
+ SQL.Add(" left join XLGGB on XLGGB_XLGGID = REPLACE(V_XSBJJSJGB_XLGGID , '*','¡Á') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
+ SQL.Add(" left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
+ SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=V_XSBJJSJGB_XLXHID and XLXSBJCPYS_DYDJID=V_XSBJJSJGB_DYDJID and XLDTJMZHB_DTJM1=CONVERT(float,XLXSBJCPYS_XLYSID) ");
SQL.Add(" ,XLXSTZYZ,XLXSJGBYZZC ");
SQL.Add(" where V_XSBJJSJGB_ID=:pID ");
SQL.Add(" and V_XSBJJSJGB_BJDID=:pBJDID");
diff --git a/XLBJDInfo.aspx.cs b/XLBJDInfo.aspx.cs
index 1a3ccbf..9ac248f 100644
--- a/XLBJDInfo.aspx.cs
+++ b/XLBJDInfo.aspx.cs
@@ -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)//若存在有材料用量、无材料价格的情况,则算出的表价、报价单行情料价改为负数显示
{
diff --git a/XLBJDUtils.cs b/XLBJDUtils.cs
index 26a925f..5462c2d 100644
--- a/XLBJDUtils.cs
+++ b/XLBJDUtils.cs
@@ -2976,7 +2976,7 @@ namespace GThinking.N_XLXSBJ
return dicYZZB;
}
- public static Dictionary GetJGBYZZC(string sJGEJGBID, string sXLXHID, string sDYDJID)
+ public static Dictionary GetJGBYZZC(string sJGEJGBID, string sXLXHID, string sDYDJID,string sZXJM)
{
Dictionary dicYZZC = new Dictionary();
dicYZZC.Clear();
@@ -2986,10 +2986,11 @@ namespace GThinking.N_XLXSBJ
sql.Add(" from XLXSJGBYZZC,XLXSTZYZ ");
sql.Add(" where XLXSTZYZ_JGBID=XLXSJGBYZZC_JGBID and XLXSTZYZ_YZID=XLXSJGBYZZC_YZID and XLXSTZYZ_MXBH='JZJ'");
sql.Add(" and exists(select 1 from XLXSJGBYZ where XLXSJGBYZ_JGBID =:pJGEJGBID and XLXSJGBYZ_YZID = XLXSTZYZ_YZID)");
- sql.Add(" and exists(select 1 from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID=:pXLXHID and XLXSBJCPYS_DYDJID=:pDYDJID and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX )");
+ sql.Add(" and exists(select 1 from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID=:pXLXHID and XLXSBJCPYS_DYDJID=:pDYDJID and XLXSBJCPYS_XLYSID=:pZXJM and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX )");
sql.ParamByName("pJGEJGBID").Value = sJGEJGBID;
sql.ParamByName("pXLXHID").Value = sXLXHID;
sql.ParamByName("pDYDJID").Value = sDYDJID;
+ sql.ParamByName("pZXJM").Value = sZXJM;
DataSet ds = dberp.OpenDataSet(sql);
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -7955,8 +7956,12 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" XLXSBJDYZZ0_YZZ16,XLXSBJDYZZ0_YZZ17,XLXSBJDYZZ0_YZZ18,XLXSBJDYZZ0_YZZ19,XLXSBJDYZZ0_YZZ20 ");
if (sMXBH.Equals("JGE"))
{
- SQL.Add(" ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
- SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10");
+ string sYZZFields_1 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_1 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" ," + sYZZFields_1);
}
SQL.Add(" from XLXSBJDMX ");
@@ -8176,8 +8181,12 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" XLXSBJDYZZ0_YZZ16,XLXSBJDYZZ0_YZZ17,XLXSBJDYZZ0_YZZ18,XLXSBJDYZZ0_YZZ19,XLXSBJDYZZ0_YZZ20 ");
if (sMXBH.Equals("JGE"))
{
- SQL.Add(" ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
- SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10");
+ string sYZZFields_2 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_2 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" ," + sYZZFields_2);
}
SQL.Add(" from XLXSBJDMX ");
@@ -8505,8 +8514,12 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" XLXSBJDYZZ0_YZZ16,XLXSBJDYZZ0_YZZ17,XLXSBJDYZZ0_YZZ18,XLXSBJDYZZ0_YZZ19,XLXSBJDYZZ0_YZZ20 ");
if (sMXBH.Equals("JGE"))
{
- SQL.Add(" ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
- SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10");
+ string sYZZFields_3 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_3 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" ," + sYZZFields_3);
}
SQL.Add(" from XLXSBJDMX ");
@@ -8716,7 +8729,7 @@ namespace GThinking.N_XLXSBJ
{
string[] strJJYZZ = sUpdJJYZList.ToString().Trim().Split('|');
sJSJGS = sJSJGS.Replace("JZ01", strJJYZZ[0]).Replace("JZ02", strJJYZZ[1]).Replace("JZ03", strJJYZZ[2]).Replace("JZ04", strJJYZZ[3]).Replace("JZ05", strJJYZZ[4]);
- sJSJGS = sJSJGS.Replace("JZ06", strJJYZZ[5]).Replace("JZ07", strJJYZZ[6]).Replace("JZ08", strJJYZZ[7]).Replace("JZ09", strJJYZZ[8]).Replace("JZ10", strJJYZZ[9]);
+ sJSJGS = sJSJGS.Replace("JZ06", strJJYZZ[5]).Replace("JZ07", strJJYZZ[6]).Replace("JZ08", strJJYZZ[7]).Replace("JZ09", strJJYZZ[8]).Replace("JZ10", strJJYZZ[9]).Replace("JZ11", strJJYZZ[10]).Replace("JZ12", strJJYZZ[11]).Replace("JZ13", strJJYZZ[12]).Replace("JZ14", strJJYZZ[13]).Replace("JZ15", strJJYZZ[14]).Replace("JZ16", strJJYZZ[15]).Replace("JZ17", strJJYZZ[16]).Replace("JZ18", strJJYZZ[17]).Replace("JZ19", strJJYZZ[18]).Replace("JZ20", strJJYZZ[19]);
}
double dJSJ = 0;
gtExpression exp = new gtExpression();
@@ -9665,8 +9678,12 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" XLXSBJDYZZ0_YZZ16,XLXSBJDYZZ0_YZZ17,XLXSBJDYZZ0_YZZ18,XLXSBJDYZZ0_YZZ19,XLXSBJDYZZ0_YZZ20 ");
if (sMXBH.Equals("JGE"))
{
- SQL.Add(" ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05, ");
- SQL.Add(" XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10");
+ string sYZZFields_4 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_4 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" ," + sYZZFields_4);
}
SQL.Add(" from XLXSBJDMX ");
@@ -10630,7 +10647,7 @@ namespace GThinking.N_XLXSBJ
Dictionary dicYZZC = new Dictionary();
if (!sTJYSListC.Equals(""))
{
- dicYZZC = XLBJDUtils.GetJGBYZZC(sJGEJGBID, dicXLJBXX["XLXHID"], dicXLJBXX["DYDJID"]);
+ dicYZZC = XLBJDUtils.GetJGBYZZC(sJGEJGBID, dicXLJBXX["XLXHID"], dicXLJBXX["DYDJID"], fZXJM);
}
foreach (string sYZID in dicYZZ0.Keys)
@@ -10944,7 +10961,12 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into XLXSBJDMX tar ");
SQL.Add(" using ( ");
- SQL.Add("select XLXSBJDJJYZ_BJDID AS BJDID,XLXSBJDJJYZ_XH AS XH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10 ");
+ string sYZZFields_5 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_5 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select XLXSBJDJJYZ_BJDID AS BJDID,XLXSBJDJJYZ_XH AS XH," + sYZZFields_5 + " ");
SQL.Add(" from XLXSBJDJJYZ");
SQL.Add(" where 1 = 1 and XLXSBJDJJYZ_BJDID = :pBJDID ");
if (!dicXLJBXX["XH"].Trim().Equals(""))
@@ -11915,7 +11937,12 @@ namespace GThinking.N_XLXSBJ
//ȡ¼۸ñ±íÒò×Óֵ£¬ºóÐøÓÃÓڸüб¨¼۵¥Ã÷ϸUpdJJYZListÀ¸Ŀ
SQL.Clear();
- SQL.Add("select XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10");
+ string sYZZFields_6 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_6 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select " + sYZZFields_6);
SQL.Add(" from XLXSJGBYZZ0");
SQL.Add(" where XLXSJGBYZZ0_JGBID=:pJGBID3 and XLXSJGBYZZ0_XH=:pJGBXH1");
SQL.ParamByName("pJGBID3").Value = sJGBID;
@@ -11932,7 +11959,7 @@ namespace GThinking.N_XLXSBJ
dicJJYZList.Add("JZ07", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ07"].ToString(), 0));
dicJJYZList.Add("JZ08", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ08"].ToString(), 0));
dicJJYZList.Add("JZ09", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ09"].ToString(), 0));
- dicJJYZList.Add("JZ10", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ10"].ToString(), 0));
+ dicJJYZList.Add("JZ10", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ10"].ToString(), 0)); dicJJYZList.Add("JZ11", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ11"].ToString(), 0)); dicJJYZList.Add("JZ12", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ12"].ToString(), 0)); dicJJYZList.Add("JZ13", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ13"].ToString(), 0)); dicJJYZList.Add("JZ14", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ14"].ToString(), 0)); dicJJYZList.Add("JZ15", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ15"].ToString(), 0)); dicJJYZList.Add("JZ16", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ16"].ToString(), 0)); dicJJYZList.Add("JZ17", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ17"].ToString(), 0)); dicJJYZList.Add("JZ18", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ18"].ToString(), 0)); dicJJYZList.Add("JZ19", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ19"].ToString(), 0)); dicJJYZList.Add("JZ20", CMISproConvert.StrToFloat(dsJJYZ.Tables[0].Rows[0]["XLXSJGBYZZ0_YZZ20"].ToString(), 0));
dicJJYZList.Add("YSJDZ", CMISproConvert.StrToFloat(sYSJDZ, 0));
}
else
@@ -11946,7 +11973,7 @@ namespace GThinking.N_XLXSBJ
dicJJYZList.Add("JZ07", 0);
dicJJYZList.Add("JZ08", 0);
dicJJYZList.Add("JZ09", 0);
- dicJJYZList.Add("JZ10", 0);
+ dicJJYZList.Add("JZ10", 0); dicJJYZList.Add("JZ11", 0); dicJJYZList.Add("JZ12", 0); dicJJYZList.Add("JZ13", 0); dicJJYZList.Add("JZ14", 0); dicJJYZList.Add("JZ15", 0); dicJJYZList.Add("JZ16", 0); dicJJYZList.Add("JZ17", 0); dicJJYZList.Add("JZ18", 0); dicJJYZList.Add("JZ19", 0); dicJJYZList.Add("JZ20", 0);
dicJJYZList.Add("YSJDZ", CMISproConvert.StrToFloat(sYSJDZ, 0));
}
}
@@ -12068,7 +12095,7 @@ namespace GThinking.N_XLXSBJ
dicJJYZList_JGE.Add("JZ07", 0);
dicJJYZList_JGE.Add("JZ08", 0);
dicJJYZList_JGE.Add("JZ09", 0);
- dicJJYZList_JGE.Add("JZ10", 0);
+ dicJJYZList_JGE.Add("JZ10", 0); dicJJYZList_JGE.Add("JZ11", 0); dicJJYZList_JGE.Add("JZ12", 0); dicJJYZList_JGE.Add("JZ13", 0); dicJJYZList_JGE.Add("JZ14", 0); dicJJYZList_JGE.Add("JZ15", 0); dicJJYZList_JGE.Add("JZ16", 0); dicJJYZList_JGE.Add("JZ17", 0); dicJJYZList_JGE.Add("JZ18", 0); dicJJYZList_JGE.Add("JZ19", 0); dicJJYZList_JGE.Add("JZ20", 0);
}
string sCPJJ = "";
@@ -12470,7 +12497,7 @@ namespace GThinking.N_XLXSBJ
dicJJYZList_JGE["JZ07"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ07"], 0);
dicJJYZList_JGE["JZ08"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ08"], 0);
dicJJYZList_JGE["JZ09"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ09"], 0);
- dicJJYZList_JGE["JZ10"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ10"], 0);
+ dicJJYZList_JGE["JZ10"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ10"], 0); dicJJYZList_JGE["JZ11"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ11"], 0); dicJJYZList_JGE["JZ12"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ12"], 0); dicJJYZList_JGE["JZ13"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ13"], 0); dicJJYZList_JGE["JZ14"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ14"], 0); dicJJYZList_JGE["JZ15"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ15"], 0); dicJJYZList_JGE["JZ16"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ16"], 0); dicJJYZList_JGE["JZ17"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ17"], 0); dicJJYZList_JGE["JZ18"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ18"], 0); dicJJYZList_JGE["JZ19"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ19"], 0); dicJJYZList_JGE["JZ20"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ20"], 0);
}
if (JgIsZero)//Èô´æÔÚÓвÄÁÏÓÃÁ¿¡¢ÎÄÁϼ۸ñµÄÇé¿ö£¬ÔòËã³öµıí¼ۡ¢±¨¼۵¥ÐÐÇéÁϼ۸ÄΪ¸ºÊýÏÔʾ
@@ -12796,7 +12823,7 @@ namespace GThinking.N_XLXSBJ
{
string[] strJJYZZ = sUpdJJYZList.ToString().Trim().Split('|');
sZDXJGS = sZDXJGS.Replace("JZ01", strJJYZZ[0]).Replace("JZ02", strJJYZZ[1]).Replace("JZ03", strJJYZZ[2]).Replace("JZ04", strJJYZZ[3]).Replace("JZ05", strJJYZZ[4]);
- sZDXJGS = sZDXJGS.Replace("JZ06", strJJYZZ[5]).Replace("JZ07", strJJYZZ[6]).Replace("JZ08", strJJYZZ[7]).Replace("JZ09", strJJYZZ[8]).Replace("JZ10", strJJYZZ[9]);
+ sZDXJGS = sZDXJGS.Replace("JZ06", strJJYZZ[5]).Replace("JZ07", strJJYZZ[6]).Replace("JZ08", strJJYZZ[7]).Replace("JZ09", strJJYZZ[8]).Replace("JZ10", strJJYZZ[9]).Replace("JZ11", strJJYZZ[10]).Replace("JZ12", strJJYZZ[11]).Replace("JZ13", strJJYZZ[12]).Replace("JZ14", strJJYZZ[13]).Replace("JZ15", strJJYZZ[14]).Replace("JZ16", strJJYZZ[15]).Replace("JZ17", strJJYZZ[16]).Replace("JZ18", strJJYZZ[17]).Replace("JZ19", strJJYZZ[18]).Replace("JZ20", strJJYZZ[19]);
}
double dZDXJ = 0;
gtExpression exp = new gtExpression();
@@ -18114,7 +18141,7 @@ namespace GThinking.N_XLXSBJ
Result.Add("JZ07", 0);
Result.Add("JZ08", 0);
Result.Add("JZ09", 0);
- Result.Add("JZ10", 0);
+ Result.Add("JZ10", 0); Result.Add("JZ11", 0); Result.Add("JZ12", 0); Result.Add("JZ13", 0); Result.Add("JZ14", 0); Result.Add("JZ15", 0); Result.Add("JZ16", 0); Result.Add("JZ17", 0); Result.Add("JZ18", 0); Result.Add("JZ19", 0); Result.Add("JZ20", 0);
}
if (XLBJDUtils.IsJGFJGBMX(sBJRQ, sXLXHID, sXLGGID, sXLBZID, sDYDJID))
@@ -18498,7 +18525,7 @@ namespace GThinking.N_XLXSBJ
Result["JZ07"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ07"], 0);
Result["JZ08"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ08"], 0);
Result["JZ09"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ09"], 0);
- Result["JZ10"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ10"], 0);
+ Result["JZ10"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ10"], 0); Result["JZ11"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ11"], 0); Result["JZ12"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ12"], 0); Result["JZ13"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ13"], 0); Result["JZ14"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ14"], 0); Result["JZ15"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ15"], 0); Result["JZ16"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ16"], 0); Result["JZ17"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ17"], 0); Result["JZ18"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ18"], 0); Result["JZ19"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ19"], 0); Result["JZ20"] = CMISproConvert.StrToFloat(dicJGBTZYZGS_JGE["JZ20"], 0);
}
if (JgIsZero)//Èô´æÔÚÓвÄÁÏÓÃÁ¿¡¢ÎÄÁϼ۸ñµÄÇé¿ö£¬ÔòËã³öµıí¼ۡ¢±¨¼۵¥ÐÐÇéÁϼ۸ÄΪ¸ºÊýÏÔʾ
diff --git a/XLBJD_BDOBill.cs b/XLBJD_BDOBill.cs
index c282d6a..b554f07 100644
--- a/XLBJD_BDOBill.cs
+++ b/XLBJD_BDOBill.cs
@@ -3458,10 +3458,16 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" case when ((ISNULL(XLXSBJYLZD_WPID,' ')= '0060' or ISNULL(XLXSBJYLZD_WPID,' ')= 'ZZZZ') and isnull(XLXSBJYLZDMX_BZDBZ,'N') ='Y' and isnull(XLXSBJYLZDMX_BJDXH,0) <> 0) then 'N' ");
SQL.Add(" when (ISNULL(XLXSBJYLZD_WPID,' ')<> ' ' and isnull(XLXSBJYLZDMX_BJDXH,0) <> 0) then 'Y' ");
SQL.Add(" else 'N' end as HasYLDZSQ, ");
- SQL.Add(" case when isnull(XLXSJGB_MXBH,' ')='JGB' then ' ' else rtrim(convert(char,XLXSBJDJJYZ_YZZ01))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ02))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ03))");
- SQL.Add(" ||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ04))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ05))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ06))");
- SQL.Add(" ||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ07))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ08))||'|'||rtrim(convert(char,XLXSBJDJJYZ_YZZ09))");
- SQL.Add(" ||'|'||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,");
+ SQL.Add(" case when isnull(XLXSJGB_MXBH,' ')='JGB' then ' ' else ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2"); // ¸ñʽ»¯ΪÁ½λÊý×Ö "04", "05", ...
+ string fieldName = "XLXSBJDJJYZ_YZZ" + num;
+ if(i>1)
+ SQL.Add(" ||'|'|| ");
+ SQL.Add(" rtrim(convert(char," + fieldName + ")) ");
+ }
+ SQL.Add(" ||'|'||rtrim(convert(char,XLXSBJDJJYZ_YSJDZ)) end as UpdJJYZList,XLXSBJDMX_BJLY,XLXSBJDMX_BJTJCZ,case when isnull(XLXSBJDMXFD_BJDID,' ') = ' ' then 'N' else 'Y' end as HasFDJL,");
SQL.Add(" XLXSBJDMX_DZSC,XLXSBJDMX_BJDHQCLCBTZ,XLXSBJDMX_ZDXJBJDID,XLXSBJDMX_ZDXJBJDXH,XLXSBJDMX_XDXLBZID,XLXSBJDMX_XDXLXHID,XLXSBJDMX_JGBBJTZ,isnull(XLXSBJBZTXS_TXS,' ') as BZTXYS,XLXSBJDMX_JGFBZ, ");
if (!_sBZBJDIDFilter.Equals(""))
{
@@ -4047,8 +4053,8 @@ namespace GThinking.N_XLXSBJ
string[] strJJYZZ = GetField("UpdJJYZList").ToString().Trim().Split('|');
sql.Clear();
sql.Add("insert into XLXSBJDJJYZ(XLXSBJDJJYZ_BJDID,XLXSBJDJJYZ_XH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,");
- sql.Add(" XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,XLXSBJDJJYZ_YSJDZ)");
- sql.Add(" values(:pBJDID,:pBJDXH,:pYZZ01,:pYZZ02,:pYZZ03,:pYZZ04,:pYZZ05,:pYZZ06,:pYZZ07,:pYZZ08,:pYZZ09,:pYZZ10,:pYSJDZ)");
+ sql.Add(" XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,XLXSBJDJJYZ_YZZ11,XLXSBJDJJYZ_YZZ12,XLXSBJDJJYZ_YZZ13,XLXSBJDJJYZ_YZZ14,XLXSBJDJJYZ_YZZ15,XLXSBJDJJYZ_YZZ16,XLXSBJDJJYZ_YZZ17,XLXSBJDJJYZ_YZZ18,XLXSBJDJJYZ_YZZ19,XLXSBJDJJYZ_YZZ20,XLXSBJDJJYZ_YSJDZ)");
+ sql.Add(" values(:pBJDID,:pBJDXH,:pYZZ01,:pYZZ02,:pYZZ03,:pYZZ04,:pYZZ05,:pYZZ06,:pYZZ07,:pYZZ08,:pYZZ09,:pYZZ10,:pYZZ11,:pYZZ12,:pYZZ13,:pYZZ14,:pYZZ15,:pYZZ16,:pYZZ17,:pYZZ18,:pYZZ19,:pYZZ20,:pYSJDZ)");
sql.ParamByName("pBJDID").Value = _BJDID;
sql.ParamByName("pBJDXH").Value = GetField("XLXSBJDMX_XH");
sql.ParamByName("pYZZ01").Value = CMISproConvert.StrToFloat(strJJYZZ[0], 0);
@@ -4061,7 +4067,17 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("pYZZ08").Value = CMISproConvert.StrToFloat(strJJYZZ[7], 0);
sql.ParamByName("pYZZ09").Value = CMISproConvert.StrToFloat(strJJYZZ[8], 0);
sql.ParamByName("pYZZ10").Value = CMISproConvert.StrToFloat(strJJYZZ[9], 0);
- sql.ParamByName("pYSJDZ").Value = CMISproConvert.StrToFloat(strJJYZZ[10], 0);
+ sql.ParamByName("pYZZ11").Value = CMISproConvert.StrToFloat(strJJYZZ[10], 0);
+ sql.ParamByName("pYZZ12").Value = CMISproConvert.StrToFloat(strJJYZZ[11], 0);
+ sql.ParamByName("pYZZ13").Value = CMISproConvert.StrToFloat(strJJYZZ[12], 0);
+ sql.ParamByName("pYZZ14").Value = CMISproConvert.StrToFloat(strJJYZZ[13], 0);
+ sql.ParamByName("pYZZ15").Value = CMISproConvert.StrToFloat(strJJYZZ[14], 0);
+ sql.ParamByName("pYZZ16").Value = CMISproConvert.StrToFloat(strJJYZZ[15], 0);
+ sql.ParamByName("pYZZ17").Value = CMISproConvert.StrToFloat(strJJYZZ[16], 0);
+ sql.ParamByName("pYZZ18").Value = CMISproConvert.StrToFloat(strJJYZZ[17], 0);
+ sql.ParamByName("pYZZ19").Value = CMISproConvert.StrToFloat(strJJYZZ[18], 0);
+ sql.ParamByName("pYZZ20").Value = CMISproConvert.StrToFloat(strJJYZZ[19], 0);
+ sql.ParamByName("pYSJDZ").Value = CMISproConvert.StrToFloat(strJJYZZ[20], 0);
dberp.ExecSQL(sql);
}
@@ -4257,7 +4273,7 @@ namespace GThinking.N_XLXSBJ
string[] strJJYZZ = GetField("UpdJJYZList").ToString().Trim().Split('|');
sql.Clear();
sql.Add("update XLXSBJDJJYZ set XLXSBJDJJYZ_XH=:pBJDXH,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,XLXSBJDJJYZ_YSJDZ=:pYSJDZ ");
+ 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,XLXSBJDJJYZ_YSJDZ=:pYSJDZ ");
sql.Add(" where XLXSBJDJJYZ_BJDID=:pBJDID and XLXSBJDJJYZ_XH=:OLD_XLXSBJDMX_XH");
sql.ParamByName("pBJDID").Value = _BJDID;
sql.ParamByName("OLD_XLXSBJDMX_XH").Value = GetField("OLD_XLXSBJDMX_XH");
@@ -4272,7 +4288,17 @@ namespace GThinking.N_XLXSBJ
sql.ParamByName("pYZZ08").Value = CMISproConvert.StrToFloat(strJJYZZ[7], 0);
sql.ParamByName("pYZZ09").Value = CMISproConvert.StrToFloat(strJJYZZ[8], 0);
sql.ParamByName("pYZZ10").Value = CMISproConvert.StrToFloat(strJJYZZ[9], 0);
- sql.ParamByName("pYSJDZ").Value = CMISproConvert.StrToFloat(strJJYZZ[10], 0);
+ sql.ParamByName("pYZZ11").Value = CMISproConvert.StrToFloat(strJJYZZ[10], 0);
+ sql.ParamByName("pYZZ12").Value = CMISproConvert.StrToFloat(strJJYZZ[11], 0);
+ sql.ParamByName("pYZZ13").Value = CMISproConvert.StrToFloat(strJJYZZ[12], 0);
+ sql.ParamByName("pYZZ14").Value = CMISproConvert.StrToFloat(strJJYZZ[13], 0);
+ sql.ParamByName("pYZZ15").Value = CMISproConvert.StrToFloat(strJJYZZ[14], 0);
+ sql.ParamByName("pYZZ16").Value = CMISproConvert.StrToFloat(strJJYZZ[15], 0);
+ sql.ParamByName("pYZZ17").Value = CMISproConvert.StrToFloat(strJJYZZ[16], 0);
+ sql.ParamByName("pYZZ18").Value = CMISproConvert.StrToFloat(strJJYZZ[17], 0);
+ sql.ParamByName("pYZZ19").Value = CMISproConvert.StrToFloat(strJJYZZ[18], 0);
+ sql.ParamByName("pYZZ20").Value = CMISproConvert.StrToFloat(strJJYZZ[19], 0);
+ sql.ParamByName("pYSJDZ").Value = CMISproConvert.StrToFloat(strJJYZZ[20], 0);
dberp.ExecSQL(sql);
}
diff --git a/XLBJD_CLCBInfo.aspx.cs b/XLBJD_CLCBInfo.aspx.cs
index 5d37d85..e9b0e12 100644
--- a/XLBJD_CLCBInfo.aspx.cs
+++ b/XLBJD_CLCBInfo.aspx.cs
@@ -230,27 +230,19 @@ namespace GThinking.N_XLXSBJ
if (bZSBJZC)
{
strSQL.AppendLine(",round(XLXSBJDJJYZ_YZZ01*100*100/81.2655989526499/71.3980341706337,6) as SCRGF ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ01 as TZYZ_JZ01 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ02 as TZYZ_JZ02 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ03 as TZYZ_JZ03 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ04 as TZYZ_JZ04 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ05 as TZYZ_JZ05 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ06 as TZYZ_JZ06 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ07 as TZYZ_JZ07 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ08 as TZYZ_JZ08 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ09 as TZYZ_JZ09 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ10 as TZYZ_JZ10 ");
+ string sYZZFields_1 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_1 += ",XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + " as TZYZ_JZ" + i.ToString().PadLeft(2, '0') + " ";
+ }
+ strSQL.AppendLine(sYZZFields_1);
+
dt1.Columns.Add("SCRGF", typeof(double));
- dt1.Columns.Add("TZYZ_JZ01", typeof(double));
- dt1.Columns.Add("TZYZ_JZ02", typeof(double));
- dt1.Columns.Add("TZYZ_JZ03", typeof(double));
- dt1.Columns.Add("TZYZ_JZ04", typeof(double));
- dt1.Columns.Add("TZYZ_JZ05", typeof(double));
- dt1.Columns.Add("TZYZ_JZ06", typeof(double));
- dt1.Columns.Add("TZYZ_JZ07", typeof(double));
- dt1.Columns.Add("TZYZ_JZ08", typeof(double));
- dt1.Columns.Add("TZYZ_JZ09", typeof(double));
- dt1.Columns.Add("TZYZ_JZ10", typeof(double));
+ for (int i = 1; i <= 20; i++)
+ {
+ string colName = "TZYZ_JZ" + i.ToString("D2");
+ dt1.Columns.Add(colName, typeof(double));
+ }
SQL.Clear();
SQL.Add("select XLXSTZYZ_YZID, XLXSTZYZ_YZMC,XLXSTZYZ_JJFS ");
SQL.Add(" from XLXSTZYZ");
@@ -554,16 +546,12 @@ namespace GThinking.N_XLXSBJ
if (bZSBJZC)
{
dtrow["SCRGF"] = CMISproConvert.StrToFloat(towQry["SCRGF"].ToString().Trim());
- dtrow["TZYZ_JZ01"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ01"].ToString().Trim());
- dtrow["TZYZ_JZ02"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ02"].ToString().Trim());
- dtrow["TZYZ_JZ03"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ03"].ToString().Trim());
- dtrow["TZYZ_JZ04"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ04"].ToString().Trim());
- dtrow["TZYZ_JZ05"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ05"].ToString().Trim());
- dtrow["TZYZ_JZ06"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ06"].ToString().Trim());
- dtrow["TZYZ_JZ07"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ07"].ToString().Trim());
- dtrow["TZYZ_JZ08"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ08"].ToString().Trim());
- dtrow["TZYZ_JZ09"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ09"].ToString().Trim());
- dtrow["TZYZ_JZ10"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ10"].ToString().Trim());
+ for (int i = 1; i <= 20; i++)
+ {
+ string colName = "TZYZ_JZ" + i.ToString("D2");
+ object value = towQry[colName]; // »ñȡԭʼֵ
+ dtrow[colName] = CMISproConvert.StrToFloat(value.ToString().Trim());
+ }
}
if (bXSFBJYY)
@@ -1194,27 +1182,17 @@ namespace GThinking.N_XLXSBJ
if (bZSBJZC)
{
strSQL.AppendLine(",round(XLXSBJDJJYZ_YZZ01*100*100/81.2655989526499/71.3980341706337,6) as SCRGF ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ01 as TZYZ_JZ01 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ02 as TZYZ_JZ02 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ03 as TZYZ_JZ03 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ04 as TZYZ_JZ04 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ05 as TZYZ_JZ05 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ06 as TZYZ_JZ06 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ07 as TZYZ_JZ07 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ08 as TZYZ_JZ08 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ09 as TZYZ_JZ09 ");
- strSQL.AppendLine(",XLXSBJDJJYZ_YZZ10 as TZYZ_JZ10 ");
+ for (int i = 1; i <= 20; i++)
+ {
+ string num = i.ToString("D2");
+ strSQL.AppendLine(",XLXSBJDJJYZ_YZZ" + num + " as TZYZ_JZ" + num + " ");
+ }
dt1.Columns.Add("SCRGF", typeof(double));
- dt1.Columns.Add("TZYZ_JZ01", typeof(double));
- dt1.Columns.Add("TZYZ_JZ02", typeof(double));
- dt1.Columns.Add("TZYZ_JZ03", typeof(double));
- dt1.Columns.Add("TZYZ_JZ04", typeof(double));
- dt1.Columns.Add("TZYZ_JZ05", typeof(double));
- dt1.Columns.Add("TZYZ_JZ06", typeof(double));
- dt1.Columns.Add("TZYZ_JZ07", typeof(double));
- dt1.Columns.Add("TZYZ_JZ08", typeof(double));
- dt1.Columns.Add("TZYZ_JZ09", typeof(double));
- dt1.Columns.Add("TZYZ_JZ10", typeof(double));
+ for (int i = 1; i <= 20; i++)
+ {
+ string colName = "TZYZ_JZ" + i.ToString("D2");
+ dt1.Columns.Add(colName, typeof(double));
+ }
SQL.Clear();
SQL.Add("select XLXSTZYZ_YZID, XLXSTZYZ_YZMC,XLXSTZYZ_JJFS ");
SQL.Add(" from XLXSTZYZ");
@@ -1423,16 +1401,11 @@ namespace GThinking.N_XLXSBJ
if (bZSBJZC)
{
dtrow["SCRGF"] = CMISproConvert.StrToFloat(towQry["SCRGF"].ToString().Trim());
- dtrow["TZYZ_JZ01"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ01"].ToString().Trim());
- dtrow["TZYZ_JZ02"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ02"].ToString().Trim());
- dtrow["TZYZ_JZ03"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ03"].ToString().Trim());
- dtrow["TZYZ_JZ04"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ04"].ToString().Trim());
- dtrow["TZYZ_JZ05"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ05"].ToString().Trim());
- dtrow["TZYZ_JZ06"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ06"].ToString().Trim());
- dtrow["TZYZ_JZ07"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ07"].ToString().Trim());
- dtrow["TZYZ_JZ08"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ08"].ToString().Trim());
- dtrow["TZYZ_JZ09"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ09"].ToString().Trim());
- dtrow["TZYZ_JZ10"] = CMISproConvert.StrToFloat(towQry["TZYZ_JZ10"].ToString().Trim());
+ for (int i = 1; i <= 20; i++)
+ {
+ string col = "TZYZ_JZ" + i.ToString("D2");
+ dtrow[col] = CMISproConvert.StrToFloat(towQry[col].ToString().Trim());
+ }
}
if (bXSFBJYY)
@@ -2332,10 +2305,20 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into V_XSBJJSJGB tar ");
SQL.Add(" using ( ");
- SQL.Add("select BJDID,BJDXH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10 ");
+ string sYZZFields_3 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_3 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select BJDID,BJDXH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ," + sYZZFields_3 + " ");
SQL.Add(" from ");
SQL.Add("(");
- SQL.Add(" select XLXSBJDJJYZ_BJDID as BJDID,XLXSBJDJJYZ_XH as BJDXH,XLXSBJDJJYZ_YZZ01,XLXSBJDJJYZ_YZZ02,XLXSBJDJJYZ_YZZ03,XLXSBJDJJYZ_YZZ04,XLXSBJDJJYZ_YZZ05,XLXSBJDJJYZ_YZZ06,XLXSBJDJJYZ_YZZ07,XLXSBJDJJYZ_YZZ08,XLXSBJDJJYZ_YZZ09,XLXSBJDJJYZ_YZZ10,");
+ string sYZZFields_4 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_4 += "XLXSBJDJJYZ_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" select XLXSBJDJJYZ_BJDID as BJDID,XLXSBJDJJYZ_XH as BJDXH," + sYZZFields_4 + ",");
SQL.Add(" (");
SQL.Add(string.Format("XLXSBJDJJYZ_YZZ{0}", dsJGBYZ.Tables[0].Rows[0]["XLXSJGBYZ_YZID"].ToString().Trim().Replace("JZ", "")));
diff --git a/XLJGB_CLJGTZList.aspx.cs b/XLJGB_CLJGTZList.aspx.cs
index 526e8d2..56e0c46 100644
--- a/XLJGB_CLJGTZList.aspx.cs
+++ b/XLJGB_CLJGTZList.aspx.cs
@@ -3413,14 +3413,24 @@ namespace GThinking.N_XLXSBJ
SQL.Clear();
SQL.Add(" merge into XLXSJGBMX tar ");
SQL.Add(" using ( ");
- SQL.Add("select JGBID,XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ string sYZZFields_1 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_1 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select JGBID,XH," + sYZZFields_1 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
SQL.Add(",JSYCBZ");
//if (dicJGBFGQCPYZ.Count > 0)
// SQL.Add(",JGBTJYZYCBZ");
SQL.Add(" from ");
SQL.Add("(");
- SQL.Add(" select XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ string sYZZFields_2 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_2 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" select XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH," + sYZZFields_2 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
{
SQL.Add(" , case ");
@@ -5135,7 +5145,11 @@ namespace GThinking.N_XLXSBJ
SQL.Add(string.Format(",SUM(XLXSJGBYZZC_YZZ) as YZZ{0},:pTIMESTAMP,:pWHR,:pWHRID,:pWHSJ", sTJYZ[i].Trim().Replace("JZ", "")));
SQL.Add(" from XLXSJGBMX ");
- SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
+ SQL.Add("left join XLXHB on XLXHB_XLXHID=XLXSJGBMX_XLXHID ");
+ SQL.Add("left join XLXSBJXLGGTHB XLXSBJXLGGTHB_JGB10 on XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGID=XLXSJGBMX_XLGGID ");
+ SQL.Add("left join XLGGB on XLGGB_XLGGID = isnull(XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGIDCH,' ') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
+ SQL.Add("left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
+ SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID and CONVERT(float,XLXSBJCPYS_XLYSID)=XLDTJMZHB_DTJM1 ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");
@@ -6248,20 +6262,30 @@ namespace GThinking.N_XLXSBJ
*/
Dictionary dicJGBTJYZ = XLBJDInfo.GetJGBBTYZ(sJGBID);
Dictionary dicJGBFGQCPYZ = XLBJDInfo.GetJGBFGQCPYZ(sJGBID);
-
+
SQL.Clear();
SQL.Add(" merge into XLXSJGBMX tar ");
SQL.Add(" using ( ");
- SQL.Add("select XLXSCLQD_CLZL,JGBID,XH," + sJDSQL + " as JDYZZ," + sKDSQL + " as KDYZZ," + sJJSQL + " as JJYZZ," + sSXSQL + " as SXYZZ");
+ string sYZZFields_3 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_3 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add("select XLXSCLQD_CLZL,JGBID,XH," + sYZZFields_3 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
SQL.Add(",JSYCBZ");
//if (dicJGBFGQCPYZ.Count > 0)
// SQL.Add(",JGBTJYZYCBZ");
SQL.Add(" from ");
SQL.Add("(");
- SQL.Add(" select isnull(XLXSCLQD_CLZL,0) as XLXSCLQD_CLZL,XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH ,");
+ string sYZZFields_4 = "";
+ for (int i = 1; i <= 20; i++)
+ {
+ sYZZFields_4 += "XLXSJGBYZZ0_YZZ" + i.ToString().PadLeft(2, '0') + (i < 20 ? "," : "");
+ }
+ SQL.Add(" select isnull(XLXSCLQD_CLZL,0) as XLXSCLQD_CLZL,XLXSJGBYZZ0_JGBID as JGBID,XLXSJGBYZZ0_XH as XH," + sYZZFields_4 + " ");
if (dicJGBTJYZ.Count > 0 || dicJGBFGQCPYZ.Count > 0)
{
SQL.Add("case ");
@@ -8671,7 +8695,11 @@ namespace GThinking.N_XLXSBJ
SQL.Add(string.Format(",SUM(XLXSJGBYZZC_YZZ) as YZZ{0},:pTIMESTAMP,:pWHR,:pWHRID,:pWHSJ", sTJYZ[i].Trim().Replace("JZ", "")));
SQL.Add(" from XLXSJGBMX ");
- SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID ");
+ SQL.Add("left join XLXHB on XLXHB_XLXHID=XLXSJGBMX_XLXHID ");
+ SQL.Add("left join XLXSBJXLGGTHB XLXSBJXLGGTHB_JGB10 on XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGID=XLXSJGBMX_XLGGID ");
+ SQL.Add("left join XLGGB on XLGGB_XLGGID = isnull(XLXSBJXLGGTHB_JGB10.XLXSBJXLGGTHB_XLGGIDCH,' ') and XLGGB_XLGGJDGZ = isnull(XLXHB_XLGGJDGZ,'0') ");
+ SQL.Add("left join XLDTJMZHB on XLDTJMZHB_DTJMZHID=XLGGB_DTJMZHID ");
+ SQL.Add(" LEFT JOIN XLXSBJCPYS ON XLXSBJCPYS_XLJBXHID=XLXSJGBMX_XLXHID and XLXSBJCPYS_DYDJID=XLXSJGBMX_DYDJID and CONVERT(float,XLXSBJCPYS_XLYSID)=XLDTJMZHB_DTJM1 ");
if (!sJGCZBID.Trim().Equals(""))
{
SQL.Add(" left join XLXSCLQD on XLXSCLQD_XLXHID=XLXSJGBMX_XLXHID and XLXSCLQD_XLGGID=XLXSJGBMX_XLGGID and XLXSCLQD_DYDJID=XLXSJGBMX_DYDJID ");
diff --git a/XLJGB_JGBMX.cs b/XLJGB_JGBMX.cs
index be77d24..e76fcef 100644
--- a/XLJGB_JGBMX.cs
+++ b/XLJGB_JGBMX.cs
@@ -372,7 +372,7 @@ namespace GThinking.N_XLXSBJ
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL sql = new TSQL(dberp);
sql.Add("select XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,");
- sql.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ sql.Add(" XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10,XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15,XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20 ");
sql.Add(" from XLXSJGBYZZ0 where XLXSJGBYZZ0_JGBID=:pJGBID and XLXSJGBYZZ0_XH=:pXH ");
sql.ParamByName("pJGBID").Value = sJGBID;
sql.ParamByName("pXH").Value = dXH;
diff --git a/XLJGB_JGBMXInfo.aspx.cs b/XLJGB_JGBMXInfo.aspx.cs
index 6dcd2fe..24d9082 100644
--- a/XLJGB_JGBMXInfo.aspx.cs
+++ b/XLJGB_JGBMXInfo.aspx.cs
@@ -685,6 +685,16 @@ namespace GThinking.N_XLXSBJ
XLJGB_JGBMX.SetValueToCtls("JZ08", 0, divTZYZ.Controls);
XLJGB_JGBMX.SetValueToCtls("JZ09", 0, divTZYZ.Controls);
XLJGB_JGBMX.SetValueToCtls("JZ10", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ11", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ12", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ13", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ14", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ15", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ16", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ17", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ18", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ19", 0, divTZYZ.Controls);
+ XLJGB_JGBMX.SetValueToCtls("JZ20", 0, divTZYZ.Controls);
}
_txt_TextChanged(null, null);
diff --git a/XLJGB_JGBMXList.aspx.cs b/XLJGB_JGBMXList.aspx.cs
index 86ee8c8..eed1380 100644
--- a/XLJGB_JGBMXList.aspx.cs
+++ b/XLJGB_JGBMXList.aspx.cs
@@ -615,7 +615,7 @@ namespace GThinking.N_XLXSBJ
// sSQL.AppendLine(string.Format(",TZYZ_{0}", sYZIDs[i].Trim()));
//}
sSQL.AppendLine(" ,XLXSJGBYZZ0_YZZ01 as TZYZ_JZ01,XLXSJGBYZZ0_YZZ02 as TZYZ_JZ02,XLXSJGBYZZ0_YZZ03 as TZYZ_JZ03,XLXSJGBYZZ0_YZZ04 as TZYZ_JZ04,XLXSJGBYZZ0_YZZ05 as TZYZ_JZ05 ");
- sSQL.AppendLine(" ,XLXSJGBYZZ0_YZZ06 as TZYZ_JZ06,XLXSJGBYZZ0_YZZ07 as TZYZ_JZ07,XLXSJGBYZZ0_YZZ08 as TZYZ_JZ08,XLXSJGBYZZ0_YZZ09 as TZYZ_JZ09,XLXSJGBYZZ0_YZZ10 as TZYZ_JZ10 ");
+ sSQL.AppendLine(" ,XLXSJGBYZZ0_YZZ06 as TZYZ_JZ06,XLXSJGBYZZ0_YZZ07 as TZYZ_JZ07,XLXSJGBYZZ0_YZZ08 as TZYZ_JZ08,XLXSJGBYZZ0_YZZ09 as TZYZ_JZ09,XLXSJGBYZZ0_YZZ10 as TZYZ_JZ10,XLXSJGBYZZ0_YZZ11 as TZYZ_JZ11,XLXSJGBYZZ0_YZZ12 as TZYZ_JZ12,XLXSJGBYZZ0_YZZ13 as TZYZ_JZ13,XLXSJGBYZZ0_YZZ14 as TZYZ_JZ14,XLXSJGBYZZ0_YZZ15 as TZYZ_JZ15,XLXSJGBYZZ0_YZZ16 as TZYZ_JZ16,XLXSJGBYZZ0_YZZ17 as TZYZ_JZ17,XLXSJGBYZZ0_YZZ18 as TZYZ_JZ18,XLXSJGBYZZ0_YZZ19 as TZYZ_JZ19,XLXSJGBYZZ0_YZZ20 as TZYZ_JZ20 ");
sSQL.AppendLine(" from XLXSJGBMX ");
sSQL.AppendLine(" left join XLXSBJXLGGTHB XLXSBJXLGGTHB_Q on XLXSBJXLGGTHB_Q.XLXSBJXLGGTHB_XLGGID = XLXSJGBMX_XLGGID ");
@@ -2299,8 +2299,10 @@ namespace GThinking.N_XLXSBJ
XLBJDUtils.SyncXLXSBJXLGGTHB_ByXLXSJGBMX_Batch(dberp, CMISproSessionManager.GetCurrentSession(), sJGBID);
SQL.Clear();
- SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10) ");
+ SQL.Add("insert into XLXSJGBYZZ0(XLXSJGBYZZ0_JGBID,XLXSJGBYZZ0_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ SQL.Add(" ,XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15,XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20)");
SQL.Add(" select XLXSJGBMX_JGBID,XLXSJGBMX_XH,XLXSJGBYZZ0_YZZ01,XLXSJGBYZZ0_YZZ02,XLXSJGBYZZ0_YZZ03,XLXSJGBYZZ0_YZZ04,XLXSJGBYZZ0_YZZ05,XLXSJGBYZZ0_YZZ06,XLXSJGBYZZ0_YZZ07,XLXSJGBYZZ0_YZZ08,XLXSJGBYZZ0_YZZ09,XLXSJGBYZZ0_YZZ10 ");
+ SQL.Add(" ,XLXSJGBYZZ0_YZZ11,XLXSJGBYZZ0_YZZ12,XLXSJGBYZZ0_YZZ13,XLXSJGBYZZ0_YZZ14,XLXSJGBYZZ0_YZZ15,XLXSJGBYZZ0_YZZ16,XLXSJGBYZZ0_YZZ17,XLXSJGBYZZ0_YZZ18,XLXSJGBYZZ0_YZZ19,XLXSJGBYZZ0_YZZ20");
SQL.Add(" from XLXSJGBMX ");
SQL.Add(" left join XLXSJGBYZZ0 on XLXSJGBYZZ0_JGBID= XLXSJGBMX_JGBID and XLXSJGBYZZ0_XH=XLXSJGBMX_SYXH ");
SQL.Add(" where XLXSJGBMX_JGBID=:pJGBID and XLXSJGBMX_SYXH>0 ");
@@ -3916,7 +3918,7 @@ namespace GThinking.N_XLXSBJ
SQL.Add(" :pYXQS as XLXSJGBMX_YXQS,");
SQL.Add(" :pYXQZ as XLXSJGBMX_YXQZ, ");
SQL.Add(" round(XLXSJGBYZZ0_YZZ01*100*100/81.2655989526499/71.3980341706337,6) as SCRGF,XLXSJGBYZZ0_YZZ01 as TZYZ_JZ01,XLXSJGBYZZ0_YZZ02 as TZYZ_JZ02,XLXSJGBYZZ0_YZZ03 as TZYZ_JZ03,XLXSJGBYZZ0_YZZ04 as TZYZ_JZ04,XLXSJGBYZZ0_YZZ05 as TZYZ_JZ05 ");
- SQL.Add(" ,XLXSJGBYZZ0_YZZ06 as TZYZ_JZ06,XLXSJGBYZZ0_YZZ07 as TZYZ_JZ07,XLXSJGBYZZ0_YZZ08 as TZYZ_JZ08,XLXSJGBYZZ0_YZZ09 as TZYZ_JZ09,XLXSJGBYZZ0_YZZ10 as TZYZ_JZ10, ");
+ SQL.Add(" ,XLXSJGBYZZ0_YZZ06 as TZYZ_JZ06,XLXSJGBYZZ0_YZZ07 as TZYZ_JZ07,XLXSJGBYZZ0_YZZ08 as TZYZ_JZ08,XLXSJGBYZZ0_YZZ09 as TZYZ_JZ09,XLXSJGBYZZ0_YZZ10 as TZYZ_JZ10,XLXSJGBYZZ0_YZZ11 as TZYZ_JZ11,XLXSJGBYZZ0_YZZ12 as TZYZ_JZ12,XLXSJGBYZZ0_YZZ13 as TZYZ_JZ13,XLXSJGBYZZ0_YZZ14 as TZYZ_JZ14,XLXSJGBYZZ0_YZZ15 as TZYZ_JZ15,XLXSJGBYZZ0_YZZ16 as TZYZ_JZ16,XLXSJGBYZZ0_YZZ17 as TZYZ_JZ17,XLXSJGBYZZ0_YZZ18 as TZYZ_JZ18,XLXSJGBYZZ0_YZZ19 as TZYZ_JZ19,XLXSJGBYZZ0_YZZ20 as TZYZ_JZ20, ");
if (sBJU018.Equals("Y"))
{
SQL.Add(" case when XLXSJGBMX_WSJJM <> 0 then XLXSJGBMX_WSJJM else XLXSJGBMX_WSJJ end as XLXSJGBMX_WSJJ,");
diff --git a/XLXHCPTXWHList.aspx b/XLXHCPTXWHList.aspx
index 4fd2f2e..bcf0249 100644
--- a/XLXHCPTXWHList.aspx
+++ b/XLXHCPTXWHList.aspx
@@ -25,6 +25,10 @@ CodeBehind="XLXHCPTXWHList.aspx.cs" Inherits="GThinking.N_XLXSBJ.XLXHCPTXWHList"
+
+
+
+
@@ -36,6 +40,8 @@ CodeBehind="XLXHCPTXWHList.aspx.cs" Inherits="GThinking.N_XLXSBJ.XLXHCPTXWHList"
+
+
diff --git a/XLXHCPTXWHList.aspx.cs b/XLXHCPTXWHList.aspx.cs
index 74e8b12..e35294f 100644
--- a/XLXHCPTXWHList.aspx.cs
+++ b/XLXHCPTXWHList.aspx.cs
@@ -76,11 +76,11 @@ namespace GThinking.N_XLXSBJ
protected override void BeforeDelete(TDatabase db, ref bool ActionIsDone)
{
- entity.EntityTable.DeleteSql = " delete from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID=:XLXSBJCPYS_XLJBXHID and XLXSBJCPYS_DYDJID =:XLXSBJCPYS_DYDJID and XLXSBJCPYS_XXJGID =:XLXSBJCPYS_XXJGID";
+ entity.EntityTable.DeleteSql = " delete from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID=:XLXSBJCPYS_XLJBXHID and XLXSBJCPYS_DYDJID =:XLXSBJCPYS_DYDJID and XLXSBJCPYS_XXJGID =:XLXSBJCPYS_XXJGID and XLXSBJCPYS_XLYSID=:XLXSBJCPYS_XLYSID ";
entity.Param.Add("XLXSBJCPYS_XLJBXHID", this.ContentGrid.SelectedDataKey["XLXSBJCPYS_XLJBXHID"].ToString().Trim());
entity.Param.Add("XLXSBJCPYS_DYDJID", this.ContentGrid.SelectedDataKey["XLXSBJCPYS_DYDJID"].ToString().Trim());
entity.Param.Add("XLXSBJCPYS_XXJGID", this.ContentGrid.SelectedDataKey["XLXSBJCPYS_XXJGID"].ToString().Trim());
-
+ entity.Param.Add("XLXSBJCPYS_XLYSID", this.ContentGrid.SelectedDataKey["XLXSBJCPYS_XLYSID"].ToString().Trim());
base.BeforeDelete(db, ref ActionIsDone);
}
@@ -91,7 +91,7 @@ namespace GThinking.N_XLXSBJ
private string GetSql()
{
StringBuilder strSQL = new StringBuilder();
- strSQL.AppendLine(" select XLXSBJCPYS_DYDJID, XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_XXJGID ");
+ strSQL.AppendLine(" select XLXSBJCPYS_DYDJID, XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_XXJGID,XLXSBJCPYS_XLYSID ");
strSQL.AppendLine(" from XLXSBJCPYS ");
strSQL.AppendLine(" where 1=1 ");
@@ -100,7 +100,7 @@ namespace GThinking.N_XLXSBJ
strSQL.AppendLine(" and XLXSBJCPYS_XLJBXHID = :pXLXHID ");
entity.Param.Add("pXLXHID", CurQueryEntity.FieldByName("XLXHID").Value.Trim());
}
- strSQL.AppendLine(" order by XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID");
+ strSQL.AppendLine(" order by XLXSBJCPYS_XLJBXHID,XLXSBJCPYS_XLYSID,XLXSBJCPYS_DYDJID,XLXSBJCPYS_XXJGID ");
return strSQL.ToString();
}
diff --git a/obj/Debug/N_XLXSBJA.dll b/obj/Debug/N_XLXSBJA.dll
index 73758b8a865531934b37f3efe1d9d72f2c62cc1d..9f3174dfcdecc051aeed2d20542ed41be899d0ce 100644
GIT binary patch
delta 2064711
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