init

WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -1,17 +1,10 @@
-using DevComponents.DotNetBar.Controls;
-using DevComponents.DotNetBar.Layout;
+using DevComponents.DotNetBar.Layout;
 using DevComponents.DotNetBar.SuperGrid;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using WCS.Data.Models;
-using WCS_Client;
 using WCS_Client.UC;
 using WCS_Client.Utility;
 
@@ -19,12 +12,14 @@ namespace WCS_Client.Frm
 {
     public partial class FrmWCS_Task : Form
     {
-        int wcs_task_no = 0;
+        private int wcs_task_no = 0;
+
         public FrmWCS_Task()
         {
             InitializeComponent();
             InitFrm();
         }
+
         private void InitFrm()
         {
             List<GridColumn> GCList = new List<GridColumn>()
@@ -53,7 +48,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_GridColumn("UPDATEUSER", "修改用户", 100),
                 SuperGridUtil.Get_Datetime_GridColumn("UPDATETIME", "修改时间", 130),
                 SuperGridUtil.Get_GridColumn("PRODLINE", "产线", 100),
-                SuperGridUtil.Get_GridColumn("SCSTATION", "站台号", 100),
+                SuperGridUtil.Get_GridColumn("SRMSTATION", "站台号", 100),
                // SuperGridUtil.Get_GridColumn("SonTrayColorNo", "子托盘颜色", 100),
                // SuperGridUtil.Get_GridColumn("TASK_WEIGHT", "箱子重量", 100),
                //SuperGridUtil.Get_GridColumn("TASK_STACKINGTYPE", "垛型", 100)
@@ -87,10 +82,9 @@ namespace WCS_Client.Frm
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICE like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_ComboBoxEx("TYPE", "任务类型:", 20, null, SubmitMethods));
-            TryCachHelper.TryExecute((db) => 
+            TryCachHelper.TryExecute((db) =>
             {
-                
-                var dtsex = db.Queryable<WCS_MAPPINGENTRY> ().Where(v=>v.MEP_MAPPINGTYPE == "TYPE").ToList();
+                var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "TYPE").ToList();
                 DataTable dt = new DataTable();
                 DataRow dr;
                 dt.Columns.Add("MEP_MAPPINGNO");
@@ -106,11 +100,9 @@ namespace WCS_Client.Frm
                 LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "TYPE like '%{0}%'" };
             });
 
-
             LCIList.Add(LCItemUtil.Add_ComboBoxEx("STATUS", "任务状态:", 20, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
             {
-
                 var dtsex = db.Queryable<WCS_MAPPINGENTRY>().Where(v => v.MEP_MAPPINGTYPE == "STATUS").ToList();
                 DataTable dt = new DataTable();
                 DataRow dr;
@@ -118,7 +110,7 @@ namespace WCS_Client.Frm
                 dt.Columns.Add("MEP_MAPPINGCHNAME");
                 for (int i = 0; i < dtsex.Count; i++)
                 {
-                    dr = dt.NewRow(); 
+                    dr = dt.NewRow();
                     dr["MEP_MAPPINGNO"] = dtsex[i].MEP_MAPPINGNO;
                     dr["MEP_MAPPINGCHNAME"] = dtsex[i].MEP_MAPPINGCHNAME;
                     dt.Rows.Add(dr);
@@ -134,7 +126,7 @@ namespace WCS_Client.Frm
                 LCIList.Add(LCItemUtil.Add_ButtonX("btn_FinishTask", "手动完成任务", 100, 30, SubmitMethods));
                 LCIList.Add(LCItemUtil.Add_ButtonX("btn_ClearTask", "取消任务", 100, 30, SubmitMethods));
                 LCIList.Add(LCItemUtil.Add_ButtonX("btn_UpdatePriority", "修改优先级", 100, 30, SubmitMethods));
-                LCIList.Add(LCItemUtil.Add_ButtonX("btn_RestartTask", "重新下发出库任务", 200, 30, SubmitMethods)); 
+                LCIList.Add(LCItemUtil.Add_ButtonX("btn_RestartTask", "重新下发出库任务", 200, 30, SubmitMethods));
             }
 
             uC_QueryPage1.Init_QueryPage(86, true, true, "", GCList, LCIList, QueryPageDataMethods, RefreshRoleMethods, null, null, ClikMethod);
@@ -144,17 +136,19 @@ namespace WCS_Client.Frm
                 uC_QueryPage1.RefreshData(1, 0);
             }, null);
         }
+
         //获取数据集
         private PageData QueryPageDataMethods(int PageIndex, int PageSize)
         {
-            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch from dbo.WCS_TASK t 
-left join WCS_MAPPINGENTRY m on t.TYPE = m.MEP_MAPPINGNO and m.MEP_MAPPINGTYPE = 'TYPE' 
+            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch from dbo.WCS_TASK t
+left join WCS_MAPPINGENTRY m on t.TYPE = m.MEP_MAPPINGNO and m.MEP_MAPPINGTYPE = 'TYPE'
 left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGTYPE = 'STATUS' where 1=1 and STATUS < 99 ";
             string _Orderby = "CREATETIME desc ";
 
             PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, PageSize);
             return pd;
         }
+
         /// <summary>
         /// 按钮触发事件
         /// </summary>
@@ -222,7 +216,7 @@ left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGT
                 uC_QueryPage1.ClearLCItemValue();
                 uC_QueryPage1.RefreshData(1, 0);
                 uC_QueryPage1.HideOpaqueLayer();
-            }     
+            }
             else if (LCName == "btn_CreateProInTask")
             {
                 //FrmCreateTask frm = new FrmCreateTask();
@@ -263,14 +257,15 @@ left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGT
                 uC_QueryPage1.RefreshData(1, 0);
             }
         }
+
         private void RefreshRoleMethods(bool ChkValue)
         {
             //if (AppConst.CheckExtentByName("查询任务"))
             //
         }
+
         private void ClikMethod(DataRow dr)
         {
-
         }
     }
-}
+}

WCS_Client/From/From_Montior/Form_Monitior_Box.cs

@@ -4,8 +4,6 @@ using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using WCS_Client.From.From_Montior;
 using static WCS_Client.Utility.CurrentHelper;
@@ -14,7 +12,8 @@ namespace WCS_Client.From
 {
     public partial class Form_Monitior_Box : Form
     {
-        System.Timers.Timer _timer;
+        private System.Timers.Timer _timer;
+
         private delegate void ShowTextDelegate(List<WCS_STACKERDATA> ds);// 创建委托和委托对象
 
         private List<string> _plcnameSet = new List<string>();
@@ -81,6 +80,7 @@ namespace WCS_Client.From
         }
 
         private static Form_Monitior_Box childFromInstanc;
+
         public static Form_Monitior_Box ChildFromInstanc
         {
             get
@@ -95,72 +95,58 @@ namespace WCS_Client.From
 
         private void SetLED_Click(object sender, EventArgs e)
         {
-
         }
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-
         }
 
         private void CnNet_Click(object sender, EventArgs e)
         {
-
         }
 
         private void tmrState_Tick(object sender, EventArgs e)
         {
-
         }
 
         private void bkWorker_State_DoWork(object sender, DoWorkEventArgs e)
         {
-
         }
 
         private void bkWorker_State_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-
         }
 
         private void tmrArrived_Tick(object sender, EventArgs e)
         {
-
         }
 
         private void tmrScan_Tick(object sender, EventArgs e)
         {
-
         }
 
         private void tmrHS_Tick(object sender, EventArgs e)
         {
-
         }
 
         private void btnUnlockDDJ_Click(object sender, EventArgs e)
         {
-
         }
 
         private void rgvLock1_Click(object sender, EventArgs e)
         {
-
         }
 
         private void ChangeInMode(object sender, EventArgs e)
         {
-
         }
 
         private void DdjLock1_DoubleClick(object sender, EventArgs e)
         {
-
         }
 
         private void lblDDJWarning1_TextChanged(object sender, EventArgs e)
         {
-
         }
 
         private void Form_Monitior_Box_Load(object sender, EventArgs e)
@@ -170,11 +156,13 @@ namespace WCS_Client.From
             _timer.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
             _timer.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件；
         }
+
         private void theout(object sender, EventArgs e)
         {
             //var list = BaseWorkflow.QueryStackerdData(_plcnameSet);
-           // ShowData(list);
+            // ShowData(list);
         }
+
         private void ShowData(object Dat)
         {
             try
@@ -191,7 +179,6 @@ namespace WCS_Client.From
                 }
                 else
                 {
-
                 }
             }
             catch (Exception ex)
@@ -199,6 +186,7 @@ namespace WCS_Client.From
                 LogHelper.Sys_Log.WriteLog(ex.ToString());
             }
         }
+
         public void pan11(List<WCS_STACKERDATA> dt)
         {
             try
@@ -232,23 +220,23 @@ namespace WCS_Client.From
                                 ddjstatus.G.Image = Properties.Resources.黄;
                             }
                         }
-                        
+
                         //状态
                         ddjstatus.DdjStatus.Text = srmitem.SrmSignalItem.DB521_Srm_StatusCh.ToString();
                         int taskid = srmitem.SrmSignalItem.DB521_TaskID;
                         //任务Id
                         ddjstatus.DdjOrdId.Text = taskid.ToString();
-                        var task = tasks.FirstOrDefault(v => v.TASK_NO == taskid);
+                        var task = tasks.FirstOrDefault(v => v.ID == taskid);
                         if (task != null)
                         {
                             //任务类型
-                            ddjstatus.DdjOptType.Text = task.TASK_COMTYPECh.ToString();
-                            if (task.TASK_COMTYPECh == ComTypeEnum.入库)
+                            ddjstatus.DdjOptType.Text = task.TYPE.ToString();
+                            if (task.TYPE == WCS.Entity.TaskType.入库)
                             {
                                 ddjstatus.LblInStatus.BackColor = Color.Lime;
                                 ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
                             }
-                            else if (task.TASK_COMTYPECh == ComTypeEnum.出库 || task.TASK_COMTYPECh == ComTypeEnum.移库)
+                            else if (task.TYPE == WCS.Entity.TaskType.出库 || task.TYPE == WCS.Entity.TaskType.移库)
                             {
                                 ddjstatus.LblInStatus.BackColor = Color.DarkGray;
                                 ddjstatus.LblOutStatus.BackColor = Color.Lime;
@@ -260,13 +248,13 @@ namespace WCS_Client.From
                             ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
                         }
                         //当前位置
-                        ddjstatus.DdjPosCurr.Text= srmitem.SrmSignalItem.DB521_CurRow.ToString() + "-" + srmitem.SrmSignalItem.DB521_CurColumn.ToString() + "-" + srmitem.SrmSignalItem.DB521_CurLayer.ToString();
+                        ddjstatus.DdjPosCurr.Text = srmitem.SrmSignalItem.DB521_CurRow.ToString() + "-" + srmitem.SrmSignalItem.DB521_CurColumn.ToString() + "-" + srmitem.SrmSignalItem.DB521_CurLayer.ToString();
                         //运行时长
-                        ddjstatus.DdjWorkTime.Text = srmitem.SrmSignalItem.DB521_Runtime.ToString()+"h";
+                        ddjstatus.DdjWorkTime.Text = srmitem.SrmSignalItem.DB521_Runtime.ToString() + "h";
                         //里程数
-                        ddjstatus.DdjTotal_KM.Text = srmitem.SrmSignalItem.DB521_Total_KM.ToString()+"KM";
+                        ddjstatus.DdjTotal_KM.Text = srmitem.SrmSignalItem.DB521_Total_KM.ToString() + "KM";
                         //起始位置
-                        ddjstatus.DdjPosFrom.Text= srmitem.SrmSignalItem.DB521_FromRowPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_FromColumnPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_FromLayerPos.ToString();
+                        ddjstatus.DdjPosFrom.Text = srmitem.SrmSignalItem.DB521_FromRowPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_FromColumnPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_FromLayerPos.ToString();
                         //目标位置
                         ddjstatus.DdjPosTo.Text = srmitem.SrmSignalItem.DB521_ToRowPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_ToColumnPos.ToString() + "-" + srmitem.SrmSignalItem.DB521_ToLayerPos.ToString();
                     }
@@ -360,6 +348,7 @@ namespace WCS_Client.From
                 LogHelper.Sys_Log.WriteLog(ex.ToString());
             }
         }
+
         private Control FindControl(string controlName)
         {
             return Controls.Find(controlName, true)[0];
@@ -373,59 +362,72 @@ namespace WCS_Client.From
             equinfo.Show();
         }
     }
+
     public class DDJSatatus
     {
         /// <summary>
         /// 状态图标
         /// </summary>
         public PictureBox G { get; set; }
+
         /// <summary>
         /// 堆垛机名称
         /// </summary>
         public string SrmName { get; set; }
+
         /// <summary>
         /// 入库状态
         /// </summary>
         public Label LblInStatus { get; set; }
+
         /// <summary>
         /// 出库状态
         /// </summary>
         public Label LblOutStatus { get; set; }
+
         /// <summary>
         /// 堆垛机模式
         /// </summary>
         public Label DdjMode { get; set; }
+
         /// <summary>
         /// 堆垛机工作状态
         /// </summary>
         public Label DdjStatus { get; set; }
+
         /// <summary>
         /// 堆垛机工作任务
         /// </summary>
         public Label DdjOrdId { get; set; }
+
         /// <summary>
         /// 堆垛机作业类型
         /// </summary>
         public Label DdjOptType { get; set; }
+
         /// <summary>
         /// 堆垛机当前位置
         /// </summary>
         public Label DdjPosCurr { get; set; }
+
         /// <summary>
         /// 运行时间
         /// </summary>
         public Label DdjWorkTime { get; set; }
+
         /// <summary>
         /// 里程数
         /// </summary>
         public Label DdjTotal_KM { get; set; }
+
         /// <summary>
         /// 源仓位
         /// </summary>
         public Label DdjPosFrom { get; set; }
+
         /// <summary>
         /// 目标仓位
         /// </summary>
         public Label DdjPosTo { get; set; }
     }
-}
+}

WCS_Client/Workflow/BaseWorkflow.cs

@@ -2,12 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
 using WCS_Client.Models;
 using WCS_Client.Utility;
 using WCS_Client.Workflow;
-using WCS_TASK = WCS_Client.Models.WCS_TASK;
+using WCS_TASK = WCS.Entity.WCS_TASK;
 
 namespace WCS_Client
 {
@@ -233,7 +232,7 @@ namespace WCS_Client
                     dt = DatatableConvertHelper.ToDataTable(usersList);
                     count = Convert.ToInt32(db.Ado.GetScalar(CountStr));
                 });
-              
+
                 int PageCount = count / PageSize;
                 if (count % PageSize > 0)
                     PageCount += 1;
@@ -465,203 +464,155 @@ namespace WCS_Client
         public static string UpdateTask(int taskid, TaskStatusType taskStatusType)
         {
             string result = string.Empty;
-            try
-            {
-                TryCachHelper.TryExecute((db) =>
-                {
-                    var task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == taskid);
-                    if (taskStatusType == TaskStatusType.重下堆垛机)
-                    {
-                        if (task.TASK_WKSTATUS == (int)WkStatus.堆垛机执行)
-                        {
-                            if (task.TASK_COMTYPE == 2 || task.TASK_COMTYPE == 3)//出库，移库
-                            {
-                                task.TASK_WKSTATUS = 0;
-                                task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
-                            }
-                            else if (task.TASK_COMTYPE == 1)//入库
-                            {
-                                task.TASK_WKSTATUS = 2;
-                            }
-                            task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                            task.TASK_EDITDATETIME = DateTime.Now;
-                            db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-                            result = string.Format("任务[{0}]重下堆垛机成功。", task.TASK_NO);
-                            AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                        }
-                        else
-                        {
-                            result = string.Format("任务[{0}]不需要重下堆垛机。", task.TASK_NO);
-                        }
-                    }
-                    else if (taskStatusType == TaskStatusType.重下输送机)
-                    {
-                        if (task.TASK_WKSTATUS != (int)WkStatus.堆垛机执行)
-                        {
-                            if (task.TASK_COMTYPE == 1 || task.TASK_COMTYPE == 4)//入库，移动
-                            {
-                                task.TASK_WKSTATUS = 0;
-                                task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
-                                task.TASK_POSIDCUR = task.TASK_POSIDFROM;
-                                task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                                task.TASK_EDITDATETIME = DateTime.Now;
-                                db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-                                result = string.Format("任务[{0}]重下输送机成功。");
-                                AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                            }
-                            else
-                            {
-                                //出库，移库
-                                result = string.Format("出库和移库任务[{0}]不能重下输送机。", task.TASK_NO);
-                            }
-                        }
-                        else
-                        {
-                            result = string.Format("任务[{0}]状态为[堆垛机执行]不能重下输送机。", task.TASK_NO);
-                        }
-                    }
-                    else if (taskStatusType == TaskStatusType.重下RGV上料 && task.TASK_WKSTATUS == (int)WkStatus.RGV上料执行)
-                    {
-                        task.TASK_WKSTATUS = 2;
-                        task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                        task.TASK_EDITDATETIME = DateTime.Now;
-                        db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-
-                        var task_dtlSet = db.Queryable<WCS_TASK_DTL>().Where(v => v.PARENTID == task.TASK_NO).ToList();
-                        var task_dtl = task_dtlSet.FirstOrDefault(v => v.DESCRIPTION.Contains("上料到RGV工位"));
-
-                        int index = task_dtl.DESCRIPTION.IndexOf("上料到RGV工位");
-                        int tempindex = task_dtl.DESCRIPTION.IndexOf('[', index);
-                        string conveyerNo = task_dtl.DESCRIPTION.Substring(tempindex + 1, 4);
-                        //解锁
-                        db.Updateable<WCS_EQUIPMENTLOCK>().UpdateColumns(it => new WCS_EQUIPMENTLOCK { ISLOCK = false }).Where(v => v.EQUIPMENTNO == conveyerNo).ExecuteCommand();
-
-                        result = string.Format("任务[{0}]重下RGV上料成功。");
-                        AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                    }
-                    else if (taskStatusType == TaskStatusType.重下RGV下料 && task.TASK_WKSTATUS == (int)WkStatus.RGV下料执行)
-                    {
-                        var task_dtlSet = db.Queryable<WCS_TASK_DTL>().Where(v => v.PARENTID == task.TASK_NO).ToList();
-                        var task_dtl = task_dtlSet.FirstOrDefault(v => v.DESCRIPTION.Contains("上料到RGV工位"));
-
-                        task.TASK_WKSTATUS = 3;
-                        task.TASK_POSIDNEXT = task_dtl.POSIDNEXT;
-                        task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                        task.TASK_EDITDATETIME = DateTime.Now;
-                        db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-
-                        int index = task_dtl.DESCRIPTION.IndexOf("上料到RGV工位");
-                        int tempindex = task_dtl.DESCRIPTION.IndexOf('[', index);
-                        string conveyerNo = task_dtl.DESCRIPTION.Substring(tempindex + 1, 4);
-                        //解锁
-                        db.Updateable<WCS_EQUIPMENTLOCK>().UpdateColumns(it => new WCS_EQUIPMENTLOCK { ISLOCK = false }).Where(v => v.EQUIPMENTNO == conveyerNo).ExecuteCommand();
-
-                        result = string.Format("任务[{0}]重下RGV下料成功。", task.TASK_NO);
-                        AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                    }
-                    else if (taskStatusType == TaskStatusType.重下任务)
-                    {
-                        if (task.TASK_COMTYPE == 1)//入库
-                        {
-                            if (task.TASK_POSIDTO.Length < 10)
-                            {
-                                //未分配货位，可重下
-                                task.TASK_WKSTATUS = 0;
-                                task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
-                                task.TASK_POSIDCUR = task.TASK_POSIDFROM;
-                                task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                                task.TASK_EDITDATETIME = DateTime.Now;
-
-                                db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-                                result = string.Format("任务[{0}]重新下发成功。", task.TASK_NO);
-                                AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                            }
-                        }
-                        else if (task.TASK_COMTYPE == 4)//移动
-                        {
-                            if (task.TASK_WKSTATUS == 0)
-                            {
-                                result = string.Format("任务[{0}]未下发，不需要重下任务。", task.TASK_NO);
-                            }
-                            else
-                            {
-                                //移动任务，可重下
-                                task.TASK_WKSTATUS = 0;
-                                task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
-                                task.TASK_POSIDCUR = task.TASK_POSIDFROM;
-                                task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
-                                task.TASK_EDITDATETIME = DateTime.Now;
-
-                                db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
-                                result = string.Format("任务[{0}]重新下发成功。", task.TASK_NO);
-                                AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
-                            }
-                        }
-                        else if (task.TASK_COMTYPE == 2 || task.TASK_COMTYPE == 3)//出库,移库
-                        {
-                            result = string.Format("任务[{0}]是出库或移库任务，请使用[重下堆垛机]功能。", task.TASK_NO);
-                        }
-                    }
-
-                    if (string.IsNullOrWhiteSpace(result))
-                    {
-                        throw new Exception(string.Format("任务[{0}]该状态下不支持[{1}]", task.TASK_NO, taskStatusType));
-                    }
-                });
-            }
-            catch (Exception ex)
-            {
-                result = ex.Message;
-                LogHelper.Sys_Log.WriteLog(ex.ToString());
-            }
-            return result;
-        }
-
-        public static string TaskFinish(string taskno)
-        {
-            string result = string.Empty;
-            try
-            {
-                WCS_TASK task = null;
-
-                TryCachHelper.TryExecute((db) =>
-                {
-                    int task_no = Convert.ToInt32(taskno);
-                    task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == task_no);
-                });
-
-                if (task != null)
-                {
-                    if (task.TASK_COMTYPE == 1 || task.TASK_COMTYPE == 3)
-                    {
-                        if (task.TASK_WKSTATUS == (int)WkStatus.堆垛机执行 && task.TASK_POSIDTO.Length > 10)
-                        {
-                            result = TaskComplete(task.TASK_NO, task.TASK_COMTYPE);
-                        }
-                        else
-                        {
-                            result = string.Format("任务[{0}]当前状态不可手动完成。", taskno);
-                        }
-                    }
-                    else if (task.TASK_COMTYPE == 2 || task.TASK_COMTYPE == 4)
-                    {
-                        if (task.TASK_WKSTATUS == (int)WkStatus.堆垛机执行 || task.TASK_WKSTATUS <= 1)
-                        {
-                            result = string.Format("任务[{0}]当前状态不可手动完成。", taskno);
-                        }
-                        else
-                        {
-                            int tasktype = 4;
-                            result = TaskComplete(task.TASK_NO, tasktype);
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                result = ex.Message;
-                LogHelper.Sys_Log.WriteLog(ex.ToString());
-            }
+            //try
+            //{
+            //    TryCachHelper.TryExecute((db) =>
+            //    {
+            //        var task = db.Queryable<WCS_TASK>().First(v => v.ID == taskid);
+            //        if (taskStatusType == TaskStatusType.重下堆垛机)
+            //        {
+            //            if (task.STATUS == TaskStatus.堆垛机执行)
+            //            {
+            //                if (task.TYPE == WCS.Entity.TaskType.出库 || task.TYPE == WCS.Entity.TaskType.移库)//出库，移库
+            //                {
+            //                    task.TASK_WKSTATUS = 0;
+            //                    task.ADDRFROM = task.ADDRFROM;
+            //                }
+            //                else if (task.TASK_COMTYPE == 1)//入库
+            //                {
+            //                    task.TASK_WKSTATUS = 2;
+            //                }
+            //                task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //                task.TASK_EDITDATETIME = DateTime.Now;
+            //                db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+            //                result = string.Format("任务[{0}]重下堆垛机成功。", task.TASK_NO);
+            //                AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //            }
+            //            else
+            //            {
+            //                result = string.Format("任务[{0}]不需要重下堆垛机。", task.TASK_NO);
+            //            }
+            //        }
+            //        else if (taskStatusType == TaskStatusType.重下输送机)
+            //        {
+            //            if (task.TASK_WKSTATUS != (int)WkStatus.堆垛机执行)
+            //            {
+            //                if (task.TASK_COMTYPE == 1 || task.TASK_COMTYPE == 4)//入库，移动
+            //                {
+            //                    task.TASK_WKSTATUS = 0;
+            //                    task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
+            //                    task.TASK_POSIDCUR = task.TASK_POSIDFROM;
+            //                    task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //                    task.TASK_EDITDATETIME = DateTime.Now;
+            //                    db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+            //                    result = string.Format("任务[{0}]重下输送机成功。");
+            //                    AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //                }
+            //                else
+            //                {
+            //                    //出库，移库
+            //                    result = string.Format("出库和移库任务[{0}]不能重下输送机。", task.TASK_NO);
+            //                }
+            //            }
+            //            else
+            //            {
+            //                result = string.Format("任务[{0}]状态为[堆垛机执行]不能重下输送机。", task.TASK_NO);
+            //            }
+            //        }
+            //        else if (taskStatusType == TaskStatusType.重下RGV上料 && task.TASK_WKSTATUS == (int)WkStatus.RGV上料执行)
+            //        {
+            //            task.TASK_WKSTATUS = 2;
+            //            task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //            task.TASK_EDITDATETIME = DateTime.Now;
+            //            db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+
+            //            var task_dtlSet = db.Queryable<WCS_TASK_DTL>().Where(v => v.PARENTID == task.TASK_NO).ToList();
+            //            var task_dtl = task_dtlSet.FirstOrDefault(v => v.DESCRIPTION.Contains("上料到RGV工位"));
+
+            //            int index = task_dtl.DESCRIPTION.IndexOf("上料到RGV工位");
+            //            int tempindex = task_dtl.DESCRIPTION.IndexOf('[', index);
+            //            string conveyerNo = task_dtl.DESCRIPTION.Substring(tempindex + 1, 4);
+            //            //解锁
+            //            db.Updateable<WCS_EQUIPMENTLOCK>().UpdateColumns(it => new WCS_EQUIPMENTLOCK { ISLOCK = false }).Where(v => v.EQUIPMENTNO == conveyerNo).ExecuteCommand();
+
+            //            result = string.Format("任务[{0}]重下RGV上料成功。");
+            //            AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //        }
+            //        else if (taskStatusType == TaskStatusType.重下RGV下料 && task.TASK_WKSTATUS == (int)WkStatus.RGV下料执行)
+            //        {
+            //            var task_dtlSet = db.Queryable<WCS_TASK_DTL>().Where(v => v.PARENTID == task.TASK_NO).ToList();
+            //            var task_dtl = task_dtlSet.FirstOrDefault(v => v.DESCRIPTION.Contains("上料到RGV工位"));
+
+            //            task.TASK_WKSTATUS = 3;
+            //            task.TASK_POSIDNEXT = task_dtl.POSIDNEXT;
+            //            task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //            task.TASK_EDITDATETIME = DateTime.Now;
+            //            db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+
+            //            int index = task_dtl.DESCRIPTION.IndexOf("上料到RGV工位");
+            //            int tempindex = task_dtl.DESCRIPTION.IndexOf('[', index);
+            //            string conveyerNo = task_dtl.DESCRIPTION.Substring(tempindex + 1, 4);
+            //            //解锁
+            //            db.Updateable<WCS_EQUIPMENTLOCK>().UpdateColumns(it => new WCS_EQUIPMENTLOCK { ISLOCK = false }).Where(v => v.EQUIPMENTNO == conveyerNo).ExecuteCommand();
+
+            //            result = string.Format("任务[{0}]重下RGV下料成功。", task.TASK_NO);
+            //            AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //        }
+            //        else if (taskStatusType == TaskStatusType.重下任务)
+            //        {
+            //            if (task.TASK_COMTYPE == 1)//入库
+            //            {
+            //                if (task.TASK_POSIDTO.Length < 10)
+            //                {
+            //                    //未分配货位，可重下
+            //                    task.TASK_WKSTATUS = 0;
+            //                    task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
+            //                    task.TASK_POSIDCUR = task.TASK_POSIDFROM;
+            //                    task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //                    task.TASK_EDITDATETIME = DateTime.Now;
+
+            //                    db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+            //                    result = string.Format("任务[{0}]重新下发成功。", task.TASK_NO);
+            //                    AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //                }
+            //            }
+            //            else if (task.TASK_COMTYPE == 4)//移动
+            //            {
+            //                if (task.TASK_WKSTATUS == 0)
+            //                {
+            //                    result = string.Format("任务[{0}]未下发，不需要重下任务。", task.TASK_NO);
+            //                }
+            //                else
+            //                {
+            //                    //移动任务，可重下
+            //                    task.TASK_WKSTATUS = 0;
+            //                    task.TASK_POSIDNEXT = task.TASK_POSIDFROM;
+            //                    task.TASK_POSIDCUR = task.TASK_POSIDFROM;
+            //                    task.TASK_EDITUSERNO = CurrentHelper.User.USER_NO;
+            //                    task.TASK_EDITDATETIME = DateTime.Now;
+
+            //                    db.Updateable(task).UpdateColumns(it => new { it.TASK_WKSTATUS, it.TASK_POSIDNEXT, it.TASK_POSIDCUR, it.TASK_EDITUSERNO, it.TASK_EDITDATETIME }).ExecuteCommand();
+            //                    result = string.Format("任务[{0}]重新下发成功。", task.TASK_NO);
+            //                    AddWCS_TASK_DTL(db, task.TASK_NO, task.TASK_NO, task.TASK_POSIDCUR, task.TASK_POSIDNEXT, result + "操作用户：" + CurrentHelper.User.USER_NO);
+            //                }
+            //            }
+            //            else if (task.TASK_COMTYPE == 2 || task.TASK_COMTYPE == 3)//出库,移库
+            //            {
+            //                result = string.Format("任务[{0}]是出库或移库任务，请使用[重下堆垛机]功能。", task.TASK_NO);
+            //            }
+            //        }
+
+            //        if (string.IsNullOrWhiteSpace(result))
+            //        {
+            //            throw new Exception(string.Format("任务[{0}]该状态下不支持[{1}]", task.TASK_NO, taskStatusType));
+            //        }
+            //    });
+            //}
+            //catch (Exception ex)
+            //{
+            //    result = ex.Message;
+            //    LogHelper.Sys_Log.WriteLog(ex.ToString());
+            //}
             return result;
         }
 
@@ -760,9 +711,9 @@ namespace WCS_Client
             if (db.Updateable<WCS_TASK>()
                   .UpdateColumns(it => new WCS_TASK
                   {
-                      TASK_PRIORITY = priority,
+                      Priority = priority,
                   })
-                  .Where(v => v.TASK_NO == task_no).ExecuteCommand() < 0)
+                  .Where(v => v.ID == task_no).ExecuteCommand() < 0)
             {
                 throw new Exception(string.Format("任务[{0}]修改优先级为[{0}]失败", task_no, priority));
             }
@@ -797,17 +748,17 @@ namespace WCS_Client
         {
             string result = TryCachHelper.TryExecute((db) =>
             {
-                var task = db.Queryable<Frm.WCS_TASK>().First(v => v.ID == task_no);
+                var task = db.Queryable<WCS_TASK>().First(v => v.ID == task_no);
                 if (task == null)
                 {
                     throw new Exception(string.Format("未查询到[{0}]信息", task_no));
                 }
                 else
                 {
-                    if (task.TYPE == Frm.TaskType.出库 && task.STATUS > 0 && task.STATUS < 99)
+                    if (task.TYPE == WCS.Entity.TaskType.出库 && task.STATUS > 0 && task.STATUS < WCS.Entity.TaskStatus.已完成)
                     {
-                        if (db.Updateable<Frm.WCS_TASK>()
-                              .UpdateColumns(it => new Frm.WCS_TASK
+                        if (db.Updateable<WCS_TASK>()
+                              .UpdateColumns(it => new WCS_TASK
                               {
                                   STATUS = 0,
                                   UPDATETIME = DateTime.Now
@@ -826,134 +777,23 @@ namespace WCS_Client
             return result;
         }
 
-        
-
-        public static string OnUpMatRestart(int task_no)
-        {
-            string result = TryCachHelper.TryExecute((db) =>
-            {
-                var task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == task_no);
-                if (task == null)
-                {
-                    throw new Exception(string.Format("未查询到[{0}]信息", task_no));
-                }
-                else
-                {
-                    if (task.TASK_WKSTATUS == 7)
-                    {
-                        if (db.Updateable<WCS_TASK>()
-                              .UpdateColumns(it => new WCS_TASK
-                              {
-                                  TASK_WKSTATUS = 2,
-                                  TASK_RGVNO = "",
-                                  TASK_POSIDCUR = task.TASK_ITEM4,
-                                  TASK_POSIDNEXT = task.TASK_ITEM4,
-                                  TASK_EDITDATETIME = DateTime.Now
-                              })
-                              .Where(v => v.TASK_NO == task_no).ExecuteCommand() < 0)
-                        {
-                            throw new Exception(string.Format("任务[{0}]上下料重下RGV失败", task_no));
-                        }
-                    }
-                    else
-                    {
-                        throw new Exception(string.Format("任务[{0}]不能执行[上下料重下RGV].", task_no));
-                    }
-                }
-            });
-            return result;
-        }
-
-        public static string OnMatRestart(int task_no)
-        {
-            string result = TryCachHelper.TryExecute((db) =>
-            {
-                var task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == task_no);
-                if (task == null)
-                {
-                    throw new Exception(string.Format("未查询到[{0}]信息", task_no));
-                }
-                else
-                {
-                    if (task.TASK_WKSTATUS == 3)
-                    {
-                        if (db.Updateable<WCS_TASK>()
-                              .UpdateColumns(it => new WCS_TASK
-                              {
-                                  TASK_WKSTATUS = 2,
-                                  TASK_RGVNO = "",
-                                  TASK_POSIDCUR = task.TASK_POSIDNEXT,
-                                  TASK_EDITUSERNO = "wcs",
-                                  TASK_EDITDATETIME = DateTime.Now
-                              })
-                              .Where(v => v.TASK_NO == task_no).ExecuteCommand() < 0)
-                        {
-                            throw new Exception(string.Format("任务[{0}]上料重下RGV失败", task_no));
-                        }
-                    }
-                    else
-                    {
-                        throw new Exception(string.Format("任务[{0}]不能执行[上料重下RGV].", task_no));
-                    }
-                }
-            });
-            return result;
-        }
-
-        public static string UpMatRestart(int task_no)
-        {
-            string result = TryCachHelper.TryExecute((db) =>
-            {
-                var task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == task_no);
-                if (task == null)
-                {
-                    throw new Exception(string.Format("未查询到[{0}]信息", task_no));
-                }
-                else
-                {
-                    if (task.TASK_WKSTATUS == 4)
-                    {
-                        if (db.Updateable<WCS_TASK>()
-                              .UpdateColumns(it => new WCS_TASK
-                              {
-                                  TASK_WKSTATUS = 3,
-                                  TASK_RGVNO = "",
-                                  TASK_POSIDCUR = task.TASK_RGVNO,
-                                  TASK_POSIDNEXT = task.TASK_ITEM4,//起点地址
-                                  TASK_EDITUSERNO = "wcs",
-                                  TASK_EDITDATETIME = DateTime.Now
-                              })
-                              .Where(v => v.TASK_NO == task_no).ExecuteCommand() < 0)
-                        {
-                            throw new Exception(string.Format("任务[{0}]下料重下RGV失败", task_no));
-                        }
-                    }
-                    else
-                    {
-                        throw new Exception(string.Format("任务[{0}]不能执行[下料重下RGV].", task_no));
-                    }
-                }
-            });
-            return result;
-        }
-
         public static string FinishTask(int task_no)
         {
             string result = TryCachHelper.TryExecute((db) =>
             {
-                var task = db.Queryable<Frm.WCS_TASK>().First(v => v.ID == task_no);
+                var task = db.Queryable<WCS_TASK>().First(v => v.ID == task_no);
                 if (task == null)
                 {
                     throw new Exception(string.Format("未查询到[{0}]信息", task_no));
                 }
                 else
                 {
-                    if (task.STATUS > 1)
+                    if (task.STATUS > WCS.Entity.TaskStatus.新建)
                     {
-                        if (db.Updateable<Frm.WCS_TASK>()
-                             .UpdateColumns(it => new Frm.WCS_TASK
+                        if (db.Updateable<WCS_TASK>()
+                             .UpdateColumns(it => new WCS_TASK
                              {
-                                 STATUS = 99,
+                                 STATUS = WCS.Entity.TaskStatus.已完成,
                                  UPDATEUSER = CurrentHelper.User.USER_NO,
                                  UPDATETIME = DateTime.Now
                              })
@@ -975,19 +815,19 @@ namespace WCS_Client
         {
             string result = TryCachHelper.TryTranExecute((db) =>
             {
-                var task = db.Queryable<Frm.WCS_TASK>().First(v => v.ID == task_no);
+                var task = db.Queryable<WCS_TASK>().First(v => v.ID == task_no);
                 if (task == null)
                 {
                     throw new Exception(string.Format("未查询到[{0}]信息", task_no));
                 }
                 else
                 {
-                    if (task.STATUS < 99)
+                    if (task.STATUS < WCS.Entity.TaskStatus.已完成)
                     {
-                        if (db.Updateable<Frm.WCS_TASK>()
-                              .UpdateColumns(it => new Frm.WCS_TASK
+                        if (db.Updateable<WCS_TASK>()
+                              .UpdateColumns(it => new WCS_TASK
                               {
-                                  STATUS = 106,
+                                  STATUS = WCS.Entity.TaskStatus.已取消,
                                   UPDATETIME = DateTime.Now
                               })
                               .Where(v => v.ID == task_no).ExecuteCommand() < 0)
@@ -1038,14 +878,14 @@ namespace WCS_Client
                 }
                 nextAddress = dicSet[srm];
 
-                var task = db.Queryable<WCS_TASK>().First(v => v.TASK_NO == task_no);
+                var task = db.Queryable<WCS_TASK>().First(v => v.ID == task_no);
                 if (task == null)
                 {
                     throw new Exception(string.Format("未查询到[{0}]信息", task_no));
                 }
                 else
                 {
-                    if (task.TASK_POSIDTO.Length >= 10)
+                    if (task.ADDRTO.Length >= 10)
                     {
                         throw new Exception(string.Format("任务[{0}]已经分配货位，不能变更目标地址。", task_no));
                     }
@@ -1054,14 +894,14 @@ namespace WCS_Client
                         if (db.Updateable<WCS_TASK>()
                               .UpdateColumns(it => new WCS_TASK
                               {
-                                  TASK_POSIDNEXT = nextAddress,
-                                  TASK_POSIDTO = srm,
-                                  TASK_SRMNO = srm,
-                                  TASK_EndTunnelNum = srm,
-                                  TASK_EDITUSERNO = CurrentHelper.User.Use_Name,
-                                  TASK_EDITDATETIME = DateTime.Now
+                                  ADDRNEXT = nextAddress,
+                                  ADDRTO = srm,
+                                  DEVICE = srm,
+                                  TUNNEL = srm,
+                                  UPDATEUSER = CurrentHelper.User.Use_Name,
+                                  UPDATETIME = DateTime.Now
                               })
-                              .Where(v => v.TASK_NO == task_no).ExecuteCommand() < 0)
+                              .Where(v => v.ID == task_no).ExecuteCommand() < 0)
                         {
                             throw new Exception(string.Format("任务[{0}]修改目标地址失败", task_no));
                         }
@@ -1070,7 +910,7 @@ namespace WCS_Client
                         task_dtl.ID = Guid.NewGuid().ToString();
                         task_dtl.PARENTID = task_no;
                         task_dtl.TASKNO = task_no.ToString();
-                        task_dtl.POSIDCUR = task.TASK_POSIDCUR;
+                        //task_dtl.POSIDCUR = task.ADDRFROM;
                         task_dtl.POSIDNEXT = nextAddress;
                         task_dtl.DESCRIPTION = msg;
                         task_dtl.EXECUTEDATE = DateTime.Now;
@@ -1089,15 +929,15 @@ namespace WCS_Client
         {
             string result = TryCachHelper.TryTranExecute((db) =>
             {
-                var task = db.Queryable<Frm.WCS_TASK>().First(v => v.ID == task_no);
+                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<Frm.WCS_TASK>()
-                          .UpdateColumns(it => new Frm.WCS_TASK
+                    if (db.Updateable<WCS_TASK>()
+                          .UpdateColumns(it => new WCS_TASK
                           {
                               Priority = priority,
                               UPDATEUSER = CurrentHelper.User.Use_Name,

WCS_Client/Workflow/TaskWorkflow.cs

@@ -40,7 +40,7 @@ namespace WCS_Client.Workflow
                 dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.StationDatas.Datas.Where(p => p.D521.Tasknum == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
                 //不在输送线，尝试写入RGV
                 if (string.IsNullOrEmpty(dataTable.Rows[i][ADDRCURRENT].ToString()))
-                {
+                {  
                     dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.RGVDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1] && p.D521.PH_Status_1).FirstOrDefault()?.Code;
                 }
                 //不在输送线/RGV，尝试写入堆垛机