From 1948124877478db58b27841f9398aed97ef13053 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期日, 26 十月 2025 17:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 116 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 25 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index c4c4fac..d60529d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -8,6 +8,7 @@
using gregn6Lib;
using Pub_Class;
using System.Threading;
+using System.Globalization;
namespace WarM
{
@@ -64,9 +65,10 @@
public const Int16 HEXPPERIODCol = 43;
public const Int16 HLSHCol = 44;
public const Int16 HBaNoCol = 45;
+ public const Int16 HCusModelCol = 46;
//
public string ModName = "85";
- public string ModCaption = "娴疆瀹㈡埛鏍囩鐢熸垚";
+ public string ModCaption = "娴疆銆佸厓鑴戙�侀『杈惧鎴锋爣绛剧敓鎴�";
public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_LangChao";
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -78,13 +80,15 @@
public int selectRow = 0;
public Int64 HInterID = 0; //鍐呯爜
public Int64 HOrgID = ClsPub.HOrgID;
- public string HCusModel = "Z"; //鍘傚晢浠ｇ爜
+ public string HCS = "Z"; //鍘傚晢浠ｇ爜
public string sDate = ""; //鏃ユ湡
public string sYear = ""; //骞达紙2浣嶏級
public string sYear4 = ""; //骞达紙4浣嶏級
public string sPeriod = ""; //鏈�
public string sPeriod2 = ""; //鏈堬紙姝ｅ父锛�
public string sDay = ""; //鏃�
+ public string sWeek = ""; //鍛�
+ public string sYearWeek = ""; //骞达紙2浣嶏級鍛紙2浣嶏級
#region 鍥哄畾浠ｇ爜
@@ -460,6 +464,12 @@
sPeriod2 = sPeriod.Substring(sPeriod.Length - 2, 2);
sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
sDay = sDay.Substring(sDay.Length - 2, 2);
+ //鑾峰彇鍛�
+ GregorianCalendar calendar = new GregorianCalendar();
+ int weekNumber = calendar.GetWeekOfYear(dtpHDate.Value, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+ sWeek = "0" + weekNumber.ToString();
+ sWeek = sWeek.Substring(sWeek.Length - 2, 2);
+ sYearWeek = sYear + sWeek;
//==================================
switch (sYear)
{
@@ -571,9 +581,9 @@
string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
HCode2 = HCode2.ToUpper();
string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value); // 鐗堟湰鍙�
- string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCS; // 鎵规鐢熸垚鍓嶇紑
HBatchNoNumber = HBatchNoNumber.ToUpper();
- string HBarCodeType = ""; // 鏉＄爜绫诲瀷
+ string HBarCodeType = cmbHCusName.Text; // 鏉＄爜绫诲瀷
string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); // 瀹㈡埛璁㈠崟鍙�
if (HMaterID != 0)
@@ -654,6 +664,7 @@
{
string TM = ""; //鏉＄爜
int LSHlen = 4; //娴佹按鍙烽暱搴�
+ int LWSHlen = 5; //澶栫娴佹按鍙烽暱搴�
double HSumQty = 0; //浜у搧鏁伴噺
double HMinQty = 0; //鍐呯鏈�灏忓寘瑁呮暟
int HBQty = 0; //鍐呯鏁�
@@ -678,6 +689,7 @@
double HQty = 0; //鏁伴噺
Int64 HCusID = 0; //瀹㈡埛ID
string HCusModelName = ""; //瀹㈡埛鏂欏彿
+ string HCusModel = ""; //瀹㈡埛鐗╂枡鍚嶇О
bool HGiveAwayFlag = false; //璧犲搧鏍囪
string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
@@ -721,7 +733,7 @@
string sHCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
string sHCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
sHCode2 = sHCode2.ToUpper();
- string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCS; // 鎵规鐢熸垚鍓嶇紑
HBatchNoNumber = HBatchNoNumber.ToUpper();
DataSet oDsBatchNo = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo '" + sHSourceBillNo + "'," + sHMaterID.ToString() + ",'" + sHMaterNumber + "','" + sHCusModelName + "','" + sHCode2 + "','" + HBatchNoNumber + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo");
@@ -784,13 +796,25 @@
HEntryID = j + 1;
HBarCode = TM.ToUpper();
- HBarCodeType = "鍐呯鐮�";
+ if(cmbHCusName.Text.Contains("鍏冭剳"))
+ {
+ HBarCodeType = "鍏冭剳鍐呯鐮�";
+ }
+ else if (cmbHCusName.Text.Contains("椤鸿揪"))
+ {
+ HBarCodeType = "椤鸿揪鍐呯鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鍐呯鐮�";
+ }
HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
HQty = HMinQty;
HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
@@ -808,12 +832,12 @@
HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = LSH;
- HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
HBoxNo = HBoxNo.ToUpper();
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
- //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸鎴风墿鏂欏悕绉癏CusModel
+ //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo銆佸勾鍛℉WorkLineName
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -835,7 +859,7 @@
+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
+ ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
- + ",'" + ClsPub.CurUserName + "',getdate(),'','','" + HMTONo + "'"
+ + ",'" + ClsPub.CurUserName + "',getdate(),'','" + sYearWeek + "','" + HMTONo + "'"
+ ",0,'','','" + HInnerBillNo + "'"
+ ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
+ ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
@@ -852,11 +876,36 @@
{
HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
- //鑾峰彇鏈�澶ф祦姘村彿
- //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
- sTMNumber = HCusModel + sYear4 + sPeriod2 + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ if (cmbHCusName.Text.Contains("鍏冭剳"))
+ {
+ LWSHlen = 5;
+ HBarCodeType = "鍏冭剳澶栫鐮�";
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鏉＄爜鍓嶇紑 = 'CA'+骞村懆
+ sTMNumber = "CA" + sYearWeek;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (cmbHCusName.Text.Contains("椤鸿揪"))
+ {
+ LWSHlen = 6;
+ HBarCodeType = "椤鸿揪澶栫鐮�";
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鏉＄爜鍓嶇紑 = 'B103288'+骞村懆
+ sTMNumber = "B103288" + sYearWeek;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ LWSHlen = 5;
+ HBarCodeType = "澶栫鐮�";
+ //鑾峰彇鏈�澶ф祦姘村彿
+ //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 骞� + 鏈� + 鏃�
+ sTMNumber = HCS + sYear4 + sPeriod2 + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
HWBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HWBQtyCol].Value);
HWMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HWMinQtyCol].Value);
@@ -876,7 +925,7 @@
//
LWSH = LWSH + 1;
LSH2 = LWSH.ToString();
- while (LSH2.Length < 5) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� 5 鍓嶉潰琛�0
+ while (LSH2.Length < LWSHlen) //濡傛灉澶栫娴佹按鍙蜂綅鏁板皬浜� 澶栫娴佹按鍙烽暱搴� 鍓嶉潰琛�0
{
LSH2 = "0" + LSH2;
}
@@ -884,13 +933,13 @@
HEntryID = j + 1;
HBarCode = TM.ToUpper();
- HBarCodeType = "澶栫鐮�";
HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
HQty = HWMinQty;
HCusID = ClsPub.isLong(cmbHCusName.SelectedValue);
HCusModelName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);
+ HCusModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelCol].Value);
HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
HProduceDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HProduceDateCol].Value);
@@ -908,12 +957,12 @@
HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
HSno = 0;
- HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
+ HBoxNo = HCode1 + sYear + sPeriod + sDay + HCS;
HBoxNo = HBoxNo.ToUpper();
sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value); // 鐣岄潰涓婅緭鍏ョ殑鎵规浣�
- //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸巶鍟嗕唬鐮丠CusModel
- //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo
+ //瀹㈡埛鏂欏彿HCusModelName銆佺墿鏂欑被鍒獺Code1銆佹壒娆′綅HCode2銆佺増鏈彿HCode3銆佹壒娆″簭鍒楀彿HSno銆佹壒娆＄敓鎴愬墠缂�HBoxNo銆佸鎴风墿鏂欏悕绉癏CusModel
+ //鐣岄潰涓婅緭鍏ョ殑鎵规浣岺SupName銆�36杩涘埗鎵规搴忓垪鍙稨SupNumber銆佸鎴疯鍗曞彿HInnerBillNo銆佸勾鍛℉WorkLineName
oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
"(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -935,7 +984,7 @@
+ "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'"
+ ",0,'','" + HRemark + "'," + HOrgID.ToString() + "," + HOrgID.ToString()
- + ",'" + ClsPub.CurUserName + "',getdate(),'','','" + HMTONo + "'"
+ + ",'" + ClsPub.CurUserName + "',getdate(),'','" + sYearWeek + "','" + HMTONo + "'"
+ ",0,'','','" + HInnerBillNo + "'"
+ ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
+ ",'" + HCode2 + "','" + HCode3 + "',''," + HSno.ToString() + ",'" + HBoxNo + "')");
@@ -965,7 +1014,7 @@
private void Display()
{
//鍒锋柊鍐呯鐮佸垪琛�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷='鍐呯鐮�' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鍐呯鐮�' or 鏉＄爜绫诲瀷='鍏冭剳鍐呯鐮�' or 鏉＄爜绫诲瀷='椤鸿揪鍐呯鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -976,7 +1025,7 @@
grdSub.DataSource = DSet.Tables[0].DefaultView;
//鍒锋柊澶栫鐮佸垪琛�
- DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷='澶栫鐮�' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='澶栫鐮�' or 鏉＄爜绫诲瀷='鍏冭剳澶栫鐮�' or 鏉＄爜绫诲瀷='椤鸿揪澶栫鐮�') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DWSet == null)
{
@@ -1036,7 +1085,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 46; //鎬诲垪鏁�
+ grdMain.ColumnCount = 47; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1048,6 +1097,7 @@
grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛鏂欏彿";
+ grdMain.Columns[HCusModelCol].HeaderText = "瀹㈡埛鐗╂枡鍚嶇О";
grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
@@ -1115,6 +1165,8 @@
//"," + HMaterNumberCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
"," + HUnitNumberCol.ToString() +
+ "," + HCusModelNameCol.ToString() +
+ "," + HCusModelCol.ToString() +
//"," + HCode1Col.ToString() +
//"," + HCode2Col.ToString() +
//"," + HCode3Col.ToString() +
@@ -1544,6 +1596,8 @@
"," + HMinQtyCol.ToString() +
"," + HWMinQtyCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
+ "," + HCusModelNameCol.ToString() +
+ "," + HCusModelCol.ToString() +
//"," + HCode1Col.ToString() +
//"," + HCode2Col.ToString() +
//"," + HCode3Col.ToString() +
@@ -1863,11 +1917,23 @@
DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_CusMatNo " + num.ToString() + "," + HCusID.ToString() + "," + HMaterID.ToString(), "h_p_Gy_CusBarCodeBill_CusMatNo");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- grdMain.Rows[j].Cells[HCusModelNameCol].Value = "";
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ column.Items.Add("");
+ grdMain.Rows[j].Cells[HCusModelNameCol] = column;
+ grdMain.Rows[j].Cells[HCusModelCol].Value = "";
}
else
{
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ column.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HCusRelationNumber"]));
+ }
+ grdMain.Rows[j].Cells[HCusModelNameCol] = column;
grdMain.Rows[j].Cells[HCusModelNameCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationNumber"]);
+ grdMain.Rows[j].Cells[HCusModelCol].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCusRelationName"]);
if (num == 2)
{
grdMain.Rows[j].Cells[HCode1Col].Value = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCode1"]);
--
Gitblit v1.9.1