From 7749b7bf2719ba2206d09ab9fa1938aa503e35c0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 26 七月 2023 10:11:37 +0800
Subject: [PATCH] 职员异动单 及列表

---
 WarM/条码打印/Sc_ICMOToBarCode.cs |  188 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 133 insertions(+), 55 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 2e60eae..f90e6ff 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -119,8 +119,11 @@
                 //鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈�   鍒锋柊鏃舵瘡娆″瓨涓�閬�
                 if (DSet.Tables[0].Rows.Count > 0)
                 {
-                    txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+                    txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
                     txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+                    //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡缂栫爜"].Value);
+                    txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+                    txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
                 }
                 else
                 {
@@ -140,7 +143,7 @@
             //    }
             //}
             //鍐荤粨
-            //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            //int FrCol = DBUtility.ClsPub.isLong(frmCondition.txtFrozenCol.Text);
             //string s = frmCondition.cmbHComplete.Text;
             //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
             //鐢荤嚎
@@ -226,7 +229,7 @@
             string HUserName = "";
             HUserName = ClsPub.isStrNull(DBUtility.ClsPub.CurUserName);
             Int64 HUserID = 0;
-            HUserID = ClsPub.isInt(DBUtility.ClsPub.CurUserID);
+            HUserID = ClsPub.isLong(DBUtility.ClsPub.CurUserID);
 
             DataSet DSet;
 
@@ -752,7 +755,6 @@
 
         private void cmdHSaveBill_Click(object sender, EventArgs e)
         {
-
             Display();
         }
 
@@ -779,7 +781,7 @@
                 string HTMNumber = "";
                 string HOrgNumber = "";
                 DataSet Ds;
-                int LSH = 0;                //娴佹按鍙�
+                Int64 LSH = 0;                //娴佹按鍙�
                 string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
 
 
@@ -800,7 +802,7 @@
                 //绠卞彿
                 string HXH = "";
                 //绠卞彿娴佹按鍙�
-                int LSH3 = 0;                //娴佹按鍙�
+                Int64 LSH3 = 0;                //娴佹按鍙�
                 string LSH4 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
                 //鏈哄彴
                 string HJT = "";
@@ -875,17 +877,32 @@
                 long HTMaterID = 0;
                 HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                 string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+
+
+                //鑾峰彇澶勭悊杩囩殑鏃ユ湡璺熶粖澶╁樊鍑犲ぉ  鐒跺悗鍔犲嚑涓�+鍙�
+                TimeSpan HCY = Convert.ToDateTime(HPrdDate) - Convert.ToDateTime(DateTime.Now.ToString());
+                int a = 1;
+                while (a <= HCY.Days)  //褰揳 灏忎簬 宸紓澶╂暟  寰幆鍔犱笂 + 鍙�
+                {
+                    HPrdDate = HPrdDate + "+";
+                    a = a + 1;
+                }
                 DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
-                Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
-                DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
-                if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
-                {
-                    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
-                }
-                else
-                {
-                    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
-                }
+                Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
+
+
+                sPackBarCode = sPackStr + TTM_LSH.ToString();
+                //DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+                //if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
+                //{
+                //    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
+                //}
+                //else
+                //{
+                //    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
+                //}
+
+
                 oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
 
 
@@ -906,7 +923,7 @@
                 //        HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                 //        string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
                 //        DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
-                //        Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+                //        Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
                 //        sPackBarCode = sPackStr + TTM_LSH.ToString();
                 //        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
                 //    }
@@ -926,7 +943,7 @@
                 //        HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                 //        string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
                 //        DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
-                //        Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+                //        Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
                 //        sPackBarCode = sPackStr + TTM_LSH.ToString() + "+" ;
                 //        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
                 //    }
@@ -947,7 +964,7 @@
                 //HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                 //string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
                 //DataSet  DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
-                //Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
+                //Int64 TTM_LSH = ClsPub.isLong(DsTM.Tables[0].Rows[0][0]) + 1;
                 //string sPackBarCode = sPackStr + TTM_LSH.ToString();
                 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
 
@@ -978,19 +995,19 @@
                         HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("璁惧")].Value);
                         HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
                         Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                        LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]);
+                        LSH3 = ClsPub.isLong(Ds99.Tables[0].Rows[0][0]) + 1;
                         LSH4 = LSH3.ToString();
 
 
 
-                        //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+                        //HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
                         HZXQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鏈鏁伴噺")].Value);
                         HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鏁伴噺")].Value);
                         HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
 
                         HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                         Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                         n = 0;
                         LSH2 = LSH.ToString();
                         while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
@@ -1069,7 +1086,7 @@
                         HWorkLineName = "";
                         HSeOrderBillNo = "";
                         HInnerBillNo = sPackBarCode;
-                        HSourceID = ClsPub.isInt(txtHSourceID.Tag);
+                        HSourceID = ClsPub.isLong(txtHSourceID.Tag);
                         oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HMaterialMQty" +
                                             ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                             ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1197,19 +1214,70 @@
             //Sub_SaveBarCode();
             ////
 
+
+
+            //bool flag = this.txtHZXQty.Text.Trim() != "";
+            //double num;
+            //double HICMOQty = 0;
+            //if (flag)
+            //{
+            //    num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
+            //}
+            //else
+            //{
+            //    num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
+            //}
+            //bool flag2 = num <= 0.0;
+            //if (flag2)
+            //{
+            //    MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
+            //}
+            //else
+            //{
+            //    for (int i = 0; i < this.grdMain.Rows.Count; i++)
+            //    {
+            //        for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
+            //        {
+
+            //            HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+            //        }
+            //        if (HICMOQty < num)
+            //        {
+            //            MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
+            //            break;
+            //        }
+
+            //        bool flag3 = num > 0.0;
+            //        if (!flag3)
+            //        {
+            //            break;
+            //        }
+            //        bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+            //        if (!flag4)
+            //        {
+            //            this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = num;
+            //            break;
+            //        }
+            //        num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+            //        this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+            //    }
+            //    this.Sub_SaveBarCode();
+
             bool flag = this.txtHZXQty.Text.Trim() != "";
+            double HICMOQty = 0.0;
+            bool flag5 = flag;
             double num;
-            double HICMOQty = 0;
-            if (flag)
+            if (flag5)
             {
-                num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
+                num = ClsPub.isDoule(this.txtHZXQty.Text);
             }
             else
             {
-                num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
+                num = ClsPub.isDoule(this.txtHMiniQty.Text);
             }
             bool flag2 = num <= 0.0;
-            if (flag2)
+            bool flag6 = flag2;
+            if (flag6)
             {
                 MessageBox.Show("璇疯緭鍏ユ暣绠辨暟閲忥紒");
             }
@@ -1217,30 +1285,31 @@
             {
                 for (int i = 0; i < this.grdMain.Rows.Count; i++)
                 {
-                    for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
+                    for (int i2 = 0; i2 < this.grdMain.Rows.Count; i2++)
                     {
-
-                        HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                        HICMOQty += ClsPub.isDoule(this.grdMain.Rows[i2].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
                     }
-                    if (HICMOQty < num)
+                    bool flag7 = HICMOQty < num;
+                    if (flag7)
                     {
                         MessageBox.Show("璇风偣鍑昏秴棰濈敓浜ф寜閽敓鎴愭潯鐮侊紒");
                         break;
                     }
-
                     bool flag3 = num > 0.0;
-                    if (!flag3)
+                    bool flag8 = !flag3;
+                    if (flag8)
                     {
                         break;
                     }
-                    bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
-                    if (!flag4)
+                    bool flag4 = num > ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                    bool flag9 = !flag4;
+                    if (flag9)
                     {
                         this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = num;
                         break;
                     }
-                    num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
-                    this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                    num -= ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
+                    this.grdMain.Rows[i].Cells["鏈鏁伴噺"].Value = ClsPub.isDoule(this.grdMain.Rows[i].Cells["鐢熶骇璁㈠崟鏁伴噺"].Value);
                 }
                 this.Sub_SaveBarCode();
             }
@@ -1258,7 +1327,7 @@
             string HTMNumber = "";
             string HOrgNumber = "";
             DataSet Ds;
-            int LSH = 0;                //娴佹按鍙�
+            Int64 LSH = 0;                //娴佹按鍙�
             string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
             double HZXQty = 0;         //瑁呯鏁伴噺
             double HDDQty = 0;         //璁㈠崟鏁伴噺
@@ -1281,7 +1350,7 @@
                 HOrgNumber = ClsPub.HOrgNumber;
 
 
-                //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+                //HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
                 HZXQty = ClsPub.isDoule(txtHZXQty.Text);
                 HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
 
@@ -1290,7 +1359,7 @@
                 {
                     HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                     Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                    LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                 }
                 else if (cmbHBarCodeType.Text == "鎵规鏉$爜")
                 {
@@ -1421,7 +1490,7 @@
             string HTMNumber = "";
             string HOrgNumber = "";
             DataSet Ds;
-            int LSH = 0;                //娴佹按鍙�
+            Int64 LSH = 0;                //娴佹按鍙�
             string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
             double HZXQty = 0;         //瑁呯鏁伴噺
             double HDDQty = 0;         //璁㈠崟鏁伴噺
@@ -1444,7 +1513,7 @@
                 HOrgNumber = ClsPub.HOrgNumber;
 
 
-                //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+                //HBQty = HBQty + ClsPub.isLong(txtHBQty.Text);
                 HZXQty = ClsPub.isDoule(txtHZXQty.Text);
                 HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
                 HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
@@ -1453,7 +1522,7 @@
                 {
                     HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                     Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                    LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                 }
                 else if (cmbHBarCodeType.Text == "鎵规鏉$爜")
                 {
@@ -1483,7 +1552,7 @@
                         HDay = HDay.Substring(HDay.Length - 2, 2);
                         HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                         Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                         TM = HTMNumber + LSH2;
                     }
                     else
@@ -1496,7 +1565,7 @@
                         HDay = HDay.Substring(HDay.Length - 2, 2);
                         HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                         Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                         TM = HTMNumber + LSH2 + "+"; 
                     }
                     //HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
@@ -1506,7 +1575,7 @@
                     //HDay = HDay.Substring(HDay.Length - 2, 2);
                     //HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                     //Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                    //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                    //LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                 }
                 //if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
                 //{
@@ -1632,7 +1701,7 @@
 
         private void DisplayTM()
         {
-            //HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
+            //HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
             DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and 鏉$爜绫诲瀷 = '鎵樼洏鏉$爜' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
             //鐢熸垚棣栬鏍囬
             if (DSet == null)
@@ -1792,7 +1861,7 @@
             //
             grdSub.DataSource = DSet.Tables[0].DefaultView;
             //鍐荤粨
-            //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            //int FrCol = DBUtility.ClsPub.isLong(frmCondition.txtFrozenCol.Text);
             //string s = frmCondition.cmbHComplete.Text;
             //DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
             //鐢荤嚎
@@ -2040,13 +2109,13 @@
         {
             //鑾峰彇缃戞牸绗竴琛孒InterID鐨勫��
             Int64 HInterID = 0;
-            HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
+            HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
             DataSet DSBefore;
             DSBefore =  SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
             grdMain.DataSource = DSBefore.Tables[0].DefaultView;
             //if (DSBefore.Tables[0].Rows.Count > 0)
             //{
-            //    txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+            //    txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
             //}
             //else
             //{
@@ -2061,8 +2130,10 @@
             else
             {
                 grdMain.DataSource = DSBefore.Tables[0].DefaultView;
-                txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+                txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
                 txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+                txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+                txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
             }
 
 
@@ -2073,8 +2144,8 @@
         {
             //鏍规嵁
             Int64 HInterID = 0;
-            //HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
-            HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
+            //HInterID = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+            HInterID = DBUtility.ClsPub.isLong(txtHMaterID.Tag);
             DataSet DSBefore;
             DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
             if (DSBefore == null || DSBefore.Tables[0].Rows.Count == 0)
@@ -2086,8 +2157,10 @@
             else
             {
                 grdMain.DataSource = DSBefore.Tables[0].DefaultView;
-                txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
+                txtHMaterID.Tag = DBUtility.ClsPub.isLong(grdMain.Rows[0].Cells["HInterID"].Value);
                 txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鏍囧噯瑁呯"].Value);
+                txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["瑙勬牸鍨嬪彿"].Value);
+                txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["鐗╂枡鍚嶇О"].Value);
             }
             //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
         }
@@ -2191,5 +2264,10 @@
                 Thread.Sleep(1000); 
             }
         }
+
+        private void label14_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1