From 482297e58362bcc5fd3ba3df81453f18cbd2ec72 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 18 十月 2024 13:18:14 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2 +-
/dev/null | 26 --------------------------
WebTM/views/grf/返工流转卡 - A5.grf | 4 ++--
3 files changed, 3 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/grf/\350\277\224\345\267\245\346\265\201\350\275\254\345\215\241 - A5.grf" "b/WebTM/views/grf/\350\277\224\345\267\245\346\265\201\350\275\254\345\215\241 - A5.grf"
index 24f9405..78c8a9d 100644
--- "a/WebTM/views/grf/\350\277\224\345\267\245\346\265\201\350\275\254\345\215\241 - A5.grf"
+++ "b/WebTM/views/grf/\350\277\224\345\267\245\346\265\201\350\275\254\345\215\241 - A5.grf"
@@ -92,7 +92,7 @@
"Name":"鐢熶骇璁㈠崟鏁伴噺"
},
{
- "Name":"宸叉眹鎶ユ暟閲�"
+ "Name":"鍑虹珯鍏宠仈鏁伴噺"
}
]
},
@@ -198,7 +198,7 @@
},
{
"Column":"Column17",
- "DataField":"宸叉眹鎶ユ暟閲�"
+ "DataField":"鍑虹珯鍏宠仈鏁伴噺"
},
{
"Column":"Column12",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index b1f44af..08bc323 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰,a.杈呮暟閲�2,a.HAuxUnit2,a.杈呭姪鍗曚綅2,b.HRelationQty_Out 宸叉眹鎶ユ暟閲� from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","select 1");
+ SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰,a.杈呮暟閲�2,a.HAuxUnit2,a.杈呭姪鍗曚綅2,b.鍑虹珯鍏宠仈鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs"
deleted file mode 100644
index bff9a95..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘�//------------------------------------------------------------------------------
-// <鑷姩鐢熸垚>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
-// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
-// </鑷姩鐢熸垚>
-//------------------------------------------------------------------------------
-
-namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
-{
-
-
- public partial class xmlLBM_QC_TakeSampleCheckBillMainList
- {
-
- /// <summary>
- /// form1 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
- }
-}
--
Gitblit v1.9.1