111
cjs
2025-06-16 67e758f3477eb057e3458a0a3e8a2e8c6e94592e
111
4个文件已修改
21 ■■■■ 已修改文件
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
@@ -201,12 +201,15 @@
            #region 10006-叠盘机满托下线(3楼叠盘下线)-3楼叠盘下线--已完成(待测试)
            if (currActionModel.CN_N_ACTION_CODE == 10006)
            {
                var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).FirstOrDefault();
                if (plc != null)
                var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).ToList();
                if (plc.Count >0 )
                {
                    if (PickUpStartFree(plc.location))
                    foreach(var a in plc)
                    {
                        PLCControl.StackingLineEmpty(plc);
                        if (PickUpStartFree(a.location))
                        {
                            PLCControl.StackingLineEmpty(a);
                        }
                    }
                }
                //Thread.Sleep(500);
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -1470,8 +1470,10 @@
        /// </summary>
        /// <param name="ip"></param>
        /// <param name="taskNo"></param>
        internal static void CacheStackingMouth6(Settings.PlcInfo plc)
        internal static void CacheStackingMouth6(Settings.PlcInfo plc, string taskNo)
        {
            var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
            MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
            var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
            {
                addr = plc.writeAddr + 1,
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs
@@ -254,7 +254,7 @@
                    if (mst.CN_S_BUSS_TYPE == "包装线补空") PLCControl.PackingLineComplete(plc.ip);
                    if (mst.CN_S_BUSS_TYPE == "电梯取货") PLCControl.LiftAction(plc, mst.CN_S_TASK_NO,false);
                    if (mst.CN_S_BUSS_TYPE == "四钴成品出库" || mst.CN_S_BUSS_TYPE == "四钴辅材出库") PLCControl.productOutWare(mst.CN_S_END_BIT, mst.CN_S_TASK_NO, false);
                    if (mst.CN_S_BUSS_TYPE == "3楼缓存架入叠托") PLCControl.CacheStackingMouth6(plc);
                    if (mst.CN_S_BUSS_TYPE == "3楼缓存架入叠托") PLCControl.CacheStackingMouth6(plc,mst.CN_S_TASK_NO);
                }
            }
        }
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProtocolAnalysis.cs
@@ -153,6 +153,10 @@
                        MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", mst.CN_S_BATCH_NO), "TimeCuoInfoCom", RemoveFlags.None);
                    }
                    if (mst.CN_S_BUSS_TYPE == "3楼包装补空") PLCControl.PickUpBlankComplete(mst.CN_S_END_BIT);
                    if (mst.CN_S_BUSS_TYPE == "3楼缓存架入叠托")
                    {
                        MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", mst.CN_S_BUSS_TYPE),RemoveFlags.None);
                    }
                }
            }