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

cdk

7 天以前 cc286e3641ef72fe7cb1312487a6d4e40bda81fe

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -279,7 +279,6 @@
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            ucLookHuoZhu1.Enabled = true;

            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
            string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
@@ -301,6 +300,7 @@
            string inLyCus = txt_qt013.GetId();//领用客户
            string inLyDepart = txt_qt009.GetId();//领用部门
            string inKcfx = txt_qt020.Text.Trim();//库存方向
            string qtlx = txt_qtlx.Text.Trim();//后来增加的类型
            if (string.IsNullOrEmpty(inOrgId))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织！");
@@ -317,16 +317,16 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主！");
                return;
            }
            if (txt_qt019.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型！");
                txt_qt019.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织！");
                txt_qt024.Focus();
                return;
            }
            if (txt_qtlx.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择出库类型！");
                txt_qtlx.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
@@ -334,12 +334,6 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("客户或部门必选一个！");
                return;
            }
            //if (txt_qt020.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存方向！");
            //    txt_qt020.Focus();
            //    return;
            //}
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -353,6 +347,7 @@
                inLyDepart = inLyDepart,//领用部门
                inKcfx = inKcfx,//库存方向
                inSource = txt_qt035.EditValue,//工单号
                qtlx=qtlx,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -395,7 +390,6 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
@@ -425,7 +419,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.qt023  in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -675,10 +673,18 @@
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                        UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
                    else
                    {
                        //注意，这里和其它页面有点不一样
                        getPageList(this.pageBar1.CurrentPage);
                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                    }

                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -775,7 +781,5 @@
            };
            frm.ShowDialog();
        }


    }
}