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

wtt

2024-12-05 b541b4b3aed0ae5efcf9bf60eb8deb07b2ee944e

 WorkM/±¨±í·ÖÎö/Sc_OverProdReport.cs

@@ -191,21 +191,21 @@
            //}
            BCol = 7;
            //获取动态内容  ï¼ˆæ•°é‡ä¿¡æ¯ï¼‰
            for (int row = 0; row <= grdMain.RowCount - 1; row++)
            {
                for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
                {
                    //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
                    //HMaterID = DBUtility.ClsPub.isLong(grdMain.Columns[col].Tag);
                    //HEmpID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HEmpID")].Value);
                    //HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HProcID")].Value);
                    DsQty = SubCn.RunProcReturn("exec h_p_CCBB", "Gy_Czygl");
                    if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
                    {
                        //grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
                    }
                }
            }
            //for (int row = 0; row <= grdMain.RowCount - 1; row++)
            //{
            //    for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
            //    {
            //        //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
            //        //HMaterID = DBUtility.ClsPub.isLong(grdMain.Columns[col].Tag);
            //        //HEmpID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HEmpID")].Value);
            //        //HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HProcID")].Value);
            //        DsQty = SubCn.RunProcReturn("exec h_p_CCBB", "Gy_Czygl");
            //        if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
            //        {
            //            //grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
            //        }
            //    }
            //}

            //设置合计列
            string sTotalCol = "";