lss
2025-06-19 ae75edc771b0161f90f3e5a596d13bee8a4b71cc
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -27,12 +27,11 @@
                {
                    if (model.state <= 7)
                    {
                        //有任务号请求
                        switch (model.state)
                        {
                            case 1:
                                WCSHelper.Begin(TN_Task);
                                WCSHelper.Begin(TN_Task, model.forklift_no);
                                break;
                            #region MyRegion
                            case 3:
@@ -47,7 +46,11 @@
                                break;
                            case 6:
                                WCSHelper.UpdateStatus(TN_Task, "卸货完成");
                                if (TN_Task.S_NOTE != "入库")
                                if (!string.IsNullOrEmpty(TN_Task.S_NOTE) && (TN_Task.S_NOTE.Trim() == "入库" || TN_Task.S_NOTE.Trim() == "空托回库"))
                                {
                                    LocationHelper.UnlockLoc(TN_Task.S_END_LOC);
                                }
                                else
                                {
                                    TaskProcess.OperateStatus(TN_Task, 6);
                                }
@@ -65,12 +68,12 @@
                        WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
                        //调用第三方接口(如果有)
                        //物料到位通知
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 2)
                        if ((TN_Task.S_TYPE == "出平库" || TN_Task.S_TYPE == "余料返回") && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
                        }
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 2)
                        if ((TN_Task.S_NOTE == "出库" || TN_Task.S_NOTE == "异常库区入库") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
                        {
                            string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
                            TaskProcess.MESIteminfoback(TN_Task, urlitem);
@@ -159,6 +162,13 @@
                    }
                    else
                    {
                        var db = new SqlHelper<TaskAction>().GetInstance();
                        var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
                        if (taskAction == null)
                        {
                            WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
                        }
                        //安全请求等
                        string url = "";
                        if (TN_Task.Z_TYPE == 1)