From 61da3d9a79c0be2257a6f78b939bcd5e63e91e74 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期三, 01 九月 2021 20:01:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/Sc_ProcessExchangeBillQuery.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
index c963755..3ffcfdc 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
@@ -605,17 +605,22 @@
                 Report.FieldByName("娴佽浆鍗℃暟閲�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("娴佽浆鍗℃暟閲�")].Value);
                 Report.FieldByName("浜у搧浠g爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧浠g爜")].Value);
                 Report.FieldByName("浜у搧鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧鍚嶇О")].Value);
-                Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+                Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧瑙勬牸")].Value);
                 Report.FieldByName("璁″垝寮�宸ユ棩鏈�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝寮�宸ユ棩鏈�")].Value);
                 Report.FieldByName("璁″垝瀹屽伐鏃ユ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝瀹屽伐鏃ユ湡")].Value);
                 Report.FieldByName("璁㈠崟璺熻釜鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁㈠崟璺熻釜鍙�")].Value);
                 Report.FieldByName("鍘熸枡鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍘熸枡鎵规")].Value);
                 Report.FieldByName("妯″叿璁惧").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("妯″叿璁惧")].Value);
                 Report.FieldByName("椤圭洰鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("椤圭洰鍙�")].Value);
+                Report.FieldByName("鍥惧彿鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍥惧彿鐗堟湰")].Value);
+                Report.FieldByName("鎬昏鍥惧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎬昏鍥惧彿")].Value);
+                Report.FieldByName("鏉愯川").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉愯川")].Value);
+                Report.FieldByName("鎴愬搧缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎴愬搧缂栧彿")].Value);
+                Report.FieldByName("鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗堟湰")].Value);
             }
             catch (Exception e)
             {
-                MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗$紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠g爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]." + e.Message);
+                MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗$紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠g爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]锛孾鍥惧彿鐗堟湰]锛孾鎬昏鍥惧彿]锛孾鏉愯川]锛孾鎴愬搧缂栧彿]锛孾鐗堟湰]." + e.Message);
             }
         }
 

--
Gitblit v1.9.1