11

cjs

昨天 124c6bef95aa767f62ac245a883179ff5baca206

 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];
                        }
@@ -353,7 +353,7 @@
            //if (plc != null || mst.CN_S_BUSS_TYPE == "3楼复称入缓存架")
            CMMLog.Info($"{mst.CN_S_END_BIT}");
            CMMLog.Info($"{plc}");
            if (plc != null || mst.CN_S_BUSS_TYPE == "3楼打包下线")
            if (plc != null || mst.CN_S_BUSS_TYPE == "3楼打包下线" || mst.CN_S_BUSS_TYPE == "PDA打包下线")
            {
                CMMLog.Info($"进入{mst.CN_S_BUSS_TYPE}流程{code}的处理");
                if (code == 1013)
@@ -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("接驳位点位未配置");
@@ -945,14 +945,14 @@
                        new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{endMachLoc}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(endMachLoc)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");

                        var plcTwo = Settings.GetPlcInfo().Where(a => a.location == endMachLoc && a.enable == 1).First();
                        //int[] num = new int[1] { 1 };
                        //var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                        //{
                        //    addr = plcTwo.writeAddr + 1,
                        //    host = plcTwo.ip,
                        //    data = num,
                        //    port = plcTwo.port
                        //});
                        int[] num = new int[1] { 1 };
                        var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                        {
                            addr = plcTwo.writeAddr + 1,
                            host = plcTwo.ip,
                            data = num,
                            port = plcTwo.port
                        });

                        result = true;
                    }