xu.lu 2 年 前
コミット
8ea167582c

+ 51 - 13
WCS_Client/Frm/MBtn_Task/FrmUpdatePriority.cs

@@ -9,23 +9,25 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using WCS_Client.UC;
+using WCS_Client.Utility;
 
 namespace WCS_Client.Frm
 {
     public partial class FrmUpdatePriority : Office2007Form
     {
-        DataRow dr = null;
-        public FrmUpdatePriority(DataRow datarow)
+        DataRow dr = null;DataTable dt = null;
+        public FrmUpdatePriority(DataTable datarow)
         {
             InitializeComponent();
-            dr = datarow;
-            lbltask_no.Text = dr["ID"].ToString();
-            lblwmstask_no.Text = dr["WMSTASK"].ToString();
-            lblBarCode.Text = dr["BARCODE"].ToString();
-            lblStartAddress.Text = dr["ADDRFROM"].ToString();
-            lblwcsNextAddress.Text = dr["ADDRNEXT"].ToString();
-            lblEndAddress.Text = dr["ADDRTO"].ToString();
-            nudPriority.Value = Convert.ToInt32(dr["Priority"].ToString());
+            dt = datarow;
+            //dr = datarow;
+            //lbltask_no.Text = dr["ID"].ToString();
+            //lblwmstask_no.Text = dr["WMSTASK"].ToString();
+            //lblBarCode.Text = dr["BARCODE"].ToString();
+            //lblStartAddress.Text = dr["ADDRFROM"].ToString();
+            //lblwcsNextAddress.Text = dr["ADDRNEXT"].ToString();
+            //lblEndAddress.Text = dr["ADDRTO"].ToString();
+            //nudPriority.Value = Convert.ToInt32(dr["Priority"].ToString());
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
@@ -40,11 +42,47 @@ namespace WCS_Client.Frm
                 MessageBox.Show("请输入原因");
                 return;
             }
-            var result = MessageUtil.ShowYesNoAndWarning(string.Format("任务[{0}]确定要变更优先级吗?", lbltask_no.Text.Trim()));
+            var result = MessageUtil.ShowYesNoAndWarning(string.Format("确定要变更优先级吗?"));
             if (result == DialogResult.Yes)
             {
-                string massge = BaseWorkflow.UpdateTaskPriority(Convert.ToInt32(lbltask_no.Text.Trim()), (int)nudPriority.Value);
-                MessageUtil.ShowTips(massge);
+                //dt = dt.Clone();
+                string res = "";
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    var dr = dt.Rows[i];
+                    var task_no = Convert.ToInt32(dr["ID"].ToString());
+                    int priority = Convert.ToInt32(dr["Priority"].ToString());
+                     res = TryCachHelper.TryTranExecute((db) =>
+                    {
+                        var task = db.Queryable<WCS_TASK>().First(v => v.ID == task_no);
+                        if (task == null)
+                        {
+                            throw new Exception(string.Format("未查询到WCS任务[{0}]信息", task_no));
+                        }
+                        else
+                        {
+                            if (db.Updateable<WCS_TASK>()
+                                  .UpdateColumns(it => new WCS_TASK
+                                  {
+                                      Priority = priority,
+                                      UPDATEUSER = CurrentHelper.User.Use_Name,
+                                      UPDATETIME = DateTime.Now
+                                  })
+                                  .Where(v => v.ID == task_no).ExecuteCommand() < 0)
+                            {
+                                throw new Exception(string.Format("WCS任务[{0}]调整优先级失败", task_no));
+                            }
+                            //string msg = string.Format("任务[{0}]调整优先级为[{1}]成功。", task_no, priority);
+                        }
+                    });
+                    if (string.IsNullOrWhiteSpace(res))
+                    {
+                        //res = string.Format("任务[{0}]调整优先级[{1}]成功。", task_no.ToString(), priority);
+                    }
+                }
+                MessageBox.Show(res);
+                //string massge = BaseWorkflow.UpdateTaskPriority(Convert.ToInt32(lbltask_no.Text.Trim()), (int)nudPriority.Value);
+                //MessageUtil.ShowTips(res);
                 this.Close();
             }
         }

+ 9 - 4
WCS_Client/Frm/MBtn_Task/FrmWCS_Task.Designer.cs

@@ -39,6 +39,7 @@
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -51,8 +52,9 @@
             this.splitContainer1.Panel2.Enabled = false;
             this.splitContainer1.Panel2.UseWaitCursor = true;
             this.splitContainer1.Panel2Collapsed = true;
-            this.splitContainer1.Size = new System.Drawing.Size(1283, 648);
+            this.splitContainer1.Size = new System.Drawing.Size(1711, 810);
             this.splitContainer1.SplitterDistance = 619;
+            this.splitContainer1.SplitterWidth = 5;
             this.splitContainer1.TabIndex = 2;
             // 
             // uC_QueryPage1
@@ -61,15 +63,18 @@
             this.uC_QueryPage1.Location = new System.Drawing.Point(0, 0);
             this.uC_QueryPage1.Margin = new System.Windows.Forms.Padding(0);
             this.uC_QueryPage1.Name = "uC_QueryPage1";
-            this.uC_QueryPage1.Size = new System.Drawing.Size(1283, 648);
+            this.uC_QueryPage1.Size = new System.Drawing.Size(1711, 810);
             this.uC_QueryPage1.TabIndex = 0;
+            this.uC_QueryPage1.Load += new System.EventHandler(this.uC_QueryPage1_Load);
+            this.uC_QueryPage1.DoubleClick += new System.EventHandler(this.uC_QueryPage1_DoubleClick);
             // 
             // FrmWCS_Task
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1283, 648);
+            this.ClientSize = new System.Drawing.Size(1711, 810);
             this.Controls.Add(this.splitContainer1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "FrmWCS_Task";
             this.Text = "FrmWCS_Task";
             this.splitContainer1.Panel1.ResumeLayout(false);

+ 31 - 2
WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -103,6 +103,25 @@ namespace WCS_Client.Frm
                 LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
             });
 
+            LCIList.Add(LCItemUtil.Add_ComboBoxEx("ZONE", "区域:", 20, null, SubmitMethods));
+            TryCachHelper.TryExecute((db) =>
+            {
+                var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "ZONE").ToList();
+                DataTable dt = new DataTable();
+                DataRow dr;
+                dt.Columns.Add("MEP_MAPPINGNO");
+                dt.Columns.Add("MEP_MAPPINGCHNAME");
+                for (int i = 0; i < dtsex.Count; i++)
+                {
+                    dr = dt.NewRow();
+                    dr["MEP_MAPPINGNO"] = dtsex[i].MEP_MAPPINGNO;
+                    dr["MEP_MAPPINGCHNAME"] = dtsex[i].MEP_MAPPINGCHNAME;
+                    dt.Rows.Add(dr);
+                }
+                LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
+            });
+
             LCIList.Add(LCItemUtil.Add_ComboBoxEx("STATUS", "任务状态:", 20, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
             {
@@ -264,8 +283,8 @@ where 1=1 and t.STATUS < 99  ";
                     MessageUtil.ShowTips("请选择任务。");
                     return;
                 }
-                DataRow dr = dt.Rows[0];
-                var frmUpdatePriority = new FrmUpdatePriority(dr);
+                //DataRow dr = dt.Rows[0];
+                var frmUpdatePriority = new FrmUpdatePriority(dt);
                 frmUpdatePriority.ShowDialog();
                 uC_QueryPage1.RefreshData(1, 0);
             }
@@ -280,5 +299,15 @@ where 1=1 and t.STATUS < 99  ";
         private void ClikMethod(DataRow dr)
         {
         }
+
+        private void uC_QueryPage1_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void uC_QueryPage1_DoubleClick(object sender, EventArgs e)
+        {
+
+        }
     }
 }

+ 1 - 1
WCS_Client/UC/UCPanel/UC_QueryPage.cs

@@ -186,7 +186,7 @@ namespace WCS_Client.UC
             }
             //设定是否单/多选
             _IsMultiSelect = IsMultiSelect;
-            SCGrid_SetCheckBox(false);
+            SCGrid_SetCheckBox(true);
             SCGrid.PrimaryGrid.RowHeaderWidth = 30;
             SCGrid.PrimaryGrid.ShowRowGridIndex = true;
             SCGrid.PrimaryGrid.RowHeaderIndexOffset = 1;

+ 2 - 1
WCS_Client/UC/Util/LCWhereUtil.cs

@@ -32,7 +32,8 @@ namespace WCS_Client.UC
                         if (string.IsNullOrEmpty(s))
                         {
                             continue;
-                        }
+                        }                      
+
                         QWList.Add(new LCWhereInfo() { QWhereText = s, ReplaceNo = QWItem.ReplaceNo, GroupNo = QWItem.GroupNo });
                     }
                     else if (Item.Tag is List<LCWhereInfo>)