完工标记

jingh

2021-06-26 cdbdf555182f57b174f8497effc534e5aa42aa1d

完工标记

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

@@ -830,12 +830,12 @@
                    



                } 

                //当完工标记勾上时 å¹¶ä¸”æ—¶ ç”Ÿäº§æ±‡æŠ¥æ£€éªŒæ—¶ 
                if (HSourceBillType == "生产汇报单" && chkFinishFlag.Checked) //检验分切

                {

                    oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToICMOReportFinishTime   " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + ClsPub.CurUserName + "'", ref DBUtility.ClsPub.sExeReturnInfo);

                    chkFinishFlag.Checked = false;//反写后  æ‰“勾取消

                }

                ////当完工标记勾上时 å¹¶ä¸”æ—¶ ç”Ÿäº§æ±‡æŠ¥æ£€éªŒæ—¶ 
                //if (HSourceBillType == "生产汇报单" && chkFinishFlag.Checked) //检验分切

                //{

                //    oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToICMOReportFinishTime   " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + ClsPub.CurUserName + "'", ref DBUtility.ClsPub.sExeReturnInfo);

                //    chkFinishFlag.Checked = false;//反写后  æ‰“勾取消

                //}

                    

                //刷新界面

                DisplayMain();

@@ -1496,6 +1496,10 @@
                {

                    txtHBadQty.Text = oGy_BadReasonList.txtHBadQty.Text;

                }

                else

                {

                    txtHBadQty.Text = oGy_BadReasonList.txtHBadQty.Text;

                }

                if (SaveBadReasonBill())

                {

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

@@ -1583,10 +1587,10 @@
                }

                else

                {

                    oQC_NoPassProdCheckBillMain.HBadQty = DBUtility.ClsPub.isDoule(txtHDQQty.Text);

                    oQC_NoPassProdCheckBillMain.HBadQty = DBUtility.ClsPub.isDoule(txtHBadQty.Text);

                    oQC_NoPassProdCheckBillMain.HNote = "在线检验";

                }

                oQC_NoPassProdCheckBillMain.HPlanQty = 0;

                oQC_NoPassProdCheckBillMain.HPlanQty = DBUtility.ClsPub.isDoule(txtHDQQty.Text);

                oQC_NoPassProdCheckBillMain.HBadPNL = 0;

                oQC_NoPassProdCheckBillMain.HPlanPNL = 0;

                oQC_NoPassProdCheckBillMain.HFirstCheckEmp = 0;

@@ -1838,5 +1842,35 @@
                txtHKSQty.Text = txtHDQQty.Text;//继续裁切，将当前米数作为开始米数；

            }

        }



        private void cmdFinish_Click(object sender, EventArgs e)

        {

            //当 ç”Ÿäº§æ±‡æŠ¥æ£€éªŒæ—¶ 
            if (HSourceBillType == "生产汇报单" ) //检验分切

            {

                oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToICMOReportFinishTime   " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + ClsPub.CurUserName + "'", ref DBUtility.ClsPub.sExeReturnInfo);

                //chkFinishFlag.Checked = false;//反写后  æ‰“勾取消

                MessageBox.Show("完工操作成功！");

            }

            else

            {

                MessageBox.Show("成品检验才能点击完工!");

            }

        }



        private void cmdReWork_Click(object sender, EventArgs e)

        {

            //当 ç”Ÿäº§æ±‡æŠ¥æ£€éªŒæ—¶ 
            if (HSourceBillType == "生产汇报单") //检验分切

            {

                oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToICMOReportReWorkTime   " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + ClsPub.CurUserName + "'", ref DBUtility.ClsPub.sExeReturnInfo);

                //chkFinishFlag.Checked = false;//反写后  æ‰“勾取消

                MessageBox.Show("返工操作成功！");

            }

            else

            {

                MessageBox.Show("成品检验才能点击返工!");

            }

        }

    }

}

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

@@ -126,9 +126,9 @@
            this.label33 = new System.Windows.Forms.Label();
            this.groupBox4 = new System.Windows.Forms.GroupBox();
            this.panel1 = new System.Windows.Forms.Panel();
            this.chkFinishFlag = new System.Windows.Forms.CheckBox();
            this.cmdSaveAndDown2 = new System.Windows.Forms.Button();
            this.cmdSaveAndDown = new System.Windows.Forms.Button();
            this.cmdHWaitList = new System.Windows.Forms.Button();
            this.cmdSaveAndNext = new System.Windows.Forms.Button();
            this.cmdHSourceBillNo = new System.Windows.Forms.Button();
            this.cmdHSetZero = new System.Windows.Forms.Button();
@@ -139,6 +139,7 @@
            this.lblHNowQty = new System.Windows.Forms.Label();
            this.cmdHSaveBill = new System.Windows.Forms.Button();
            this.cmdDel = new System.Windows.Forms.Button();
            this.cmdHWaitList = new System.Windows.Forms.Button();
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -162,7 +163,8 @@
            this.label12 = new System.Windows.Forms.Label();
            this.button4 = new System.Windows.Forms.Button();
            this.timer3 = new System.Windows.Forms.Timer(this.components);
            this.chkFinishFlag = new System.Windows.Forms.CheckBox();
            this.cmdFinish = new System.Windows.Forms.Button();
            this.cmdReWork = new System.Windows.Forms.Button();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -323,6 +325,7 @@
            // gbUp
            // 
            this.gbUp.BackColor = System.Drawing.Color.Transparent;
            this.gbUp.Controls.Add(this.chkFinishFlag);
            this.gbUp.Controls.Add(this.tabControl3);
            this.gbUp.Controls.Add(this.groupBox4);
            this.gbUp.Controls.Add(this.cmdHSaveBill);
@@ -1375,7 +1378,8 @@
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.chkFinishFlag);
            this.panel1.Controls.Add(this.cmdReWork);
            this.panel1.Controls.Add(this.cmdFinish);
            this.panel1.Controls.Add(this.cmdSaveAndDown2);
            this.panel1.Controls.Add(this.cmdSaveAndDown);
            this.panel1.Controls.Add(this.cmdSaveAndNext);
@@ -1388,6 +1392,18 @@
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1200, 97);
            this.panel1.TabIndex = 141;
            // 
            // chkFinishFlag
            // 
            this.chkFinishFlag.AutoSize = true;
            this.chkFinishFlag.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.chkFinishFlag.Location = new System.Drawing.Point(827, 0);
            this.chkFinishFlag.Name = "chkFinishFlag";
            this.chkFinishFlag.Size = new System.Drawing.Size(128, 28);
            this.chkFinishFlag.TabIndex = 142;
            this.chkFinishFlag.Text = "检验完成";
            this.chkFinishFlag.UseVisualStyleBackColor = true;
            this.chkFinishFlag.Visible = false;
            // 
            // cmdSaveAndDown2
            // 
@@ -1415,26 +1431,13 @@
            this.cmdSaveAndDown.UseVisualStyleBackColor = false;
            this.cmdSaveAndDown.Click += new System.EventHandler(this.cmdSaveAndDown_Click);
            // 
            // cmdHWaitList
            // 
            this.cmdHWaitList.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHWaitList.Location = new System.Drawing.Point(1029, -14);
            this.cmdHWaitList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdHWaitList.Name = "cmdHWaitList";
            this.cmdHWaitList.Size = new System.Drawing.Size(175, 66);
            this.cmdHWaitList.TabIndex = 139;
            this.cmdHWaitList.Text = "待处理列表";
            this.cmdHWaitList.UseVisualStyleBackColor = true;
            this.cmdHWaitList.Visible = false;
            this.cmdHWaitList.Click += new System.EventHandler(this.cmdHWaitList_Click);
            // 
            // cmdSaveAndNext
            // 
            this.cmdSaveAndNext.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSaveAndNext.Location = new System.Drawing.Point(323, 16);
            this.cmdSaveAndNext.Location = new System.Drawing.Point(310, 16);
            this.cmdSaveAndNext.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdSaveAndNext.Name = "cmdSaveAndNext";
            this.cmdSaveAndNext.Size = new System.Drawing.Size(145, 66);
            this.cmdSaveAndNext.Size = new System.Drawing.Size(129, 66);
            this.cmdSaveAndNext.TabIndex = 138;
            this.cmdSaveAndNext.Text = "合格保存";
            this.cmdSaveAndNext.UseVisualStyleBackColor = true;
@@ -1443,7 +1446,7 @@
            // cmdHSourceBillNo
            // 
            this.cmdHSourceBillNo.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHSourceBillNo.Location = new System.Drawing.Point(678, 16);
            this.cmdHSourceBillNo.Location = new System.Drawing.Point(754, 16);
            this.cmdHSourceBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdHSourceBillNo.Name = "cmdHSourceBillNo";
            this.cmdHSourceBillNo.Size = new System.Drawing.Size(139, 66);
@@ -1455,7 +1458,7 @@
            // cmdHSetZero
            // 
            this.cmdHSetZero.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHSetZero.Location = new System.Drawing.Point(838, 16);
            this.cmdHSetZero.Location = new System.Drawing.Point(899, 16);
            this.cmdHSetZero.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdHSetZero.Name = "cmdHSetZero";
            this.cmdHSetZero.Size = new System.Drawing.Size(143, 66);
@@ -1467,7 +1470,7 @@
            // cmdCancel
            // 
            this.cmdCancel.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdCancel.Location = new System.Drawing.Point(1019, 16);
            this.cmdCancel.Location = new System.Drawing.Point(1048, 16);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdCancel.Name = "cmdCancel";
            this.cmdCancel.Size = new System.Drawing.Size(135, 66);
@@ -1545,6 +1548,19 @@
            this.cmdDel.Text = "快速盘点";
            this.cmdDel.UseVisualStyleBackColor = true;
            this.cmdDel.Visible = false;
            // 
            // cmdHWaitList
            // 
            this.cmdHWaitList.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHWaitList.Location = new System.Drawing.Point(1029, -14);
            this.cmdHWaitList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdHWaitList.Name = "cmdHWaitList";
            this.cmdHWaitList.Size = new System.Drawing.Size(175, 66);
            this.cmdHWaitList.TabIndex = 139;
            this.cmdHWaitList.Text = "待处理列表";
            this.cmdHWaitList.UseVisualStyleBackColor = true;
            this.cmdHWaitList.Visible = false;
            this.cmdHWaitList.Click += new System.EventHandler(this.cmdHWaitList_Click);
            // 
            // splitContainer1
            // 
@@ -1842,16 +1858,30 @@
            this.timer3.Interval = 300;
            this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
            // 
            // chkFinishFlag
            // cmdFinish
            // 
            this.chkFinishFlag.AutoSize = true;
            this.chkFinishFlag.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.chkFinishFlag.Location = new System.Drawing.Point(495, 34);
            this.chkFinishFlag.Name = "chkFinishFlag";
            this.chkFinishFlag.Size = new System.Drawing.Size(128, 28);
            this.chkFinishFlag.TabIndex = 142;
            this.chkFinishFlag.Text = "检验完成";
            this.chkFinishFlag.UseVisualStyleBackColor = true;
            this.cmdFinish.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdFinish.Location = new System.Drawing.Point(461, 16);
            this.cmdFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdFinish.Name = "cmdFinish";
            this.cmdFinish.Size = new System.Drawing.Size(129, 66);
            this.cmdFinish.TabIndex = 142;
            this.cmdFinish.Text = "完工";
            this.cmdFinish.UseVisualStyleBackColor = true;
            this.cmdFinish.Click += new System.EventHandler(this.cmdFinish_Click);
            // 
            // cmdReWork
            // 
            this.cmdReWork.BackColor = System.Drawing.Color.Khaki;
            this.cmdReWork.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdReWork.Location = new System.Drawing.Point(596, 16);
            this.cmdReWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.cmdReWork.Name = "cmdReWork";
            this.cmdReWork.Size = new System.Drawing.Size(129, 66);
            this.cmdReWork.TabIndex = 143;
            this.cmdReWork.Text = "返工";
            this.cmdReWork.UseVisualStyleBackColor = false;
            this.cmdReWork.Click += new System.EventHandler(this.cmdReWork_Click);
            // 
            // Sc_ICMOReportToBarCode
            // 
@@ -1880,6 +1910,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
            this.groupBox1.ResumeLayout(false);
            this.gbUp.ResumeLayout(false);
            this.gbUp.PerformLayout();
            this.tabControl3.ResumeLayout(false);
            this.tabPage3.ResumeLayout(false);
            this.tabPage3.PerformLayout();
@@ -1890,7 +1921,6 @@
            this.tabPage5.PerformLayout();
            this.groupBox4.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            this.splitContainer1.Panel1.ResumeLayout(false);
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
@@ -2046,5 +2076,7 @@
        private System.Windows.Forms.Label label33;
        public System.Windows.Forms.TextBox txtHBadQty;
        private System.Windows.Forms.CheckBox chkFinishFlag;
        private System.Windows.Forms.Button cmdReWork;
        private System.Windows.Forms.Button cmdFinish;
    }
}

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

@@ -722,6 +722,6 @@
    <value>292, 16</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>39</value>
    <value>25</value>
  </metadata>
</root>

 SCM/Éú²ú¹ÜÀí/Gy_BadReasonList.Designer.cs

@@ -44,11 +44,12 @@
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.label6 = new System.Windows.Forms.Label();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.txtHBadQty = new System.Windows.Forms.TextBox();
            this.cmdHClear = new System.Windows.Forms.Button();
            this.cmdHOK = new System.Windows.Forms.Button();
            this.cmdCancel = new System.Windows.Forms.Button();
            this.tabControl2 = new System.Windows.Forms.TabControl();
            this.txtHBadQty = new System.Windows.Forms.TextBox();
            this.label7 = new System.Windows.Forms.Label();
            this.tabPage3.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.tabControl1.SuspendLayout();
@@ -214,6 +215,7 @@
            // 
            // groupBox1
            // 
            this.groupBox1.Controls.Add(this.label7);
            this.groupBox1.Controls.Add(this.txtHBadQty);
            this.groupBox1.Controls.Add(this.label6);
            this.groupBox1.Controls.Add(this.cmdHClear);
@@ -225,6 +227,16 @@
            this.groupBox1.Size = new System.Drawing.Size(1389, 97);
            this.groupBox1.TabIndex = 18;
            this.groupBox1.TabStop = false;
            // 
            // txtHBadQty
            // 
            this.txtHBadQty.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBadQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBadQty.Location = new System.Drawing.Point(540, 25);
            this.txtHBadQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBadQty.Name = "txtHBadQty";
            this.txtHBadQty.Size = new System.Drawing.Size(216, 53);
            this.txtHBadQty.TabIndex = 117;
            // 
            // cmdHClear
            // 
@@ -269,15 +281,15 @@
            this.tabControl2.Size = new System.Drawing.Size(1389, 728);
            this.tabControl2.TabIndex = 20;
            // 
            // txtHBadQty
            // label7
            // 
            this.txtHBadQty.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBadQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBadQty.Location = new System.Drawing.Point(401, 25);
            this.txtHBadQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBadQty.Name = "txtHBadQty";
            this.txtHBadQty.Size = new System.Drawing.Size(216, 53);
            this.txtHBadQty.TabIndex = 117;
            this.label7.AutoSize = true;
            this.label7.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label7.Location = new System.Drawing.Point(423, 35);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(110, 24);
            this.label7.TabIndex = 118;
            this.label7.Text = "不良米数";
            // 
            // Gy_BadReasonList
            // 
@@ -329,5 +341,6 @@
        private System.Windows.Forms.TabControl tabControl2;
        public System.Windows.Forms.TextBox txtHBadReason;
        public System.Windows.Forms.TextBox txtHBadQty;
        private System.Windows.Forms.Label label7;
    }
}

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

@@ -52,14 +52,15 @@
                MessageBox.Show("请选择不良原因后提交", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                return;
            }
            if (sSourceTypeName == "生产订单")
            //if (sSourceTypeName == "生产订单")
            //{
            if (DBUtility.ClsPub.isDoule(txtHBadQty.Text) <= 0)
            {
                if (DBUtility.ClsPub.isDoule(txtHBadQty.Text) <= 0)
                {
                    MessageBox.Show("请输入不良米数！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                    return;
                }
                MessageBox.Show("请输入不良米数！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                txtHBadQty.Focus();
                return;
            }
            //}
            ISOK = 1;
            this.Visible = false;
        }