qx

czw

2025-06-18 9862f9e1237c3d360cb4fb5547d8b11e33578d39

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -387,7 +387,7 @@
                }

                //终点货位为 YWLT1TSJCD  或者 YWLT2TSJCD 的 要取货完成解锁起点，解绑起点，绑定终点，卸货完成，解锁终点  2025年6月10日  Plg
                //if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
                //if (mst.S_END_LAREA?.Trim() == "YWLT1TSJCD" || mst.S_END_LAREA?.Trim() == "YWLT2TSJCD")
                //{
                //    //解绑起点
                //    CacheBitUpdate(mst, load: true);
@@ -399,19 +399,22 @@
            //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;

                ///只需要释放货位就行了
                //if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
                //{
                //    LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
                //    return r;
                //}
                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空瓶坯-出库")
                {
@@ -1523,10 +1526,10 @@
                    }
                }

                if (Settings.GetDeviceInfoList().Find(x => x.location.Contains(mst.S_END_LOC))?.deviceType == 13 && mst.S_TYPE.Contains("收缩膜叉运"))
                {
                    end = 7027;
                }
                //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());