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

ouyangqing

2021-01-20 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3

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

 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/µ¥¾Ý×ÊÁÏ/Gy_BarCodeMain.Designer.cs

@@ -48,14 +48,12 @@
            this.lbldj = new System.Windows.Forms.Label();
            this.lblCaption = new System.Windows.Forms.Label();
            this.Tool = new System.Windows.Forms.ToolStrip();
            this.yl = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
            this.cx = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
            this.tc = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
            this.comboBox1 = new System.Windows.Forms.ComboBox();
            this.label8 = new System.Windows.Forms.Label();
            this.yl = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.groupBox1.SuspendLayout();
            this.pPic.SuspendLayout();
@@ -71,7 +69,7 @@
            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdMain.Location = new System.Drawing.Point(0, 232);
            this.grdMain.Margin = new System.Windows.Forms.Padding(4);
            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 51;
@@ -82,8 +80,6 @@
            // groupBox1
            // 
            this.groupBox1.BackColor = System.Drawing.Color.Lavender;
            this.groupBox1.Controls.Add(this.comboBox1);
            this.groupBox1.Controls.Add(this.label8);
            this.groupBox1.Controls.Add(this.dateTimePicker2);
            this.groupBox1.Controls.Add(this.dateTimePicker1);
            this.groupBox1.Controls.Add(this.label9);
@@ -96,9 +92,9 @@
            this.groupBox1.Controls.Add(this.label4);
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
            this.groupBox1.Location = new System.Drawing.Point(0, 103);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.groupBox1.Size = new System.Drawing.Size(1277, 129);
            this.groupBox1.TabIndex = 56;
            this.groupBox1.TabStop = false;
@@ -146,7 +142,7 @@
            // textBox2
            // 
            this.textBox2.Location = new System.Drawing.Point(628, 75);
            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
            this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.textBox2.Name = "textBox2";
            this.textBox2.Size = new System.Drawing.Size(172, 25);
            this.textBox2.TabIndex = 16;
@@ -164,7 +160,7 @@
            // textBox1
            // 
            this.textBox1.Location = new System.Drawing.Point(365, 75);
            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
            this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.textBox1.Name = "textBox1";
            this.textBox1.Size = new System.Drawing.Size(172, 25);
            this.textBox1.TabIndex = 14;
@@ -182,7 +178,7 @@
            // txtHBillNo
            // 
            this.txtHBillNo.Location = new System.Drawing.Point(96, 76);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBillNo.Name = "txtHBillNo";
            this.txtHBillNo.Size = new System.Drawing.Size(172, 25);
            this.txtHBillNo.TabIndex = 12;
@@ -206,7 +202,7 @@
            this.pPic.Controls.Add(this.lblCaption);
            this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
            this.pPic.Location = new System.Drawing.Point(0, 62);
            this.pPic.Margin = new System.Windows.Forms.Padding(4);
            this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.pPic.Name = "pPic";
            this.pPic.Size = new System.Drawing.Size(1277, 41);
            this.pPic.TabIndex = 55;
@@ -217,7 +213,7 @@
            this.panel1.Controls.Add(this.lbldj);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
            this.panel1.Location = new System.Drawing.Point(1096, 0);
            this.panel1.Margin = new System.Windows.Forms.Padding(4);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(181, 41);
            this.panel1.TabIndex = 7;
@@ -276,25 +272,6 @@
            this.Tool.TabIndex = 54;
            this.Tool.Text = "toolStrip1";
            // 
            // yl
            // 
            this.yl.AutoSize = false;
            this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
            this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.yl.Name = "yl";
            this.yl.Size = new System.Drawing.Size(35, 42);
            this.yl.Text = "引出";
            this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            this.yl.Click += new System.EventHandler(this.yl_Click);
            // 
            // toolStripSeparator1
            // 
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
            // 
            // cx
            // 
            this.cx.AutoSize = false;
@@ -334,28 +311,24 @@
            this.toolStripSeparator9.Name = "toolStripSeparator9";
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
            // 
            // comboBox1
            // yl
            // 
            this.comboBox1.FormattingEnabled = true;
            this.comboBox1.Items.AddRange(new object[] {
            "全部",
            "已检验",
            "未检验"});
            this.comboBox1.Location = new System.Drawing.Point(907, 75);
            this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.comboBox1.Name = "comboBox1";
            this.comboBox1.Size = new System.Drawing.Size(172, 23);
            this.comboBox1.TabIndex = 35;
            this.yl.AutoSize = false;
            this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
            this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.yl.Name = "yl";
            this.yl.Size = new System.Drawing.Size(35, 42);
            this.yl.Text = "引出";
            this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            this.yl.Click += new System.EventHandler(this.yl_Click);
            // 
            // label8
            // toolStripSeparator1
            // 
            this.label8.AutoSize = true;
            this.label8.Location = new System.Drawing.Point(818, 80);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(82, 15);
            this.label8.TabIndex = 34;
            this.label8.Text = "检验状况：";
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
            // 
            // Gy_BarCodeMain
            // 
@@ -408,7 +381,5 @@
        private System.Windows.Forms.Label label11;
        private System.Windows.Forms.ToolStripButton yl;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
        private System.Windows.Forms.ComboBox comboBox1;
        private System.Windows.Forms.Label label8;
    }
}

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

@@ -16,7 +16,6 @@
            InitializeComponent();
            dateTimePicker1.Text = DateTime.Now.AddDays(-7).ToString();
            dateTimePicker2.Text = DateTime.Now.ToString();
            comboBox1.SelectedItem = "全部";
            oWeb.Url = SCM.ClsPub1.WEBSURL;
        }
        public frmBillQueryCondition_Base frmCondition;
@@ -50,10 +49,6 @@
                whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''");
            if (!string.IsNullOrEmpty(textBox2.Text))
                whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''");
            if (comboBox1.Text == "已检验")
                whereBuilder.Append(" and c.HMaterName is not null");
            else if(comboBox1.Text=="未检验")
                whereBuilder.Append(" and c.HMaterName is null");
            var execSql = "exec "+ViewName+" '"+whereBuilder+"'";
            DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题

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

@@ -1,4 +1,4 @@
using System;

using System;

using System.Collections.Generic;

using System.ComponentModel;

using System.Data;

@@ -68,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();

@@ -77,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;

@@ -114,7 +114,7 @@
        //时间控件

        private void timer1_Tick(object sender, EventArgs e)

        {

            timer1.Enabled=false;

            timer1.Enabled = false;

            Sub_ClearBill();

        }



@@ -122,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");

@@ -244,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);

                }

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

                //DisplaySub();

            }

            catch(Exception e)

            catch (Exception e)

            {

                MessageBox.Show("读取失败！" + e.Message);

            }

@@ -268,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);

            //生成首行标题

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

            }

            //

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

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

            {

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

            }

@@ -297,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);

            }

@@ -315,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);

            //生成首行标题

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


        //预览

        int CurRows = 0;

        


        
 


        










        #endregion



@@ -366,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 = "";

            }

        }



@@ -517,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);

@@ -552,12 +552,10 @@
                else if (sType == "Sample")

                {

                    sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text) + "B";

                    txtHCheckerResult.Text = "";

                }

                else

                {

                    sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);

                    txtHCheckerResult.Text = "";

                }

                //sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);



@@ -682,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();  

@@ -700,7 +698,7 @@
                {

                    Report.Print(false);

                }

                


                Thread.Sleep(500);



                if (HSourceBillType != "生产汇报单")

@@ -733,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);

@@ -774,7 +772,6 @@
                Report.FieldByName("组员").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text);

                Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);

                Report.FieldByName("旧物料编码").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text);

                Report.FieldByName("不良原因").AsString = ClsPub.isStrNull(txtHCheckerResult.Text);

                //Report.FieldByName("源单单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);

                //Report.FieldByName("销售订单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);

                //Report.FieldByName("生产车间").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);

@@ -839,7 +836,7 @@
        {

            if (!ComDevice.IsOpen)

            {

                


                try

                {

                    ComDevice.PortName = txtPortName.Text;

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

                            break;

                    }

                  


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

                    switch (cmbStopBits.SelectedItem.ToString())

                    {

@@ -883,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;

                }

            }

@@ -931,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;

                }

            }

@@ -952,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";

@@ -980,13 +977,13 @@
        }





         /// <summary>

        /// <summary>

        /// å‘送数据

        /// </summary>

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

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

        public bool SendData(byte[] data)

        { 
        {

            if (ComDevice.IsOpen)

            {

                try

@@ -996,7 +993,7 @@
                }

                catch (Exception ex)

                {

                    MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                    MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);

                }

                finally

                {

@@ -1005,7 +1002,7 @@
            }

            else

            {

                MessageBox.Show("串口未打开", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); 
                MessageBox.Show("串口未打开", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);

            }

            return false;

        }

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

        //                newStr = strArr[4];

        //            }

                  


        //        }

        //        if (string.IsNullOrEmpty(newStr))

        //        {

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

                {

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

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

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

                    {

                        newStr = bw[1].ToString();

                    }

@@ -1145,7 +1142,7 @@
                    {

                        newStr = strArr[4];

                    }

                    


                }

                if (string.IsNullOrEmpty(newStr))

                {

@@ -1163,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];

@@ -1181,7 +1178,7 @@




            //将当前数   åŽ˜ç±³ è½¬åŒ–为 ç±³

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

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

            if (NewQty <= 0)

            {

                newStr = "0";

@@ -1199,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)

        {

@@ -1233,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)

                    {

@@ -1257,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");

@@ -1266,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)

@@ -1277,8 +1274,6 @@
            {

                txtHReasonList.Text = "";

                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;

                txtHCheckerResult.Text = "";

                txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;

                if (SaveBadReasonBill())

                {

                    MessageBox.Show("保存不良原因成功！");

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

                return false;

            }

            catch(Exception e1)

            catch (Exception e1)

            {

                MessageBox.Show(e1.Message);

                return false;

@@ -1411,8 +1406,6 @@
            {

                txtHReasonList.Text = "";

                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;

                txtHCheckerResult.Text = "";

                txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;

                oGy_BadReasonList = null;

                if (SaveBill("SaveDown"))

                {

@@ -1428,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))

            {


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

@@ -155,8 +155,6 @@
            this.label12 = new System.Windows.Forms.Label();
            this.button4 = new System.Windows.Forms.Button();
            this.timer3 = new System.Windows.Forms.Timer(this.components);
            this.txtHCheckerResult = new System.Windows.Forms.TextBox();
            this.label33 = new System.Windows.Forms.Label();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -168,7 +166,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.grdEmp)).BeginInit();
            this.groupBox4.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
@@ -893,8 +890,6 @@
            // tabPage4
            // 
            this.tabPage4.BackColor = System.Drawing.Color.Lavender;
            this.tabPage4.Controls.Add(this.label33);
            this.tabPage4.Controls.Add(this.txtHCheckerResult);
            this.tabPage4.Controls.Add(this.label15);
            this.tabPage4.Controls.Add(this.cmbHOrgID);
            this.tabPage4.Controls.Add(this.label3);
@@ -1667,27 +1662,6 @@
            this.timer3.Interval = 300;
            this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
            // 
            // txtHCheckerResult
            // 
            this.txtHCheckerResult.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHCheckerResult.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCheckerResult.Location = new System.Drawing.Point(795, 96);
            this.txtHCheckerResult.Name = "txtHCheckerResult";
            this.txtHCheckerResult.ReadOnly = true;
            this.txtHCheckerResult.Size = new System.Drawing.Size(166, 30);
            this.txtHCheckerResult.TabIndex = 151;
            // 
            // label33
            // 
            this.label33.AutoSize = true;
            this.label33.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label33.ForeColor = System.Drawing.Color.Black;
            this.label33.Location = new System.Drawing.Point(714, 102);
            this.label33.Name = "label33";
            this.label33.Size = new System.Drawing.Size(72, 16);
            this.label33.TabIndex = 152;
            this.label33.Text = "不良清单";
            // 
            // Sc_ICMOReportToBarCode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1724,7 +1698,6 @@
            this.panel1.ResumeLayout(false);
            this.splitContainer1.Panel1.ResumeLayout(false);
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
            this.tabControl1.ResumeLayout(false);
            this.tabPage1.ResumeLayout(false);
@@ -1869,7 +1842,5 @@
        private System.Windows.Forms.TextBox txtHEmpID3;
        private System.Windows.Forms.Button cmdZero;
        private System.Windows.Forms.Button cmdSaveAndDown2;
        private System.Windows.Forms.Label label33;
        private System.Windows.Forms.TextBox txtHCheckerResult;
    }
}

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

@@ -112,15 +112,15 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -387,10 +387,10 @@
        AAAASUVORK5CYII=
</value>
  </data>
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>102, 16</value>
  </metadata>
  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>191, 16</value>
  </metadata>
  <data name="cmdHEmp3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -718,10 +718,10 @@
        FIYcEAA7
</value>
  </data>
  <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>292, 16</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>39</value>
  </metadata>
</root>

 SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs

@@ -92,7 +92,6 @@
        public const Int16 HJiaYeLXCol = 71;
        public const Int16 HJiaYeLCol = 72;
        public const Int16 POOrderBillNoCol = 73;
        public const Int16 HMaker = 74;

        public Int16 HSelectCol = 0;
        public Int16 HSno2Col = 1;
@@ -1538,7 +1537,7 @@
        {
            grdMain.RowCount = 0;
            grdSub.RowCount = 0;
            grdMain.ColumnCount = 75;                       //总列数
            grdMain.ColumnCount = 74;                       //总列数
            ClsPub1.initGridFst(grdMain, this.Name);
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            grdMain.Columns[HMainIDCol].HeaderText = "源单主ID";
@@ -1606,7 +1605,6 @@
            grdMain.Columns[HJiaYeLXCol].HeaderText = "制冷液类型";
            grdMain.Columns[HJiaYeLCol].HeaderText = "加液量";
            grdMain.Columns[POOrderBillNoCol].HeaderText = "采购订单号";
            grdMain.Columns[HMaker].HeaderText = "制单人";
            ////
            //格式化    éšè—åˆ—
            grdMain.Columns[HTagCol].Visible = false;
@@ -2617,7 +2615,6 @@
            grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["备注"].ToString();
            grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["计划跟踪号"].ToString();
            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["最小包装数"].ToString();
            grdMain.Rows[i].Cells[HMaker].Value = ClsPub.CurUserName;

            if (CampanyName == "圣龙") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称
            {

 SCM/Éú²ú¹ÜÀí/Gy_BadReasonList.resx

@@ -112,9 +112,9 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>