出库修改

海波 张

2025-06-03 baf741a2c65777b70d96b6c5d60204170dd92626

 core/TaskCore.cs

@@ -11,6 +11,7 @@
using System.Reflection;
using System.Threading.Tasks;
using System.Web.Services.Description;
using Top.Api;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
using static HH.WCS.ZhongCeJinTan.util.Settings;

@@ -33,7 +34,7 @@
                        switch (model.state)
                        {
                            case 1:
                                TaskHelper.Begin(wmsTask);
                                TaskHelper.Begin(wmsTask,model.forklift_no);
                                //胎面交互
                                TaskHelper.TmSafety(wmsTask);
                                break;
@@ -65,6 +66,20 @@
                                TaskHelper.End(wmsTask); 
                            break;
                            case 7:

                                var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                if (wcsTask1!=null)
                                {
                                    //agv执行通知 wcs取消
                                    WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
                                    if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
                                    {
                                        TaskHelper.Fail(wcsTask1);
                                        TaskProcess.OperateStatus(wcsTask1, 7);
                                    }
                                }
                               

                                TaskHelper.Fail(wmsTask);
                                TaskProcess.OperateStatus(wmsTask, 7);
                                //入库或者回库任务取消删除托盘物料
@@ -85,8 +100,7 @@

                        }
                         TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
                        //agv执行通知
                        //WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
                        
                }
                else
                {
@@ -111,7 +125,11 @@
            var list = TaskHelper.GetTaskListByState("未执行", "agv");
            if (list.Count > 0) {
                list.ForEach(task => {
                    //任务拦截
                    if (TaskHelper.Intercept())
                    {
                        TaskProcess.SendTask(task);
                    }
                });     
            }
        }
@@ -127,7 +145,7 @@
            if (list.Count > 0)
            {
                list.ForEach(task => {
                    WcsTask.WcsTaskEntity(task);
                        WcsTask.WcsTaskEntity(task);
                });
            }
        }