YqnMes.git - Gitblit

parent: c9d3e78b | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

zgq

2021-01-20 efe6576abc12737e898ead7b5d2307cf90faee58

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

3个文件已修改

	SCM.sln	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SCM/单据资料/Gy_BarCodeDetailList.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SCM/单据资料/Sc_ICMOReportToBarCode.cs	652 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 SCM.sln

@@ -13,8 +13,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBUtility", "DBUtility\DBUtility.csproj", "{F2098F1B-4FA1-49BB-91EA-AB3522008F28}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -80,18 +78,6 @@
        {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
        {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
        {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|x86.ActiveCfg = Release|Any CPU
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|Mixed Platforms.Build.0 = Debug|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|x86.ActiveCfg = Debug|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug|x86.Build.0 = Debug|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Any CPU.Build.0 = Release|Any CPU
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Mixed Platforms.ActiveCfg = Release|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|Mixed Platforms.Build.0 = Release|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|x86.ActiveCfg = Release|x86
        {F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|x86.Build.0 = Release|x86
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE

 SCM/µ¥¾Ý×ÊÁÏ/Gy_BarCodeDetailList.cs

@@ -64,18 +64,8 @@
                whereBuilder.Append(" and d.FNUMBER like ''%"+textBox1.Text+"%''");

            if (!string.IsNullOrEmpty(textBox2.Text))

                whereBuilder.Append(" and b.FLOT_TEXT like ''%"+textBox2.Text+"%''");

            if (comboBox1.Text != "å¨é¨")

            {

                if(comboBox1.Text=="åæ ¼å")

                {

                    whereBuilder.Append(" and c.HProdLev=''''");

                }

                else

                {

                    whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text + "''");

                }

                
            }

            if(comboBox1.Text!="å¨é¨")

                whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text+"''");

            if (!string.IsNullOrEmpty(textBox4.Text))

                whereBuilder.Append(" and g.HName like ''%"+textBox4.Text+"%''");

            if (!string.IsNullOrEmpty(textBox5.Text))


 SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs

@@ -1,5 +1,4 @@
<<<<<<< HEAD

ï»¿using System;

using System;

using System.Collections.Generic;

using System.ComponentModel;

using System.Data;

@@ -69,7 +68,7 @@
            oWeb.Url = SCM.ClsPub1.WEBSURL;

            //

            frmCondition = new frmBillQueryCondition_Base();

            this.Text = ModCaption; 
            this.Text = ModCaption;

            oSumGrid.ogrdMain = grdSub;  //åå§å new

            oSumGrid.oGridsum = grdSum;

            initGrid();

@@ -78,7 +77,7 @@
            cmbFQMB.Items.Add(this.Text);

            cmbFQMB.SelectedIndex = 0;



            if(DBUtility.ClsPub.CurUserName.ToLower()=="admin")

            if (DBUtility.ClsPub.CurUserName.ToLower() == "admin")

            {

                txtHDQQty.ReadOnly = false;

                txtHKSQty.ReadOnly = false;

@@ -115,7 +114,7 @@
        //æ¶é´æ§ä»¶

        private void timer1_Tick(object sender, EventArgs e)

        {

            timer1.Enabled=false;

            timer1.Enabled = false;

            Sub_ClearBill();

        }



@@ -123,7 +122,7 @@
        {

            timer2.Enabled = false;

            //

            if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("æ²¡ææ¾å°")==false)

            if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("æ²¡ææ¾å°") == false)

            {

                txtPortName.Text = ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtBaudRate.Text = ClsIni.ReadIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

@@ -245,7 +244,7 @@
                txtHSYQty.Text = oTable.Rows[0]["æªçææ¡ç æ°é"].ToString();

                txtHKSQty.Text = lblHNowQty.Text;

                txtHDQQty.Text = lblHNowQty.Text;

                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text)>0)

                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) > 0)

                {

                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);

                }

@@ -256,7 +255,7 @@
                DisplayMain();

                //DisplaySub();

            }

            catch(Exception e)

            catch (Exception e)

            {

                MessageBox.Show("è¯»åå¤±è´¥ï¼" + e.Message);

            }

@@ -269,7 +268,7 @@
            string sSql = "";

            string sWhere = "";

            //è¿æ»¤æ¡ä»¶ 

            sSql = " exec h_p_Sc_ICMOReportToBarCode_All   '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString(); 
            sSql = " exec h_p_Sc_ICMOReportToBarCode_All   '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();

            //

            DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_All", ref DBUtility.ClsPub.sExeReturnInfo);

            //çæé¦è¡æ é¢

@@ -279,7 +278,7 @@
                return;

            }

            //

            if (DSet.Tables[0].Rows.Count>0)

            if (DSet.Tables[0].Rows.Count > 0)

            {

                grdMain.DataSource = DSet.Tables[0].DefaultView;

            }

@@ -298,7 +297,7 @@
            ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);

            /////////////////////////////

            txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["å³èæ°é"], 1);

            if(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text)>=0)

            if (DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text) >= 0)

            {

                txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 1);

            }

@@ -316,7 +315,7 @@
            string sWhere = "";

            //è¿æ»¤æ¡ä»¶ 

            sSql = " exec h_p_Sc_ICMOReportToBarCode_Sub   '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();

            


            //

            DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_Sub", ref DBUtility.ClsPub.sExeReturnInfo);

            //çæé¦è¡æ é¢

@@ -348,12 +347,12 @@


        //é¢è§

        int CurRows = 0;

        


        
 


        










        #endregion



@@ -367,11 +366,11 @@
            if (oDept.RefreshView(sWhere))

            {

                this.txtHDeptID.Text = oDept.oModel.HName;

                this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString(); 
                this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString();

            }

            else

            {

                this.txtHDeptID.Text = ""; 
                this.txtHDeptID.Text = "";

            }

        }



@@ -518,19 +517,19 @@
                //    cmdHSaveBill.Enabled = true;

                //    return false;

                //}

                if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0 ) 
                if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0)

                {

                    MessageBox.Show("èå1æèèå2æ²¡æéæ©ï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0 )

                if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0)

                {

                    MessageBox.Show("çç»æ²¡æéæ©ï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                




                //æ ¹æ®æºå çææ¡å½¢ç  å¹¶ä¿åå¦æ°æ®åº

                HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);

@@ -540,549 +539,6 @@
                sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();

                sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);

                sDay = "0" + ClsPub.isDate(sDate).Day.ToString();

=======

ï»¿using System;

using System.Collections.Generic;

using System.ComponentModel;

using System.Data;

using System.Drawing;

using System.Text;

using System.Windows.Forms;

using gregn6Lib;

using Pub_Class;

using System.Threading;

using System.IO.Ports;



namespace SCM

{

    public partial class Sc_ICMOReportToBarCode : Form

    {

        public Sc_ICMOReportToBarCode()

        {

            InitializeComponent();

        }



        public frmBillQueryCondition_Base frmCondition;

        public string ModCaption = "æåååå¨çº¿æ£éª";

        public string ModName = "Sc_ICMOReportToBarCode";

        public string HSourceBillTypeID = "";   //åæ®ç±»å

        public string HSourceBillType = "";     //åæ®ç±»ååç§°

        public string HSourceBillNo = "";

        public Int64 HSourceInterID = 0;

        public Int64 HSourceEntryID = 0;

        public int HTMCol = 0;

        public int HMaterIDCol = 1;

        Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();

        public Int32 iTopRow = 0;//ç»æ¨ªçº¿

        SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();

        //



        #region  åºå®ä»£ç 



        //æ¸ç©ºçé¢

        public void Sub_ClearBill()

        {

            //æ¸ç©ºçé¢æ§ä»¶ for æ§ä»¶   
            foreach (Control ct in gbUp.Controls)

            {

                switch (ct.GetType().Name)

                {

                    case "ComboBox":

                        ((ComboBox)ct).SelectedIndex = 0;

                        break;

                    case "TextBox":

                        ((TextBox)ct).Text = "";

                        break;

                    case "DateTimePicker":

                        ((DateTimePicker)ct).Value = DateTime.Today;

                        break;

                    default:

                        break;

                }

            }

            //

            txtHMaker.Text = ClsPub.CurUserName;

            initGrid();

        }



        private void Sc_ICMOReportToBarCode_Load(object sender, EventArgs e)

        {

            //è®¾ç½®å¨æURL

            oWeb.Url = SCM.ClsPub1.WEBSURL;

            //

            frmCondition = new frmBillQueryCondition_Base();

            this.Text = ModCaption; 
            oSumGrid.ogrdMain = grdSub;  //åå§å new

            oSumGrid.oGridsum = grdSum;

            initGrid();

            //cmbHBillType.SelectedIndex = 0;

            //cmbHSourceBillType.SelectedIndex = 0;

            cmbFQMB.Items.Add(this.Text);

            cmbFQMB.SelectedIndex = 0;



            if(DBUtility.ClsPub.CurUserName.ToLower()=="admin")

            {

                txtHDQQty.ReadOnly = false;

                txtHKSQty.ReadOnly = false;

            }

        }



        //åå§åç½æ ¼

        private void initGrid()

        {

            ClsPub1.initGridList(grdMain, this.Name);

            ClsPub1.initGridList(grdSub, this.Name + "grdSub");

            ClsPub1.initGridFst(grdEmp, this.Name + "grdEmp");

            grdMain.RowTemplate.Height = 30;

            grdMain.RowTemplate.MinimumHeight = 30;

            grdMain.RowsDefaultCellStyle.Font = new Font("å®ä½", 15);

            grdMain.ReadOnly = true;



            grdSub.RowTemplate.Height = 30;

            grdSub.RowTemplate.MinimumHeight = 30;

            grdSub.RowsDefaultCellStyle.Font = new Font("å®ä½", 15);

            grdSub.ReadOnly = true;



            grdEmp.RowTemplate.Height = 30;

            grdEmp.RowTemplate.MinimumHeight = 30;

            grdEmp.RowsDefaultCellStyle.Font = new Font("å®ä½", 15);

            grdEmp.ReadOnly = false;

            //DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);

            //DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub");

            DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);

            DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub");

            DBUtility.Xt_BaseBillFun.GetGrid(grdEmp, this.Name + "grdEmp");

        }



        //æ¶é´æ§ä»¶

        private void timer1_Tick(object sender, EventArgs e)

        {

            timer1.Enabled=false;

            Sub_ClearBill();

        }



        private void timer2_Tick(object sender, EventArgs e)

        {

            timer2.Enabled = false;

            //

            if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("æ²¡ææ¾å°")==false)

            {

                txtPortName.Text = ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtBaudRate.Text = ClsIni.ReadIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                cmbParity.Text = ClsIni.ReadIni("COMINFO", "cmbParity", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtDataBits.Text = ClsIni.ReadIni("COMINFO", "txtDataBits", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                cmbStopBits.Text = ClsIni.ReadIni("COMINFO", "cmbStopBits", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtHSend0.Text = ClsIni.ReadIni("COMINFO", "txtHSend0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtHSend.Text = ClsIni.ReadIni("COMINFO", "txtHSend", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtHSourceID.Text = ClsIni.ReadIni("COMINFO", "txtHSourceID", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                txtHSourceID.Tag = ClsIni.ReadIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

                this.Text = this.Text + "-" + txtHSourceID.Text;

            }



            //åå§åä¸²å£

            ComDevice = new SerialPort();

            ComDevice.DataReceived += new SerialDataReceivedEventHandler(Com_DataReceived);//ç»å®äºä»¶

            string[] PortNames = SerialPort.GetPortNames();

            //æå¼ä¸²å£

            OpenCom();

        }



        //éåº

        private void tc_Click(object sender, EventArgs e)

        {

            this.Close();

        }



        private void grdMain_Paint(object sender, PaintEventArgs e)

        {

            GraphicsGrid();

        }



        private void GraphicsGrid()

        {

            //ç»åºçº¿

            DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);

            //ç»æ¨ªçº¿

            DBUtility.Xt_BaseBillFun.GraphicsRowGrid(grdMain, iTopRow, iTopRow + 50, Fun_GetCol("hmainid"));

        }



        private Int32 Fun_GetCol(string sCol)

        {

            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);

        }



        //ä¿ååå®½

        private void bclk_Click(object sender, EventArgs e)

        {

            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);

            DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");

            DBUtility.Xt_BaseBillFun.SaveGrid(grdEmp, this.Name + "grdEmp");

        }



        //é»è®¤åå®½

        private void mrlk_Click(object sender, EventArgs e)

        {

            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);

            DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");

            DBUtility.Xt_BaseBillFun.DefaultGridView(grdEmp, this.Name + "grdEmp");

        }



        #endregion





        #region è¿åæºåä¿¡æ¯



        private void xd_Click(object sender, EventArgs e)

        {



        }





        private void Display(string SourceBillType, Int64 HSourceBillInterID, Int64 HSourceBillEntryID)

        {

            DataSet Ds;

            //çäº§è®¢å

            if (SourceBillType == "çäº§è®¢å")

            {

                //å¾å°ä¿¡æ¯

                Ds = oWeb.getDataSetBySQL("select * from h_v_IFCLD_ICMOList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IFCLD_ICMOList", ref DBUtility.ClsPub.sExeReturnInfo);

                //åå¥ä¿¡æ¯

                Sub_WriteInForm(Ds.Tables[0], 0);

            }

            //æ¶æéç¥å

            if (SourceBillType == "æ¶æéç¥å")

            {

                //å¾å°ä¿¡æ¯

                Ds = oWeb.getDataSetBySQL("select * from h_v_IF_POInStockList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IF_POInStockList", ref DBUtility.ClsPub.sExeReturnInfo);

                //åå¥ä¿¡æ¯

                Sub_WriteInForm(Ds.Tables[0], 0);

            }

            //çäº§æ±æ¥å

            if (SourceBillType == "çäº§æ±æ¥å")

            {

                //å¾å°ä¿¡æ¯

                Ds = oWeb.getDataSetBySQL("select * from h_v_IF_ICMOReportBillList where hmainid=" + HSourceBillInterID + " and hsubid=" + HSourceBillEntryID, "h_v_IF_POInStockList", ref DBUtility.ClsPub.sExeReturnInfo);

                //åå¥ä¿¡æ¯

                Sub_WriteInForm(Ds.Tables[0], 0);

            }

        }



        //æ ¹æ®TABLEåå¥çé¢

        private void Sub_WriteInForm(DataTable oTable, int i)

        {

            try

            {

                txtHSourceBillNo.Text = oTable.Rows[0]["åæ®å·"].ToString();

                txtHMaterNumber.Text = oTable.Rows[0]["ç©æä»£ç "].ToString();

                txtHOldMaterNumber.Text = oTable.Rows[0]["æ§ç©æç¼ç "].ToString();

                txtHMaterNumber.Tag = oTable.Rows[0]["HMaterID"].ToString();

                txtHMaterName.Text = oTable.Rows[0]["ç©æåç§°"].ToString();

                txtHMaterName.Tag = oTable.Rows[0]["HMaterID"].ToString();

                txtHMaterModel.Text = oTable.Rows[0]["è§æ ¼åå·"].ToString();

                txtHUnitName.Text = oTable.Rows[0]["è®¡éåä½"].ToString();

                txtHUnitName.Tag = oTable.Rows[0]["HUnitID"].ToString();

                txtHBatchNo.Text = oTable.Rows[0]["æ¹æ¬¡"].ToString();

                txtHSumQty.Text = oTable.Rows[0]["æ°é"].ToString();

                txtHRelationQty.Text = oTable.Rows[0]["å·²çææ¡ç æ°é"].ToString();

                txtHSYQty.Text = oTable.Rows[0]["æªçææ¡ç æ°é"].ToString();

                txtHKSQty.Text = lblHNowQty.Text;

                txtHDQQty.Text = lblHNowQty.Text;

                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text)>0)

                {

                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);

                }

                else

                {

                    txtHSJQty.Text = "0";

                }

                DisplayMain();

                //DisplaySub();

            }

            catch(Exception e)

            {

                MessageBox.Show("è¯»åå¤±è´¥ï¼" + e.Message);

            }

        }





        private void DisplayMain()

        {

            DataSet DSet;

            string sSql = "";

            string sWhere = "";

            //è¿æ»¤æ¡ä»¶ 
            sSql = " exec h_p_Sc_ICMOReportToBarCode_All   '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString(); 
            //

            DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_All", ref DBUtility.ClsPub.sExeReturnInfo);

            //çæé¦è¡æ é¢

            if (DSet == null)

            {

                MessageBox.Show("æ²¡æè¿åä»»ä½ç»æ,å°è¯åæ¬¡æ¥è¯¢ï¼" + DBUtility.ClsPub.sExeReturnInfo);

                return;

            }

            //

            if (DSet.Tables[0].Rows.Count>0)

            {

                grdMain.DataSource = DSet.Tables[0].DefaultView;

            }

            //å»ç»

            int FrCol = DBUtility.ClsPub.isInt(0);

            string s = "æ¯";

            ClsPub1.DisplayGrid(grdMain, this.Name, s, FrCol);

            //ç»çº¿ 
            //Total();

            ///////////////////////////////////////////

            if (DSet.Tables[1].Rows.Count > 0)

            {

                grdSub.DataSource = DSet.Tables[1].DefaultView;

            }

            //å»ç» 
            ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);

            /////////////////////////////

            txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["å³èæ°é"], 1);

            if(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text)>=0)

            {

                txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 1);

            }

            else

            {

                txtHSYQty.Text = "0";

            }

            //////////////////////////

        }



        private void DisplaySub()

        {

            DataSet DSet;

            string sSql = "";

            string sWhere = "";

            //è¿æ»¤æ¡ä»¶ 
            sSql = " exec h_p_Sc_ICMOReportToBarCode_Sub   '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();

            
            //

            DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_Sub", ref DBUtility.ClsPub.sExeReturnInfo);

            //çæé¦è¡æ é¢

            if (DSet == null)

            {

                MessageBox.Show("æ²¡æè¿åä»»ä½ç»æ,å°è¯åæ¬¡æ¥è¯¢ï¼" + DBUtility.ClsPub.sExeReturnInfo);

                return;

            }

            //

            grdSub.DataSource = DSet.Tables[0].DefaultView;





            //å»ç»

            int FrCol = DBUtility.ClsPub.isInt(0);

            string s = "æ¯";

            ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);

            //ç»çº¿ 
            //Total();

        }





        #endregion





        #region  //æå°è®¾ç½®



        GridppReport Report;

        string sBarCode = "";



        //é¢è§

        int CurRows = 0;

        


        
 


        


        #endregion





        #region çé¢æ§ä»¶å¤ç



        private void cmdHDeptID_Click(object sender, EventArgs e)

        {

            SCM.ClsIF_Department_View oDept = new SCM.ClsIF_Department_View();

            string sWhere = "";

            if (oDept.RefreshView(sWhere))

            {

                this.txtHDeptID.Text = oDept.oModel.HName;

                this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString(); 
            }

            else

            {

                this.txtHDeptID.Text = ""; 
            }

        }



        private void txtHDeptID_TextChanged(object sender, EventArgs e)

        {

            BLL.ClsPub_BLL.Sub_ClearText(txtHDeptID);

        }



        #endregion





        //éæ©æºå

        private void cmdHSourceBillNo_Click(object sender, EventArgs e)

        {

            Gy_SourceBillList_Touch oGy_SourceBillList_Touch = new Gy_SourceBillList_Touch();

            oGy_SourceBillList_Touch.HSourceBillType = HSourceBillType;//ç±»ååç§°

            oGy_SourceBillList_Touch.ShowDialog();

            if (oGy_SourceBillList_Touch.OKTag == 1)

            {

                //æ ¹æ®éä¸çæºååç åååç ï¼è¿åç¸åºä¿¡æ¯

                HSourceEntryID = oGy_SourceBillList_Touch.HSelEntryID;

                HSourceInterID = oGy_SourceBillList_Touch.HSelInterID;

                HSourceBillTypeID = oGy_SourceBillList_Touch.HSourceBillTypeID;

                HSourceBillNo = oGy_SourceBillList_Touch.HSourceBillNo;

                Display(HSourceBillType, oGy_SourceBillList_Touch.HSelInterID, oGy_SourceBillList_Touch.HSelEntryID);

            }

            else

            {

                HSourceEntryID = 0;

                HSourceInterID = 0;

                HSourceBillTypeID = "";

                HSourceBillNo = "";

            }

        }



        //

        private void cmdCancel_Click(object sender, EventArgs e)

        {

            CloseCom();

            this.Close();

        }



        private void label19_Click(object sender, EventArgs e)

        {



        }



        public bool SaveBill(string sType)

        {

            try

            {

                int LSHlen = 2;             //æµæ°´å·é¿åº¦

                int SumLen = 10;            //æ»é¿åº¦

                string TM = "";             //æ¡ç 

                string HNumber = "";        //ç©æä»£ç 

                double HSumQty = 0;         //äº§åæ°é

                double HMinQty = 0;         //æå°åè£æ°

                int HBQty = 0;              //ç®±æ°

                double HQty = 0;            //æ°é

                string WeiShu = "";         //å°¾æ°

                int LSH = 0;                //æµæ°´å·

                string LSH2 = "";           //æµæ°´å·è½¬æ¢æåç¬¦

                string sDate = "";          //æ¥æ

                string sYear = "";          //å¹´

                string sPeriod = "";        //æ

                string sDay = "";           //æ¥

                string HBatchNo = "";       //æ¹æ¬¡

                int k = 0;

                int n = 0;                  //åä¸æ¹çææ¡ç ä¸çç¬¬å æ¡ 
                string sTMNumber = "";      //æ¡ç èªå®ä¹åç¼

                DataSet Ds;

                //

                string HWei = "";      //å°¾æ°

                HBarCode = "";

                string HBarCodeType = "";

                Int64 HMaterID = 0;

                Int64 HAuxPropID = 0;

                Int64 HUnitID = 0;

                double HQty2 = 0;

                string HBatchNo2 = "";

                Int64 HSupID = 0;

                Int64 HGroupID = 0;

                int HPrintQty = 0;

                Int64 HBarcodeNo = 0;       //æå·

                Int64 HBarcodeQtys = 0;     //æ»ææ°

                Int64 HDeptID = 0;

                Int64 HWhID = 0;

                Int64 HSPID = 0;

                string HRemark = "";

                string HMaterName = "";

                string HMaterModel = "";

                string HPinfan = "";

                string HMTONo = "";

                Int64 HCusID = 0;

                string HCusType = "";

                DateTime HEndDate;

                string HWorkLineName = "";

                DateTime HBeginDate;

                string HSeOrderBillNo = "";

                string HJiaYe2 = "";

                string HPressModel = "";

                string HCusModel = "";

                string HMaterialModel = "";

                string HColor = "";

                string HLogo = "";

                string HPackageSize = "";

                double HMaterialJQty = 0;

                double HMaterialMQty = 0;

                string HCustomBatchNo = "";

                string HGBBarCode = "";

                string POOrderBillNo = "";

                //

                cmdHSaveBill.Enabled = false;

                //å¤ææ¯å¦åå¨ æºåä¿¡æ¯ï¼

                if (HSourceInterID <= 0 || HSourceEntryID <= 0 || DBUtility.ClsPub.isLong(txtHMaterName.Tag) <= 0 || DBUtility.ClsPub.isLong(txtHUnitName.Tag) <= 0)//å¤ææ¯å¦ææºå

                {

                    MessageBox.Show("æ²¡æéåï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) >= 0)

                {

                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1); //å®éç±³æ°= å½åç±³æ°-å¼å§ç±³æ°

                    lblHRelQty.Text = txtHSJQty.Text;

                }

                else

                {

                    if (MessageBox.Show("å½åç±³æ°å°äºå¼å§ç±³æ°ï¼æ¯å¦ç¡®å®è¦æ¸é¶å¼å§ç±³æ°", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)

                    {

                        txtHKSQty.Text = "0";

                        txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //å®éç±³æ°= å½åç±³æ°-å¼å§ç±³æ°

                        lblHRelQty.Text = txtHSJQty.Text;

                    }

                }

                if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) <= 0)

                {

                    MessageBox.Show("å½åæ°éä¸è½å°äºçäº0ï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                //if (DBUtility.ClsPub.isDoule(txtHSYQty.Text) <= 0)

                //{

                //    MessageBox.Show("å©ä½æ°éå·²ç»ä¸º0ï¼ä¸è½å¨è£åï¼");

                //    cmdHSaveBill.Enabled = true;

                //    return false;

                //}

                if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0 ) 
                {

                    MessageBox.Show("èå1æèèå2æ²¡æéæ©ï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0 )

                {

                    MessageBox.Show("çç»æ²¡æéæ©ï¼");

                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                


                //æ ¹æ®æºå çææ¡å½¢ç  å¹¶ä¿åå¦æ°æ®åº

                HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);

                HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);

                sDate = dtpHDate.Value.ToShortDateString();

                sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);

                sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();

                sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);

                sDay = "0" + ClsPub.isDate(sDate).Day.ToString();

>>>>>>> parent of d95a654 (nothing)

                sDay = sDay.Substring(sDay.Length - 2, 2);



                //æ¡ç åç¼ = ç»ç»ä»£ç  + ç©æåç  + å¹´ + æ + æ¥

@@ -1224,11 +680,11 @@
                            + ",'" + HPressModel + "','" + HCusModel + "','" + HMaterialModel + "','" + HColor + "','" + sDate + "'"

                            + ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"

                            + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"

                            + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag) 
                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','"+ txtHReasonList.Text + "','"+ HRemark + "')";

                            + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)

                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','" + HRemark + "')";

                oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);



                


                //å·æ°çé¢

                DisplayMain();

                //DisplaySub();  

@@ -1242,7 +698,7 @@
                {

                    Report.Print(false);

                }

                


                Thread.Sleep(500);



                if (HSourceBillType != "çäº§æ±æ¥å")

@@ -1275,7 +731,7 @@
        private void Sub_SetReport(string sOpenTmp)

        {

            //å¤æè¡æ°

 


            Report = new GridppReport();

            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .

            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);

@@ -1380,7 +836,7 @@
        {

            if (!ComDevice.IsOpen)

            {

                


                try

                {

                    ComDevice.PortName = txtPortName.Text;

@@ -1405,7 +861,7 @@
                        default:

                            break;

                    }

                  


                    ComDevice.DataBits = int.Parse(txtDataBits.Text);

                    switch (cmbStopBits.SelectedItem.ToString())

                    {

@@ -1424,14 +880,14 @@
                        default:

                            break;

                    }

                    
                    ComDevice.Open(); 


                    ComDevice.Open();

                    lblComStatus.Text = "ä¸²å£ç¶æï¼å¼å¯";

                    timer3.Enabled = true;

                }

                catch (Exception ex)

                {

                    MessageBox.Show("æå¼ä¸²å£å¤±è´¥ï¼" + ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                    MessageBox.Show("æå¼ä¸²å£å¤±è´¥ï¼" + ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error);

                    return;

                }

            }

@@ -1472,19 +928,19 @@
        {

            if (!ComDevice.IsOpen)

            {

                 


            }

            else

            {

                try

                {

                    ComDevice.Close(); 
                    ComDevice.Close();

                    lblComStatus.Text = "ä¸²å£ç¶æï¼å³é";

                    timer3.Enabled = false;

                }

                catch (Exception ex)

                {

                    MessageBox.Show(ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                    MessageBox.Show(ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error);

                    return;

                }

            }

@@ -1493,7 +949,7 @@
        //è®¾å¤æ¸é¶

        private void cmdHSetZero_Click(object sender, EventArgs e)

        {

            cmdHSetZero.Enabled=false;

            cmdHSetZero.Enabled = false;

            byte[] sendData = strToHexByte(txtHSend0.Text);

            SendData(sendData);

            txtHSJQty.Text = "0";

@@ -1521,13 +977,13 @@
        }





         /// <summary>

        /// <summary>

        /// åéæ°æ®

        /// </summary>

        /// <param name="sender"></param>

        /// <param name="data"></param>

        public bool SendData(byte[] data)

        { 
        {

            if (ComDevice.IsOpen)

            {

                try

@@ -1537,7 +993,7 @@
                }

                catch (Exception ex)

                {

                    MessageBox.Show(ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                    MessageBox.Show(ex.Message, "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error);

                }

                finally

                {

@@ -1546,7 +1002,7 @@
            }

            else

            {

                MessageBox.Show("ä¸²å£æªæå¼", "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                MessageBox.Show("ä¸²å£æªæå¼", "éè¯¯", MessageBoxButtons.OK, MessageBoxIcon.Error);

            }

            return false;

        }

@@ -1607,7 +1063,7 @@
        //            {

        //                newStr = strArr[4];

        //            }

                  


        //        }

        //        if (string.IsNullOrEmpty(newStr))

        //        {

@@ -1678,7 +1134,7 @@
                if (strArr[4] != "00")

                {

                    char[] bw = strArr[4].ToCharArray();

                    if(bw[0]=='0')

                    if (bw[0] == '0')

                    {

                        newStr = bw[1].ToString();

                    }

@@ -1686,7 +1142,7 @@
                    {

                        newStr = strArr[4];

                    }

                    


                }

                if (string.IsNullOrEmpty(newStr))

                {

@@ -1704,12 +1160,12 @@
                {

                    newStr += strArr[5];

                }

                if (strArr[6] != "00"&&newStr=="00")

                if (strArr[6] != "00" && newStr == "00")

                {

                    //newStr = $"0.{strArr[6]}";

                    newStr = "0." + strArr[6];

                }

                if(strArr[6]!="00"&&newStr!="00")

                if (strArr[6] != "00" && newStr != "00")

                {

                    //newStr += $".{strArr[6]}";

                    newStr = newStr + "." + strArr[6];

@@ -1722,7 +1178,7 @@




            //å°å½åæ°   åç±³ è½¬åä¸º ç±³

            double NewQty = DBUtility.ClsPub.isDoule(newStr) ;

            double NewQty = DBUtility.ClsPub.isDoule(newStr);

            if (NewQty <= 0)

            {

                newStr = "0";

@@ -1740,12 +1196,12 @@
                lblHRelQty.Text = txtHSJQty.Text;

            }

            else

            { 
            {

                txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //å®éç±³æ°= å½åç±³æ°-å¼å§ç±³æ°

                lblHRelQty.Text = txtHSJQty.Text; 
                lblHRelQty.Text = txtHSJQty.Text;

            }

        }

        


        //å é¤éä¸çè¡æ°

        private void btnFQSH_Click(object sender, EventArgs e)

        {

@@ -1774,10 +1230,10 @@
                    if (lngBillKey == 0)

                        return;

                    try

                    { 
                    {

                        oWeb.getRunProc("Delete from Gy_BarCodeBill where HItemID=" + lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);

                        oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','å é¤æ¡ç ï¼" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("æ¡å½¢ç ")].Value) + "' ,'WMSç³»ç»','','å é¤')", ref DBUtility.ClsPub.sExeReturnInfo);

       


                    }

                    catch (Exception e)

                    {

@@ -1798,7 +1254,7 @@
        }



        private void cmdHSaveInfo_Click(object sender, EventArgs e)

        { 
        {

            ClsIni.WriteIni("COMINFO", "txtPortName", DBUtility.ClsPub.isStrNull(txtPortName.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            ClsIni.WriteIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.isStrNull(txtBaudRate.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            ClsIni.WriteIni("COMINFO", "cmbParity", DBUtility.ClsPub.isStrNull(cmbParity.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

@@ -1807,7 +1263,7 @@
            ClsIni.WriteIni("COMINFO", "txtHSend0", DBUtility.ClsPub.isStrNull(txtHSend0.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            ClsIni.WriteIni("COMINFO", "txtHSend", DBUtility.ClsPub.isStrNull(txtHSend.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            ClsIni.WriteIni("COMINFO", "txtHSourceID", DBUtility.ClsPub.isStrNull(txtHSourceID.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            ClsIni.WriteIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.isStrNull(txtHSourceID.Tag), DBUtility.ClsPub.AppPath + @"/HXERP.ini"); 
            ClsIni.WriteIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.isStrNull(txtHSourceID.Tag), DBUtility.ClsPub.AppPath + @"/HXERP.ini");

        }



        private void btnBLHB_Click(object sender, EventArgs e)

@@ -1920,7 +1376,7 @@
                txtHReasonList.Text = "";

                return false;

            }

            catch(Exception e1)

            catch (Exception e1)

            {

                MessageBox.Show(e1.Message);

                return false;

@@ -1965,12 +1421,12 @@
                    MessageBox.Show("ä¿åä¸è¯åå å¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo);

                }

            }

            


        }



        private void cmdHGroupID_Click(object sender, EventArgs e)

        {

            SCM.ClsIF_Group_View oGroup= new SCM.ClsIF_Group_View();

            SCM.ClsIF_Group_View oGroup = new SCM.ClsIF_Group_View();

            string sWhere = "";

            if (oGroup.RefreshView(sWhere))

            {

			@@ -13,8 +13,6 @@
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}"
			EndProject
			Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBUtility", "DBUtility\DBUtility.csproj", "{F2098F1B-4FA1-49BB-91EA-AB3522008F28}"
			EndProject
			Global
			GlobalSection(SolutionConfigurationPlatforms) = preSolution
			Debug\|Any CPU = Debug\|Any CPU
			@@ -80,18 +78,6 @@
			{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release\|Mixed Platforms.ActiveCfg = Release\|Any CPU
			{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release\|Mixed Platforms.Build.0 = Release\|Any CPU
			{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release\|x86.ActiveCfg = Release\|Any CPU
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|Mixed Platforms.ActiveCfg = Debug\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|Mixed Platforms.Build.0 = Debug\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|x86.ActiveCfg = Debug\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Debug\|x86.Build.0 = Debug\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|Any CPU.Build.0 = Release\|Any CPU
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|Mixed Platforms.ActiveCfg = Release\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|Mixed Platforms.Build.0 = Release\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|x86.ActiveCfg = Release\|x86
			{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release\|x86.Build.0 = Release\|x86
			EndGlobalSection
			GlobalSection(SolutionProperties) = preSolution
			HideSolutionNode = FALSE

			@@ -64,18 +64,8 @@
			whereBuilder.Append(" and d.FNUMBER like ''%"+textBox1.Text+"%''");
			if (!string.IsNullOrEmpty(textBox2.Text))
			whereBuilder.Append(" and b.FLOT_TEXT like ''%"+textBox2.Text+"%''");
			if (comboBox1.Text != "å¨é¨")
			{
			if(comboBox1.Text=="åæ ¼å")
			{
			whereBuilder.Append(" and c.HProdLev=''''");
			}
			else
			{
			whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text + "''");
			}

			}
			if(comboBox1.Text!="å¨é¨")
			whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text+"''");
			if (!string.IsNullOrEmpty(textBox4.Text))
			whereBuilder.Append(" and g.HName like ''%"+textBox4.Text+"%''");
			if (!string.IsNullOrEmpty(textBox5.Text))