1挪动一些老旧文件的位置以备后续删除 2图片显示 3店铺登录信息优化显示
This commit is contained in:
1 parent
011b909bfc
commit
157f7e9f3e
59 files changed
+1160
-432
No files matched your search
+82
-72
@@ -47,6 +47,14 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.dgvAdjust = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -68,13 +76,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -119,7 +120,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer1.SplitterDistance = 120;
|
||||
this.splitContainer1.TabIndex = 10;
|
||||
//
|
||||
// ucGroupBoxEx4
|
||||
// ucGroupBoxEx3
|
||||
//
|
||||
this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
@@ -129,9 +130,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx3.Controls.Add(this.txtScale1);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.label10);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnStartStockUp);
|
||||
this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2);
|
||||
this.ucGroupBoxEx3.Name = "ucGroupBoxEx4";
|
||||
this.ucGroupBoxEx3.Size = new System.Drawing.Size(836, 120);
|
||||
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
|
||||
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
|
||||
this.ucGroupBoxEx3.Size = new System.Drawing.Size(826, 120);
|
||||
this.ucGroupBoxEx3.TabIndex = 666;
|
||||
this.ucGroupBoxEx3.TabStop = false;
|
||||
this.ucGroupBoxEx3.Text = "拒绝跟价";
|
||||
@@ -187,7 +188,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx2.Controls.Add(this.btnSearchPrice);
|
||||
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
|
||||
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
|
||||
this.ucGroupBoxEx2.Size = new System.Drawing.Size(125, 120);
|
||||
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
|
||||
this.ucGroupBoxEx2.TabIndex = 469;
|
||||
this.ucGroupBoxEx2.TabStop = false;
|
||||
this.ucGroupBoxEx2.Text = "读取调价";
|
||||
@@ -209,7 +210,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchPrice.Location = new System.Drawing.Point(25, 32);
|
||||
this.btnSearchPrice.Location = new System.Drawing.Point(30, 32);
|
||||
this.btnSearchPrice.Name = "btnSearchPrice";
|
||||
this.btnSearchPrice.Size = new System.Drawing.Size(70, 23);
|
||||
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -302,7 +303,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel2.Controls.Add(this.dgvAdjust);
|
||||
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1110, 443);
|
||||
this.splitContainer2.SplitterDistance = 270;
|
||||
this.splitContainer2.SplitterDistance = 280;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// dgvShop
|
||||
@@ -327,6 +328,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colShopLoginName,
|
||||
this.colShopId,
|
||||
this.colShopName,
|
||||
this.colShopNotes,
|
||||
this.colLoginStatus,
|
||||
this.colCanUse,
|
||||
this.colMessage});
|
||||
@@ -334,13 +336,75 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvShop.Location = new System.Drawing.Point(4, 0);
|
||||
this.dgvShop.Name = "dgvShop";
|
||||
this.dgvShop.ReadOnly = true;
|
||||
this.dgvShop.RowHeadersWidth = 30;
|
||||
this.dgvShop.RowHeadersWidth = 25;
|
||||
this.dgvShop.RowTemplate.Height = 23;
|
||||
this.dgvShop.Size = new System.Drawing.Size(266, 443);
|
||||
this.dgvShop.Size = new System.Drawing.Size(276, 443);
|
||||
this.dgvShop.TabIndex = 6;
|
||||
this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
|
||||
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
||||
//
|
||||
// colSelect
|
||||
//
|
||||
this.colSelect.HeaderText = "全选";
|
||||
this.colSelect.Name = "colSelect";
|
||||
this.colSelect.ReadOnly = true;
|
||||
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSelect.Width = 28;
|
||||
//
|
||||
// colShopLoginName
|
||||
//
|
||||
this.colShopLoginName.HeaderText = "店铺登录名";
|
||||
this.colShopLoginName.Name = "colShopLoginName";
|
||||
this.colShopLoginName.ReadOnly = true;
|
||||
this.colShopLoginName.Visible = false;
|
||||
//
|
||||
// colShopId
|
||||
//
|
||||
this.colShopId.HeaderText = "店铺Id";
|
||||
this.colShopId.Name = "colShopId";
|
||||
this.colShopId.ReadOnly = true;
|
||||
this.colShopId.Visible = false;
|
||||
this.colShopId.Width = 55;
|
||||
//
|
||||
// colShopName
|
||||
//
|
||||
this.colShopName.HeaderText = "店铺名称";
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 70;
|
||||
//
|
||||
// colShopNotes
|
||||
//
|
||||
this.colShopNotes.HeaderText = "分组";
|
||||
this.colShopNotes.Name = "colShopNotes";
|
||||
this.colShopNotes.ReadOnly = true;
|
||||
this.colShopNotes.Width = 70;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Width = 38;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
this.colCanUse.HeaderText = "可用";
|
||||
this.colCanUse.Name = "colCanUse";
|
||||
this.colCanUse.ReadOnly = true;
|
||||
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colCanUse.Visible = false;
|
||||
this.colCanUse.Width = 28;
|
||||
//
|
||||
// colMessage
|
||||
//
|
||||
this.colMessage.HeaderText = "消息";
|
||||
this.colMessage.Name = "colMessage";
|
||||
this.colMessage.ReadOnly = true;
|
||||
//
|
||||
// dgvAdjust
|
||||
//
|
||||
this.dgvAdjust.AllowUserToAddRows = false;
|
||||
@@ -380,7 +444,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvAdjust.Name = "dgvAdjust";
|
||||
this.dgvAdjust.ReadOnly = true;
|
||||
this.dgvAdjust.RowTemplate.Height = 23;
|
||||
this.dgvAdjust.Size = new System.Drawing.Size(832, 443);
|
||||
this.dgvAdjust.Size = new System.Drawing.Size(822, 443);
|
||||
this.dgvAdjust.TabIndex = 187;
|
||||
this.dgvAdjust.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
|
||||
//
|
||||
@@ -586,61 +650,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// colSelect
|
||||
//
|
||||
this.colSelect.HeaderText = "全选";
|
||||
this.colSelect.Name = "colSelect";
|
||||
this.colSelect.ReadOnly = true;
|
||||
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSelect.Width = 28;
|
||||
//
|
||||
// colShopLoginName
|
||||
//
|
||||
this.colShopLoginName.HeaderText = "店铺登录名";
|
||||
this.colShopLoginName.Name = "colShopLoginName";
|
||||
this.colShopLoginName.ReadOnly = true;
|
||||
this.colShopLoginName.Visible = false;
|
||||
//
|
||||
// colShopId
|
||||
//
|
||||
this.colShopId.HeaderText = "店铺Id";
|
||||
this.colShopId.Name = "colShopId";
|
||||
this.colShopId.ReadOnly = true;
|
||||
this.colShopId.Visible = false;
|
||||
this.colShopId.Width = 55;
|
||||
//
|
||||
// colShopName
|
||||
//
|
||||
this.colShopName.FillWeight = 150F;
|
||||
this.colShopName.HeaderText = "店铺名称";
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 75;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "登录状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Width = 65;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
this.colCanUse.HeaderText = "可用";
|
||||
this.colCanUse.Name = "colCanUse";
|
||||
this.colCanUse.ReadOnly = true;
|
||||
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colCanUse.Width = 28;
|
||||
//
|
||||
// colMessage
|
||||
//
|
||||
this.colMessage.HeaderText = "消息";
|
||||
this.colMessage.Name = "colMessage";
|
||||
this.colMessage.ReadOnly = true;
|
||||
//
|
||||
// PriceManageForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -719,6 +728,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
|
||||
@@ -103,22 +103,27 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId);
|
||||
if (row == null)
|
||||
{
|
||||
this.dgvShop.Rows.Add(
|
||||
int id = this.dgvShop.Rows.Add(
|
||||
selectShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.LoginName,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录",
|
||||
shopEntity.Notes,
|
||||
canUse ? "在线" : "掉线",
|
||||
canUse,
|
||||
string.Empty
|
||||
);
|
||||
row = dgvShop.Rows[id];
|
||||
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录";
|
||||
row.Cells["colShopNotes"].Value = shopEntity.Notes;
|
||||
row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
|
||||
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
|
||||
row.Cells["colCanUse"].Value = canUse;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,6 +126,9 @@
|
||||
<metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
+9
-9
@@ -30,9 +30,9 @@
|
||||
{
|
||||
System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("备货管理");
|
||||
System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("调价管理");
|
||||
System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("商品认领");
|
||||
System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("库存上传");
|
||||
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("活动报名");
|
||||
System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("活动报名");
|
||||
System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("商品认领");
|
||||
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("库存上传");
|
||||
System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品发布");
|
||||
System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("佣金设置");
|
||||
System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("净化数据");
|
||||
@@ -155,12 +155,12 @@
|
||||
treeNode1.Text = "备货管理";
|
||||
treeNode2.Name = "调价管理";
|
||||
treeNode2.Text = "调价管理";
|
||||
treeNode3.Name = "商品认领";
|
||||
treeNode3.Text = "商品认领";
|
||||
treeNode4.Name = "库存上传";
|
||||
treeNode4.Text = "库存上传";
|
||||
treeNode5.Name = "活动报名";
|
||||
treeNode5.Text = "活动报名";
|
||||
treeNode3.Name = "活动报名";
|
||||
treeNode3.Text = "活动报名";
|
||||
treeNode4.Name = "商品认领";
|
||||
treeNode4.Text = "商品认领";
|
||||
treeNode5.Name = "库存上传";
|
||||
treeNode5.Text = "库存上传";
|
||||
treeNode6.Name = "商品发布";
|
||||
treeNode6.Text = "商品发布";
|
||||
treeNode7.Name = "佣金设置";
|
||||
|
||||
+35
-24
@@ -74,6 +74,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -212,9 +213,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label16);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label17);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label18);
|
||||
this.ucGroupBoxEx4.Location = new System.Drawing.Point(397, 2);
|
||||
this.ucGroupBoxEx4.Location = new System.Drawing.Point(417, 2);
|
||||
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
|
||||
this.ucGroupBoxEx4.Size = new System.Drawing.Size(749, 120);
|
||||
this.ucGroupBoxEx4.Size = new System.Drawing.Size(729, 120);
|
||||
this.ucGroupBoxEx4.TabIndex = 666;
|
||||
this.ucGroupBoxEx4.TabStop = false;
|
||||
this.ucGroupBoxEx4.Text = "创建备货单";
|
||||
@@ -223,7 +224,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.ucCheckBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucCheckBox1.AutoSize = true;
|
||||
this.ucCheckBox1.Location = new System.Drawing.Point(557, 34);
|
||||
this.ucCheckBox1.Location = new System.Drawing.Point(537, 34);
|
||||
this.ucCheckBox1.Name = "ucCheckBox1";
|
||||
this.ucCheckBox1.Size = new System.Drawing.Size(87, 21);
|
||||
this.ucCheckBox1.TabIndex = 713;
|
||||
@@ -379,7 +380,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnStartStockUp.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnStartStockUp.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnStartStockUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnStartStockUp.Location = new System.Drawing.Point(647, 32);
|
||||
this.btnStartStockUp.Location = new System.Drawing.Point(627, 32);
|
||||
this.btnStartStockUp.Name = "btnStartStockUp";
|
||||
this.btnStartStockUp.Size = new System.Drawing.Size(80, 23);
|
||||
this.btnStartStockUp.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -442,9 +443,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnCancelSubPurchaseOrder);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.panelEx2);
|
||||
this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2);
|
||||
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
|
||||
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
|
||||
this.ucGroupBoxEx3.Size = new System.Drawing.Size(125, 120);
|
||||
this.ucGroupBoxEx3.Size = new System.Drawing.Size(135, 120);
|
||||
this.ucGroupBoxEx3.TabIndex = 665;
|
||||
this.ucGroupBoxEx3.TabStop = false;
|
||||
this.ucGroupBoxEx3.Text = "取消待创建";
|
||||
@@ -455,7 +456,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnCancelSubPurchaseOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnCancelSubPurchaseOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnCancelSubPurchaseOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(27, 32);
|
||||
this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(32, 32);
|
||||
this.btnCancelSubPurchaseOrder.Name = "btnCancelSubPurchaseOrder";
|
||||
this.btnCancelSubPurchaseOrder.Size = new System.Drawing.Size(70, 23);
|
||||
this.btnCancelSubPurchaseOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -478,7 +479,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.panelEx2.Location = new System.Drawing.Point(27, 71);
|
||||
this.panelEx2.Location = new System.Drawing.Point(32, 71);
|
||||
this.panelEx2.Name = "panelEx2";
|
||||
this.panelEx2.Size = new System.Drawing.Size(70, 23);
|
||||
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -508,7 +509,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx2.Controls.Add(this.btnSearch);
|
||||
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
|
||||
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
|
||||
this.ucGroupBoxEx2.Size = new System.Drawing.Size(125, 120);
|
||||
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
|
||||
this.ucGroupBoxEx2.TabIndex = 469;
|
||||
this.ucGroupBoxEx2.TabStop = false;
|
||||
this.ucGroupBoxEx2.Text = "读取待创建";
|
||||
@@ -516,7 +517,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
// chkHasCreate
|
||||
//
|
||||
this.chkHasCreate.AutoSize = true;
|
||||
this.chkHasCreate.Location = new System.Drawing.Point(11, 73);
|
||||
this.chkHasCreate.Location = new System.Drawing.Point(16, 73);
|
||||
this.chkHasCreate.Name = "chkHasCreate";
|
||||
this.chkHasCreate.Size = new System.Drawing.Size(111, 21);
|
||||
this.chkHasCreate.TabIndex = 658;
|
||||
@@ -530,7 +531,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearch.Location = new System.Drawing.Point(25, 32);
|
||||
this.btnSearch.Location = new System.Drawing.Point(30, 32);
|
||||
this.btnSearch.Name = "btnSearch";
|
||||
this.btnSearch.Size = new System.Drawing.Size(70, 23);
|
||||
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -631,7 +632,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel2.Controls.Add(this.dgvStock);
|
||||
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1148, 435);
|
||||
this.splitContainer2.SplitterDistance = 270;
|
||||
this.splitContainer2.SplitterDistance = 280;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// txtPid
|
||||
@@ -735,6 +736,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colShopLoginName,
|
||||
this.colShopId,
|
||||
this.colShopName,
|
||||
this.colShopNotes,
|
||||
this.colLoginStatus,
|
||||
this.colCanUse,
|
||||
this.colMessage});
|
||||
@@ -742,9 +744,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvShop.Location = new System.Drawing.Point(4, 0);
|
||||
this.dgvShop.Name = "dgvShop";
|
||||
this.dgvShop.ReadOnly = true;
|
||||
this.dgvShop.RowHeadersWidth = 30;
|
||||
this.dgvShop.RowHeadersWidth = 25;
|
||||
this.dgvShop.RowTemplate.Height = 23;
|
||||
this.dgvShop.Size = new System.Drawing.Size(266, 435);
|
||||
this.dgvShop.Size = new System.Drawing.Size(276, 435);
|
||||
this.dgvShop.TabIndex = 6;
|
||||
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
||||
//
|
||||
@@ -779,14 +781,21 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 75;
|
||||
this.colShopName.Width = 70;
|
||||
//
|
||||
// colShopNotes
|
||||
//
|
||||
this.colShopNotes.HeaderText = "分组";
|
||||
this.colShopNotes.Name = "colShopNotes";
|
||||
this.colShopNotes.ReadOnly = true;
|
||||
this.colShopNotes.Width = 70;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "登录状态";
|
||||
this.colLoginStatus.HeaderText = "状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Width = 65;
|
||||
this.colLoginStatus.Width = 38;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
@@ -795,6 +804,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colCanUse.ReadOnly = true;
|
||||
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colCanUse.Visible = false;
|
||||
this.colCanUse.Width = 28;
|
||||
//
|
||||
// colMessage
|
||||
@@ -826,7 +836,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx99.Controls.Add(this.chkLimited);
|
||||
this.ucGroupBoxEx99.Location = new System.Drawing.Point(296, 46);
|
||||
this.ucGroupBoxEx99.Name = "ucGroupBoxEx99";
|
||||
this.ucGroupBoxEx99.Size = new System.Drawing.Size(550, 180);
|
||||
this.ucGroupBoxEx99.Size = new System.Drawing.Size(540, 180);
|
||||
this.ucGroupBoxEx99.TabIndex = 470;
|
||||
this.ucGroupBoxEx99.TabStop = false;
|
||||
this.ucGroupBoxEx99.Text = "创建备货单";
|
||||
@@ -1107,7 +1117,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.panel2.Controls.Add(this.btnSetNotArea);
|
||||
this.panel2.Location = new System.Drawing.Point(151, 59);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(295, 23);
|
||||
this.panel2.Size = new System.Drawing.Size(285, 23);
|
||||
this.panel2.TabIndex = 638;
|
||||
//
|
||||
// textBox2
|
||||
@@ -1117,7 +1127,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.textBox2.Location = new System.Drawing.Point(0, 0);
|
||||
this.textBox2.Name = "textBox2";
|
||||
this.textBox2.ReadOnly = true;
|
||||
this.textBox2.Size = new System.Drawing.Size(229, 23);
|
||||
this.textBox2.Size = new System.Drawing.Size(219, 23);
|
||||
this.textBox2.TabIndex = 638;
|
||||
//
|
||||
// btnSetNotArea
|
||||
@@ -1127,7 +1137,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnSetNotArea.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSetNotArea.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSetNotArea.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSetNotArea.Location = new System.Drawing.Point(235, 2);
|
||||
this.btnSetNotArea.Location = new System.Drawing.Point(225, 2);
|
||||
this.btnSetNotArea.Name = "btnSetNotArea";
|
||||
this.btnSetNotArea.Size = new System.Drawing.Size(56, 19);
|
||||
this.btnSetNotArea.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -1249,7 +1259,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnAdd.Location = new System.Drawing.Point(454, 29);
|
||||
this.btnAdd.Location = new System.Drawing.Point(444, 29);
|
||||
this.btnAdd.Name = "btnAdd";
|
||||
this.btnAdd.Size = new System.Drawing.Size(80, 23);
|
||||
this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -1272,7 +1282,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnStopAdd.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnStopAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnStopAdd.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnStopAdd.Location = new System.Drawing.Point(454, 59);
|
||||
this.btnStopAdd.Location = new System.Drawing.Point(444, 59);
|
||||
this.btnStopAdd.Name = "btnStopAdd";
|
||||
this.btnStopAdd.Size = new System.Drawing.Size(80, 23);
|
||||
this.btnStopAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -1342,7 +1352,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvStock.Name = "dgvStock";
|
||||
this.dgvStock.ReadOnly = true;
|
||||
this.dgvStock.RowTemplate.Height = 23;
|
||||
this.dgvStock.Size = new System.Drawing.Size(870, 435);
|
||||
this.dgvStock.Size = new System.Drawing.Size(860, 435);
|
||||
this.dgvStock.TabIndex = 187;
|
||||
this.dgvStock.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
|
||||
//
|
||||
@@ -1738,6 +1748,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
|
||||
@@ -118,26 +118,31 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
if (selectShopId == null)
|
||||
selectShopId = new List<string>();
|
||||
|
||||
bool canUse = shopEntity.LoginStatus == "登录成功";
|
||||
bool canUse = shopEntity.LoginStatus == "登录成功" && shopEntity.LoginStatus2 == "国际版在线";
|
||||
var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId);
|
||||
if (row == null)
|
||||
{
|
||||
this.dgvShop.Rows.Add(
|
||||
int id = this.dgvShop.Rows.Add(
|
||||
selectShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.LoginName,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.LoginStatus,
|
||||
shopEntity.Notes,
|
||||
canUse ? "在线" : "掉线",
|
||||
canUse,
|
||||
string.Empty
|
||||
);
|
||||
row = dgvShop.Rows[id];
|
||||
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
row.Cells["colShopNotes"].Value = shopEntity.Notes;
|
||||
row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
|
||||
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
|
||||
row.Cells["colCanUse"].Value = canUse;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,6 +126,9 @@
|
||||
<metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
Reference in new issue
Block a user