Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lg

2025-11-24 dfd02ad42c5b4f8ee7190fe51730c21cf75d37a5

 DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs

@@ -164,7 +164,7 @@
                        beginDate = dateEdit1.EditValue.ToString(),
                        endDate = dateEdit2.EditValue.ToString()
                    };
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh","","","", _params);
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh", "", "", "", _params);
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
@@ -197,7 +197,7 @@
        {
            try
            {
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetErpBOM","");
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetErpBOM", "");
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {