123

cjs

2025-06-12 b7cf29b366aa2afb5fada4b340bac268c1bb1534

123

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.backup.json

@@ -34,10 +34,6 @@
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
            }
          ]
        },

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.json

@@ -34,6 +34,10 @@
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
            }
          ]
        },

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs

@@ -959,17 +959,18 @@
                var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                {
                    host = plc.ip,
                    addr = plc.writeAddr + 3,// + 4
                    addr = plc.writeAddr,
                    data = 0,
                    port = plc.port
                });

                writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                {
                    host = plc.ip,
                    addr = plc.writeAddr + 3,
                    data = 1,
                    port = plc.port
                });
                //var writeRes1 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                //{
                //    host = plc.ip,
                //    addr = plc.writeAddr + 3,
                //    data = 1,
                //    port = plc.port
                //});
            }
        }

@@ -4134,7 +4135,7 @@
                        if (result.result[0] == 2 && result.result[1] == 2 && result.result[3] == 2)
                        {
                            //推送小车进入
                            TSHelper.GoToAGV(taskNo, 10, 3);
                            TSHelper.GoToAGV(taskNo, 10, 1);
                            var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                            {
                                host = plc.ip,

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs

@@ -135,8 +135,8 @@
                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;
                    start.CN_N_AGV_LOCATION = start.CN_N_AGV_LOCATION + 400;
                    end.CN_N_AGV_LOCATION = end.CN_N_AGV_LOCATION + 400;
                    CMMLog.Info($"任务推送：田字托起点终点 站点更改，起点：{start.CN_N_AGV_LOCATION}，终点：{end.CN_N_AGV_LOCATION}");
                }