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

yxj

2025-11-28 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f

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

@@ -491,6 +491,8 @@
                //
                Sub_SetReport(oFrm.sOpenTmp);
                Report.Print(true);
                // å¼¹æ¡†å…³é—­åŽæ‰§è¡ŒæŸ¥è¯¢
                Sub_FastQuery();
            }
        }

@@ -507,6 +509,8 @@
                //
                Sub_SetReport(oFrm.sOpenTmp);
                Report.PrintPreview(true);
                // å¼¹æ¡†å…³é—­åŽæ‰§è¡ŒæŸ¥è¯¢
                Sub_FastQuery();
            }
        }

@@ -516,6 +520,17 @@
            //
            Report = new GridppReport();
            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
            if (sOpenTmp=="工序流转卡小标签")
            {
                ClsCN SubCn = new ClsCN();
                DataSet DSet;
                string sSql = "";
                Int64 lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
                sSql = "Select top 1 * from " + ViewName + " Where 1=1 and  hmainid =" + lngBillKey+ " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by å•æ®å· desc,hsubid  ";
                DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
                //绑定
                grdMain.DataSource = DSet.Tables[0].DefaultView;
            }
            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
        }