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

yusijie

2024-06-19 45b33e77b6f90e0a18fc88bbb0826ecf1e7b9b51

 PayM/工资管理/Pay_ProcPriceRequestBill.cs

@@ -1274,7 +1274,7 @@
                                oMater.WherePart = "";
                                if (oMater.RefreshView())
                                {
                                    if (oMater.GetInfoByID(oMater.omodel.HItemID))
                                    if (oMater.GetInfoByID(oMater.oModel.HItemID))
                                    {
                                        grdMain.Rows[sRow].Cells[HMaterIDCol].Value = oMater.omodel.HItemID.ToString();
                                        grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;