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

jinghz@oceic.com

2023-08-24 bf24909c6d9cad6fd4bd7335e5f70b45c6a5212b

 WorkM/Éú²ú¹ÜÀí/Sc_ICMOBillList.cs

@@ -49,7 +49,7 @@
            //过滤条件
            if (frmCondition.SqlStr.Trim().Length == 0)
                return;
            sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by å•æ®å· desc,hsubid ";
            sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by å•æ®å· desc,hsubid ";
            //
            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
@@ -646,6 +646,7 @@
            //    MessageBox.Show("没有输入条件!");
            //    return;
            //}
            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
            sDlgWhere = sFastSQL;
            Display();
            sDlgWhere = "";
@@ -698,7 +699,7 @@

                    oSc_ProcessExchangeBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
                    oSc_ProcessExchangeBill.ModCaption = "工序流转卡";
                    oSc_ProcessExchangeBill.oXT = Ds;
                    oSc_ProcessExchangeBill.oXT = Ds; //--h_v_S_Sc_ICMOBillList è¿™ä¸ªè§†å›¾æ¥èŽ·å–  å·¥è‰ºè·¯çº¿
                    oSc_ProcessExchangeBill.ShowDialog();
                }
                /////////////////////////////