blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
czw
2025-07-04 ec7508022ca60f92e5c9c68e183b682ab8a4eb1a 
 HH.WCS.QingXiNongfu/process/TaskProcess.cs


@@ -1,26 +1,14 @@


using HH.WCS.QingXigongchang.api;


using HH.WCS.QingXigongchang.core;


using HH.WCS.QingXigongchang.device;


using HH.WCS.QingXigongchang.device;


using HH.WCS.QingXigongchang.dispatch;


using HH.WCS.QingXigongchang.util;


using HH.WCS.QingXigongchang.wms;


using Newtonsoft.Json;


using NLog.Fluent;


using SqlSugar;


using System;


using System.Collections;


using System.Collections.Generic;


using System.Linq;


using System.Reflection;


using System.Reflection.Emit;


using System.Runtime.InteropServices;


using System.Security.Cryptography;


using System.Security.Policy;


using System.Threading;


using System.Threading.Tasks;


using System.Web.Http.Results;


using static HH.WCS.QingXigongchang.api.ApiModel;


using static HH.WCS.QingXigongchang.device.OITcpHelper;


using Monitor = HH.WCS.QingXigongchang.core.Monitor;




namespace HH.WCS.QingXigongchang.process


@@ -90,9 +78,11 @@




            if (bbbbbbb)


            {


                bbbbbbb = false;


                //UpdateElevatorTask(mst);


                //todo： 如果是电梯卸货任务电梯任务中间表状态，如


                if (BeenOver)


                //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");


                if (BeenOver || (mst.S_TYPE.Contains("成品满框") && bbbbbbb))


                {


                    //if (mst.S_TYPE.Trim().Contains("翻斗机叫满"))


                    //{


@@ -321,6 +311,7 @@


            return result;


        }






        /// <summary>


        /// 任务状态更新处理


        /// </summary>


@@ -397,17 +388,35 @@


                    //}


                }




                //终点货位为 YWLT1TSJCD  或者 YWLT2TSJCD 的 要取货完成解锁起点，解绑起点，绑定终点，卸货完成，解锁终点  2025年6月10日  Plg


                //if (mst.S_END_LAREA?.Trim() == "YWLT1TSJCD" || mst.S_END_LAREA?.Trim() == "YWLT2TSJCD")


                //{


                //    //解绑起点


                //    CacheBitUpdate(mst, load: true);


                //    //绑定终点


                //    CacheBitUpdate(mst, load: false);


                //}


                LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());


            }


            //new List<string> { "成品满框-入库", "" }


            if (state == 6 || state == 5)


            {




                LogHelper.Info($"任务类型：{mst.S_TYPE}- 动作：{state}. 是否5算6？{mst.S_TYPE.Contains("成品满框") || mst.S_TYPE.Contains("备货")} ");


                if (mst.S_TYPE.Contains("备货"))


                {


                    if (state == 6) goto vvv;


                }


                else if (state == 5) goto vvv;


                else if (state == 5)


                {


                    ///只需要释放货位就行了


                    //if (mst.S_END_LAREA?.Trim() == "YWLT1TSJCD" || mst.S_END_LAREA?.Trim() == "YWLT2TSJCD")


                    //{


                    //    LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());


                    //    return r;


                    //}


                    goto vvv;


                }




                if (mst.S_TYPE.Trim() == "J空瓶坯-出库")


                {


@@ -426,7 +435,10 @@


                    && mst.S_TYPE.Trim() != "瓶盖空筐转运-J2"


                    && mst.S_TYPE.Trim() != "青溪纸箱搬运物料"


                    && !mst.S_TYPE.Trim().Contains("自由点对点"))


                {


                    CacheBitUpdate(mst, load: false, mst.S_NOTE);


                }






                if (mst.S_TYPE.Trim().Contains("成品-空托上线"))


                {


@@ -1102,6 +1114,12 @@


            {


                CacheBitCancelUpdate(mst, out r, true);


            }


            if (state == 9)


            {


                CacheBitUpdate(mst, load: true);


                var g = LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());


                var T = LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());


            }


            return r;


        }




@@ -1339,6 +1357,48 @@


                        else return false;


                    }


                }


                //else if (taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-货架出提升机"))


                //{


                //    var ts = 5;


                //    start = LocationHelper.GetAgvSite(mst.S_START_LOC);//起点站点


                //    end = LocationHelper.GetAgvSite(mst.S_END_LOC);//终点站点


                //    var dic = new Dictionary<string, string>();


                //    dic.Add("From", start.ToString());


                //    dic.Add("To", end.ToString());


                //    dic.Add("FUNC", "0");


                //    dic.Add("DATA", "0");


                //    int height = 0;


                //    var itemcode = "";


                //    var ItemLayer = 0;


                //    var db = new SqlHelper<object>().GetInstance();


                //    var cirs = ContainerHelper.GetCntrItemRel(mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).First();


                //    LogHelper.Info($"原物料 收缩膜叉运 容器物料表数据{JsonConvert.SerializeObject(cirs)}", "HosttoagvTask");


                //    if (cirs != null)


                //    {


                //        var ItemF = db.Queryable<ItemInfo>().Where(a => a.S_ITEM_CODE == cirs.S_ITEM_CODE).First();


                //        itemcode = ItemF.S_ITEM_CODE;


                //        ItemLayer = ItemF.ItemLayer;


                //        if (mst.N_START_LAYER < 3 || mst.N_END_LAYER < 3)


                //        {


                //            height = ItemF.trayHeight;


                //        }


                //        else


                //        {


                //            height = ItemF.trayHeight1;


                //        }


                //    }


                //    dic.Add("ItemHeight", height.ToString());


                //    dic.Add("StaItemHeight", "0");


                //    dic.Add("TrayType", $"{mst.N_START_LAYER}{mst.N_END_LAYER}");


                //    var ggh = NDC.AddTaskNew(ts, mst.N_PRIORITY, mst.S_TASK_NO, dic);


                //    if (ggh)


                //    {


                //        TaskHelper.UpdateStatus(mst, "已推送");


                //        result = true;


                //        GeneralInterFaceFunc(mst, 8 + "");


                //    }


                //}




                //else if ( mst.S_END_LAREA == "WJBQDDKQ" || mst.S_END_LAREA == "SXBQDDKQ"|| mst.S_START_LAREA == "WJBQDDKQ" ||mst.S_START_LAREA == "SXBQDDKQ" )


                //{


                //    if (start == 0)


@@ -1406,6 +1466,7 @@


                //}


                else


                {




                    if (start == 0)


                    {


                        //bool flag3 = ;


@@ -1516,6 +1577,11 @@


                    }


                }




                //if (Settings.GetDeviceInfoList().Find(x => x.location.Contains(mst.S_END_LOC))?.deviceType == 13 && mst.S_TYPE.Contains("收缩膜叉运"))


                //{


                //    end = 7027;


                //}




                LogHelper.Info("SendTask " + mst.S_TASK_NO);


                Console.WriteLine("start=" + start.ToString());


                Console.WriteLine("end= " + end.ToString());


@@ -1593,8 +1659,11 @@


        /// <param name="trayCarryCount"></param>


        /// <param name="priority"></param>


        /// <returns></returns>


        public static bool CreateTransport(string wWorkNo, string start, string end, string taskType, List<string> cntrs, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1, string note = "")


        public static bool CreateTransport(string wWorkNo, string start, string end, string taskType, List<string> cntrs, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1, string note = "", string TwoEndLoc = "")


        {


            if (string.IsNullOrEmpty(start) || string.IsNullOrEmpty(end))


                return false;




            var result = false;


            //批次号存托盘号，1~3个托盘


            var trayCodes = string.Join(",", cntrs);


@@ -1602,7 +1671,7 @@




            LogHelper.Info($"CreateTransport-  " + $"{taskNo}-{start}-{end}-{taskType}");




            var res = TaskHelper.CreateTask(wWorkNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, trayCarryCount, startLayer, endLayer, note, lockLoc: true);


            var res = TaskHelper.CreateTask(wWorkNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, trayCarryCount, startLayer, endLayer, note, lockLoc: true, TwoEndLoc);


            if (res)


            {


                result = true;