111

cjs

2025-06-10 fb892155304372a62658b48a351f392f227c30bb

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs

@@ -132,6 +132,14 @@
                string TRow = string.IsNullOrEmpty(end.CN_S_FLOOR) ? "1" : end.CN_S_FLOOR;
                CMMLog.Info($"任务推送：货位编码：起点信息:{JsonConvert.SerializeObject(start)},终点信息:{JsonConvert.SerializeObject(end)}；任务信息：{JsonConvert.SerializeObject(mst)}");

                var trayInfo = MongoDBSingleton.Instance.FindOne<trayTypeTable>(Query.EQ("locCode", mst.CN_S_START_BIT), "trayTypeTable");
                if (trayInfo != null && trayInfo.trayType == "2")
                {
                    start.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_START_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
                    end.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_END_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
                    CMMLog.Info($"任务推送：田字托起点终点 站点更改，起点：{start.CN_N_AGV_LOCATION}，终点：{end.CN_N_AGV_LOCATION}");
                }

                if (mst.CN_S_BUSS_TYPE == "3楼复称入缓存架")
                {
                    CMMLog.Info($"任务推送特殊任务处理-3楼复称入缓存架：任务号：{mst.CN_S_TASK_NO},准备获取 sendBit 配置数据。备注：此任务类型仅获取起点。");
@@ -154,6 +162,10 @@
                        if (emp != null)
                        {
                            start.CN_N_AGV_LOCATION = agvLoc.Site[emp.Quantity - 1];
                        }
                        if(agvLoc.trayType == 2)
                        {
                            end.CN_N_AGV_LOCATION = MongoDBSingleton.Instance.FindOne<STOCK_LOCATION_Two>(Query.EQ("CN_S_LOCATION_CODE", mst.CN_S_END_BIT), "STOCK_LOCATION_Two").CN_N_AGV_LOCATION;
                        }
                    }
                }
@@ -394,6 +406,7 @@
                    result = true;
                }
            }

            var bussTypeInfo = Settings.GetHouWeiCodeo().Where(a => a.location == mst.Ext1).FirstOrDefault();
            if (bussTypeInfo != null)
            {
@@ -581,7 +594,6 @@
            //入库输送线上有两个输送口

            //判断输送线模式和中间表模式都是入库模式

            try
            {
                string endMachLoc = "";
@@ -600,7 +612,7 @@
                    });
                    if (modeResult != null && modeResult.errCode == 0)
                    {
                        CMMLog.Debug($"InWareTask：读取滚筒机{plc.ip}通道号为：{plc.readAddr}的值为：{modeResult.result[0]}");
                        CMMLog.Debug($"InWareTask：读取滚筒机{plc.ip}通道号为：{plc.readAddr}的值为：{JsonConvert.SerializeObject(modeResult.result)}");
                        if (modeResult.result[0] == 1)
                        {
                            action = false;