Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/XLRStoreClient/FrmXLRStore.Designer.cs

@@ -369,54 +369,54 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
             // 
             // 启动AToolStripMenuItem
             // 
             this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
-            this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
             this.启动AToolStripMenuItem.Text = "启动 ";
             this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
             // 
             // 复位RToolStripMenuItem
             // 
             this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
-            this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
             this.复位RToolStripMenuItem.Text = "复位";
             this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
             // 
             // 停止TToolStripMenuItem
             // 
             this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
-            this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
             this.停止TToolStripMenuItem.Text = "停止";
             this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
             // 
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
             this.toolStripSeparator2.Visible = false;
             // 
             // 退出ToolStripMenuItem
             // 
             this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
-            this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
             this.退出ToolStripMenuItem.Text = "退出";
             this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
             // 

source/XLRStoreClient/FrmXLRStore.cs

@@ -207,6 +207,7 @@ namespace OnlineStore.XLRStore
             DialogResult result = MessageBox.Show("确定清除B下暂存区物料（同时会屏蔽该物料所在库位）：" + BufferDataManager.BOutStoreInfo.ToStr(), "", MessageBoxButtons.OKCancel);
             if (result.Equals(DialogResult.OK))
             {
+                DisablePos(BufferDataManager.BOutStoreInfo.PosId, BufferDataManager.BOutStoreInfo.barcode);
                 LogUtil.info(Name + "手动清除B下暂存区物料，并屏蔽该物料所在库位：" + BufferDataManager.BOutStoreInfo.ToStr());
                 BufferDataManager.BOutStoreInfo = null;
             }