11

cjs

20 小时以前 124c6bef95aa767f62ac245a883179ff5baca206

11

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -1440,13 +1440,24 @@
                            {
                                //可以生成任务，调WMS接口获取任务信息
                                bool req = WMSHelper.WMSOut(pmInfo.location, "", trayType);
                                if (req) CMMLog.Debug($"调用WMS获取碟盘出库生成任务成功！");//现在任务由WMS自己下发，AMS做拦截处理（查询ext1里面对应的任务类型，并更改任务类型）
                                else CMMLog.Debug($"调用WMS获取碟盘出库生成任务失败！");
                                if (req)
                                {
                                    CMMLog.Debug($"调用WMS获取叠盘出库生成任务成功！");//现在任务由WMS自己下发，AMS做拦截处理（查询ext1里面对应的任务类型，并更改任务类型）
                                    ProcessHelper.deleteInfo(pmInfo.location + "-叠盘上线");
                                }
                                else CMMLog.Debug($"调用WMS获取叠盘出库生成任务失败！");
                            }
                            else CMMLog.Debug($"CacheStackingMouth: 托盘类型不正确，托盘类型：{result.result[2]}");
                            
                            else
                            {
                                CMMLog.Debug($"叠盘机: 托盘类型不正确，托盘类型：{result.result[2]}");
                                ProcessHelper.recordInfo(pmInfo.location + "-叠盘上线", $"托盘类型不正确，托盘类型：{result.result[2]}");
                            }
                        }
                        else CMMLog.Debug($"检查当前叠托点是否有任务占用，或者MST主表中有缓存架入叠盘机的任务！");
                        else
                        {
                            CMMLog.Debug($"检查当前叠托点是否有任务占用，或者MST主表中有缓存架入叠盘机的任务！");
                            ProcessHelper.recordInfo(pmInfo.location + "-叠盘上线", "叠盘机当前有任务");
                        }
                    }
                }
                else CMMLog.Debug($"缓存入叠盘机，创建任务，result={result.errMsg}");
@@ -1649,8 +1660,13 @@
                                            if (amsResult.success)
                                            {
                                                CMMLog.Info($"包装线补空任务生成成功");
                                                ProcessHelper.deleteInfo(pmInfo.location + "-包装机空托上线");
                                                break;
                                            }
                                            else
                                            {
                                                ProcessHelper.recordInfo(pmInfo.location + "-包装机空托上线", $"{amsResult.errMsg}");
                                            }
                                        }
                                    }
                                }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -145,7 +145,7 @@
                    {
                        if(mst.CN_S_BUSS_TYPE == "辅材出库（二段）")
                        {
                            start.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[0];
                            start.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[2];
                        }
                        else
                        {
@@ -155,7 +155,7 @@
                    }
                    if (mst.CN_S_END_BIT == conn[0].locCode || mst.CN_S_END_BIT == conn[1].locCode)
                    {
                        if(mst.CN_S_BUSS_TYPE == "辅材出库（二段）")
                        if(mst.CN_S_BUSS_TYPE == "辅材出库")
                        {
                            end.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[1];
                        }
@@ -658,7 +658,7 @@

                                new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{a.locCode}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(a.locCode)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");

                                MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", mst.CN_S_BATCH_NO).Set("END_LOC", a.locCode), UpdateFlags.None);
                                MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", mst.CN_S_BATCH_NO).Set("END_LOC", mst.CN_S_END_BIT), UpdateFlags.None);
                            }
                        }
                        else
@@ -668,7 +668,7 @@

                            new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{a.locCode}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(a.locCode)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");

                            MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = mst.CN_S_BATCH_NO, state = "0", END_LOC = a.locCode });
                            MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = mst.CN_S_BATCH_NO, state = "0", END_LOC = mst.CN_S_END_BIT });
                        }
                    }
                    else CMMLog.Debug("接驳位点位未配置");