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

cdk

3 天以前 f4d5aa97370f698c63b0b9f185f06e7bae56975c

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs

@@ -325,6 +325,9 @@
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                        UtilityHelper.SetCheckIco(gridView1, "auditStatusChk", "auditor", "auditDate", picCheckBox, this,( _inFieldValue==8?1:0).ToString() );
                    }
                    else
                    {