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

zzr99

2022-04-25 146fa02f2ff92f9687fc9e099e2e812f785e04b1

 PlanM/Êý¾Ýµ¼Èë/Gy_StdWorkTimes_RoutingBill.cs

@@ -91,22 +91,30 @@

            for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
            {
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHMaterNumCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHProcNumCol].Value) != "")
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHMaterNumCol].Value) != "" && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHProcNumCol].Value) != ""&& DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value) != "")
                {
                    //写入类
                    if (WriteClass(i))
                    if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHStdWorkTimesCol].Value)>0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHUpperlimitCol].Value) > 0&& DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[sHLowerlimitCol].Value) > 0)
                    {
                        //保存记录
                        if (!BillNew.AddNew())
                        //写入类
                        if (WriteClass(i))
                        {
                            MessageBox.Show("导入失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
                            return;
                            //保存记录
                            if (!BillNew.AddNew())
                            {
                                MessageBox.Show("导入失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
                                return;
                            }
                        }
                    }
                    else
                    {
                        MessageBox.Show("第" + (i + 1) + "行,标准工时、上限比例和下限比例不能小于0", "提示");
                        return;
                    }
                }
                else
                {
                    MessageBox.Show("工序代码或物料代码为空!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
                    MessageBox.Show("第"+(i+1)+"行,工序代码、物料代码和标准工时不能为空!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
                    return;
                }
            }
@@ -158,6 +166,7 @@
            //sHMaker = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[sHMakerCol].Value);

            //判断是否允许 ä¿å­˜
            
            //审核代码是否合理
            if (!DBUtility.ClsPub.AllowNumber(sMaterNumber))
            {