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

zzr99

2022-04-01 6ac597c079ee250166184a37b9eccd5ccfa7c106

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationEntrustOutBill.cs

@@ -660,14 +660,16 @@
            //    MessageBox.Show("接收个数不能为0！", "提示");
            //    return false;
            //}
            if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) <= 0)
            if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) 
                + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim())
                + DBUtility.ClsPub.isDoule(txtHBadCount.Text) <= 0)
            {
                MessageBox.Show("接收个数不能为0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) < 0) 
            {
                MessageBox.Show("接收个数不能小于0！", "提示");
                MessageBox.Show("接收合格个数不能小于0！", "提示");
                return false;
            }
            //if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
@@ -681,6 +683,11 @@
                MessageBox.Show("不合格数不能小于0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHBadCount.Text.Trim()) < 0)
            {
                MessageBox.Show("不良品数不能小于0！", "提示");
                return false;
            }
            //if (DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
            //{
            //    MessageBox.Show("不合格数不能大于计划数量！", "提示");