雅琪诺MES智能条码管理系统
ouyangqing
2021-01-13 b0c9966e0ed10d5e1e09e7a31e3b06bddff75696
单据字段修改
5个文件已修改
114 ■■■■■ 已修改文件
SCM/Web References/WMSWeb/Reference.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Gy_SourceBillList_Touch.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Gy_SourceBillList_Touch.designer.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Gy_SourceBillList_Touch.resx 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Sc_ICMOReportToBarCode.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/Web References/WMSWeb/Reference.cs
@@ -26959,7 +26959,7 @@
        private long hYearField;
        
        private long hPeriodField;
        public string HBarCode { get; set; }
        private long hSManagerIDField;
        
        private long hFManagerIDField;
@@ -34465,7 +34465,7 @@
        private long hICMOInterIDField;
        
        private string hICMOBillNoField;
        public string HBarCode { get; set; }
        private double hInStockQtyField;
        
        private double hCheckQtyField;
SCM/µ¥¾Ý×ÊÁÏ/Gy_SourceBillList_Touch.cs
@@ -292,7 +292,20 @@
                txtHBarCode.SelectAll(); 
            }
        }
        private void grdMain_RowPrePaint(object sender, DataGridViewRowPrePaintEventArgs e)
        {
            if (e.RowIndex >= grdMain.Rows.Count - 1)
                return;
            DataGridViewRow dr = (sender as DataGridView).Rows[e.RowIndex];
            var rowIndex= DBUtility.Xt_BaseBillFun.Fun_GetCol("未关联数量", grdMain);
            var passNumStr = dr.Cells[12].Value.ToString().Trim();//获取数量
            if (string.IsNullOrEmpty(passNumStr))
                return;
            if(decimal.Parse(passNumStr)<=0)
            {
                // è®¾ç½®å•元格的背景色
                dr.DefaultCellStyle.BackColor = Color.Green;
            }
        }
    }
}
SCM/µ¥¾Ý×ÊÁÏ/Gy_SourceBillList_Touch.designer.cs
@@ -35,6 +35,8 @@
            this.grdPrint = new System.Windows.Forms.DataGridView();
            this.grdSum = new System.Windows.Forms.DataGridView();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
            this.pictureBox1 = new System.Windows.Forms.PictureBox();
            this.btnTC = new System.Windows.Forms.Button();
@@ -50,8 +52,6 @@
            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
            this.bclk = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
            this.groupBox1.SuspendLayout();
@@ -78,6 +78,7 @@
            this.grdPrint.Location = new System.Drawing.Point(1029, 182);
            this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
            this.grdPrint.Name = "grdPrint";
            this.grdPrint.RowHeadersWidth = 51;
            this.grdPrint.RowTemplate.Height = 23;
            this.grdPrint.Size = new System.Drawing.Size(33, 30);
            this.grdPrint.TabIndex = 8;
@@ -94,6 +95,7 @@
            this.grdSum.Margin = new System.Windows.Forms.Padding(4);
            this.grdSum.Name = "grdSum";
            this.grdSum.ReadOnly = true;
            this.grdSum.RowHeadersWidth = 51;
            this.grdSum.RowTemplate.Height = 23;
            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
            this.grdSum.Size = new System.Drawing.Size(1535, 24);
@@ -119,6 +121,27 @@
            this.groupBox1.Size = new System.Drawing.Size(1535, 161);
            this.groupBox1.TabIndex = 50;
            this.groupBox1.TabStop = false;
            //
            // txtHBarCode
            //
            this.txtHBarCode.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.Location = new System.Drawing.Point(391, 90);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(311, 49);
            this.txtHBarCode.TabIndex = 16;
            this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
            //
            // label3
            //
            this.label3.AutoSize = true;
            this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label3.Location = new System.Drawing.Point(164, 93);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(165, 37);
            this.label3.TabIndex = 15;
            this.label3.Text = "批次码:";
            // 
            // txtHSourceBillNo
            // 
@@ -210,11 +233,13 @@
            this.grdMain.Margin = new System.Windows.Forms.Padding(4);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 51;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1535, 694);
            this.grdMain.TabIndex = 19;
            this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
            this.grdMain.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.grdMain_RowPrePaint);
            this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
            this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
            // 
            // Tool
            // 
@@ -288,27 +313,6 @@
            this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
            //
            // txtHBarCode
            //
            this.txtHBarCode.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.Location = new System.Drawing.Point(391, 90);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(311, 49);
            this.txtHBarCode.TabIndex = 16;
            this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
            //
            // label3
            //
            this.label3.AutoSize = true;
            this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label3.Location = new System.Drawing.Point(164, 93);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(165, 37);
            this.label3.TabIndex = 15;
            this.label3.Text = "批次码:";
            // 
            // Gy_SourceBillList_Touch
            // 
SCM/µ¥¾Ý×ÊÁÏ/Gy_SourceBillList_Touch.resx
@@ -112,18 +112,18 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>102, 16</value>
  </metadata>
  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>191, 16</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAQUAAAEFCAYAAADqlvKRAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -234,7 +234,7 @@
        X8dcGLw8yCBGAAAAAElFTkSuQmCC
</value>
  </data>
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>281, 16</value>
  </metadata>
  <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -503,7 +503,7 @@
        AAAASUVORK5CYII=
</value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>37</value>
  </metadata>
</root>
SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs
@@ -670,7 +670,7 @@
                            ",HLogo,HPackageSize,HMaterialJQty,HMaterialMQty,HCustomBatchNo " +
                            ",HSTOCKORGID,HOWNERID,HBeginDate,HSeOrderBillNo,HGBBarCode " +
                            ",POOrderBillNo,HSourceID " +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo " +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HBadReasonList,HProdLev " +
                            ") values ("
                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -681,7 +681,7 @@
                            + ",'" + 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 + "')";
                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','"+ txtHReasonList.Text + "','"+ HRemark + "')";
                oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);
                
@@ -1367,6 +1367,7 @@
                oQC_NoPassProdCheckBillMain.HGroupName = "";
                oQC_NoPassProdCheckBillMain.HOrderProcNo = "";
                oQC_NoPassProdCheckBillMain.HProcExchQty = 0;
                oQC_NoPassProdCheckBillMain.HBarCode = HBarCode;
                if (oWeb.set_SaveNoPassProdCheckBill_New(oQC_NoPassProdCheckBillMain, HSourceBillTypeID, txtHReasonList.Text.Trim(), ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    txtHReasonList.Text = "";
@@ -1399,10 +1400,28 @@
        private void cmdSaveAndDown_Click(object sender, EventArgs e)
        {
            if (SaveBill("SaveDown"))
            Gy_BadReasonList oGy_BadReasonList = new Gy_BadReasonList();
            oGy_BadReasonList.ShowDialog();
            if (oGy_BadReasonList.ISOK == 1)
            {
                txtHKSQty.Text = txtHDQQty.Text;//继续裁切,将当前米数作为开始米数;
                txtHReasonList.Text = "";
                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
                oGy_BadReasonList = null;
                if (SaveBill("SaveDown"))
                {
                    txtHKSQty.Text = txtHDQQty.Text;//继续裁切,将当前米数作为开始米数;
                }
                if (SaveBadReasonBill())
                {
                    MessageBox.Show("保存不良原因成功!");
                    DisplayMain();
                }
                else
                {
                    MessageBox.Show("保存不良原因失败!" + DBUtility.ClsPub.sExeReturnInfo);
                }
            }
        }
        private void cmdHGroupID_Click(object sender, EventArgs e)