bug

lu

4 天以前 f515bb49e76481c378c23267cd1a919d25249c30

bug

 DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs

@@ -107,6 +107,7 @@
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.分区Guid = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -228,7 +229,8 @@
            this.colCreateBy,
            this.createTime,
            this.gridColumn2,
            this.gridColumn3});
            this.gridColumn3,
            this.分区Guid});
            gridFormatRule1.Name = "Format0";
            formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
            formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
@@ -244,10 +246,11 @@
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "编号";
            this.gridColumn5.Caption = "分区编号";
            this.gridColumn5.FieldName = "defectCode";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "query_USER_NAME";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            this.gridColumn5.Width = 94;
@@ -255,7 +258,7 @@
            // userName
            // 
            this.userName.AppearanceCell.Options.UseFont = true;
            this.userName.Caption = "名称";
            this.userName.Caption = "分区名称";
            this.userName.FieldName = "defectName";
            this.userName.MinWidth = 50;
            this.userName.Name = "userName";
@@ -391,15 +394,15 @@
            this.txt_defectCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_defectCode.Name = "txt_defectCode";
            this.txt_defectCode.Properties.Appearance.Options.UseFont = true;
            this.txt_defectCode.Size = new System.Drawing.Size(164, 24);
            this.txt_defectCode.Size = new System.Drawing.Size(169, 24);
            this.txt_defectCode.StyleController = this.layoutMx1;
            this.txt_defectCode.TabIndex = 128;
            // 
            // txt_defectName
            // 
            this.txt_defectName.Location = new System.Drawing.Point(564, 12);
            this.txt_defectName.Location = new System.Drawing.Point(574, 12);
            this.txt_defectName.Name = "txt_defectName";
            this.txt_defectName.Size = new System.Drawing.Size(164, 24);
            this.txt_defectName.Size = new System.Drawing.Size(169, 24);
            this.txt_defectName.StyleController = this.layoutMx1;
            this.txt_defectName.TabIndex = 129;
            // 
@@ -441,7 +444,7 @@
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1});
            this.Root.Size = new System.Drawing.Size(981, 48);
            this.Root.Size = new System.Drawing.Size(1002, 48);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -449,17 +452,17 @@
            this.layoutControlItem1.Control = this.txt_defectCode;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(240, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(245, 28);
            this.layoutControlItem1.Text = "分区编号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_defectName;
            this.layoutControlItem2.Location = new System.Drawing.Point(480, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(490, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(240, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(245, 28);
            this.layoutControlItem2.Text = "分区名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -737,6 +740,14 @@
            this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
            this.lastLoginTime.Width = 180;
            // 
            // 分区Guid
            // 
            this.分区Guid.Caption = "gridColumn11";
            this.分区Guid.FieldName = "guid";
            this.分区Guid.MinWidth = 25;
            this.分区Guid.Name = "分区Guid";
            this.分区Guid.Width = 94;
            // 
            // Frm_AreaBind
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -745,7 +756,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_AreaBind";
            this.Text = "分区绑定";
            this.Text = "仓库分区绑定";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
@@ -840,5 +851,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDel2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn 分区Guid;
    }
}

 DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs

@@ -48,7 +48,6 @@
                    UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;

                if (dt.Rows.Count > 0)
                {
                    gcMain1.DataSource = dt;
@@ -60,7 +59,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -71,7 +70,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -131,12 +130,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -216,16 +215,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0)
                        {
                            getModel(lbGuid.Text.Trim());
                        }
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        getModel(lbGuid.Text.Trim());
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }

 DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs

@@ -46,7 +46,7 @@
                    foreach (DataRow dr in dt.Rows)
                    {
                        string checkBox = dr["chkInt"].ToString();
                        string _guid = dr["guid"].ToString();
                        string _guid = dr["itemId"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            if (sbList.Length > 0)
@@ -68,15 +68,18 @@
                          "MesSysPageviewManager/SetUserBind",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
                   
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                        this.Close();
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };
        }
@@ -94,7 +97,12 @@
                return;
            }
            var _sbSqlWhere = " and a.FSubsidiary=" + _orgId;
            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.staff_no", "asc", "", _sbSqlWhere.ToString(), userGuid);
            var pgq = new PageQueryModel(
                curPage, 999999
                , "org.FNumber asc ,a.staff_no", "asc"
                , ""
                , _sbSqlWhere.ToString()
                , userGuid);//这是分区的guid
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -121,7 +129,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }


 DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs

@@ -166,7 +166,7 @@
            this.MinimizeBox = false;
            this.Name = "SelectUser";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择账号";
            this.Text = "选择Mes账号";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
            this.panelControl2.ResumeLayout(false);

 DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs

@@ -65,15 +65,18 @@
                          "MesSysPageviewManager/SetUserBind",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
                   
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                        this.Close();
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };
        }
@@ -112,7 +115,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
    }