Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

ch

2022-05-24 22971886a0e1897aabf62b228215bbee3f2d5a6c

 WorkM/³µ¼ä¹ÜÀí/QC_NoPassProdCheckBill.cs

@@ -179,6 +179,15 @@
                return;
            }
            //
            ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
            string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("QC_NoPassProdCheckBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);

            if (DeleteCtl == "Y" && BillOld.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
            {
                MessageBox.Show("登录用户与制单人不一致，不允许删除", "提示");
                return;
            }
            //
            if (MessageBox.Show("确定要删除当前单据？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
            {

@@ -1141,6 +1150,19 @@
                        }
                        
                    }
                    else
                    {
                        if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadQtyCol].Value) != 0)
                        {
                            MessageBox.Show("第" + (i + 1) + "行，没有不良原因不能填写不良数量！");
                            return false;
                        }
                        if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadPCSQtyCol].Value) != 0)
                        {
                            MessageBox.Show("第" + (i + 1) + "行，没有不良原因不能填写不良PCS数量！");
                            return false;
                        }
                    }
                }
                //if (ClsPub.isDoule(txtHBadPNL.Text) != sPNLQty)
                //{
@@ -1149,7 +1171,7 @@
                //}
                if (ClsPub.isDoule(txtHBadQty.Text) != sPCSQty)
                {
                    MessageBox.Show("明细报废PCS数不等于总报废PCS，不允许保存！");
                    MessageBox.Show("表体明细不良数不等于表头总不良数量，不允许保存！");
                    return false;
                }
            }