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

ouyangqing

2021-01-20 2ed56f20b4c7dfa787587b414d2f34d88bf16301

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

 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

@@ -65,17 +65,7 @@
            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 (!string.IsNullOrEmpty(textBox4.Text))

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

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


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

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

using System;

using System.Collections.Generic;

using System.ComponentModel;

using System.Data;

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



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

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

                txtHReasonList.Text = "";

                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;

                txtHCheckerResult.Text = "";

                txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;

                if (SaveBadReasonBill())

                {

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

@@ -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"))

                {


 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>