111

cjs

2025-06-11 8111f0b69161ca7be2246c03e9ffba1e2fe989e9

111

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/.vs/Hanhe.iWCS.TaizhouGEMTwoProtocol/v17/DocumentLayout.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/PLCControl.cs

@@ -503,8 +503,8 @@
                data = num,//原先是1,单个写入
                port = plc.port
            });
            CMMLog.Debug($"写入设备{plc.location}通道{plc.writeAddr}里面数据为1.");
            Console.WriteLine($"写入设备{plc.location}通道{plc.writeAddr}里面数据为1.");
            CMMLog.Debug($"写入设备{plc.location}通道{plc.writeAddr}里面数据为{JsonConvert.SerializeObject(num)}.");
            Console.WriteLine($"写入设备{plc.location}通道{plc.writeAddr}里面数据为{JsonConvert.SerializeObject(num)}.");
            ///小车和复称位对接
            //小车请求进料，并且查询设备是否允许AGV进入
            var readRes = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
@@ -766,6 +766,7 @@
                    }

                    if (result.result[0] == 3 && result.result[2] == 1)
                    //if (result.result[2] == 1)
                    {
                        CMMLog.Info($"SecondWeightActionOne:准备生成复称入缓存架任务，开始确定托盘号:{model.ext2}");
                        if(plc.deviceType == "22")
@@ -1470,17 +1471,21 @@
        /// <param name="taskNo"></param>
        internal static void CacheStackingMouth6(Settings.PlcInfo plc)
        {
            //var readres = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
            //{
            //    dataNum = 2,
            //    addr = plc.readAddr + 1,
            //    host = plc.ip,
            //    port = plc.port
            //});
            //if (readres != null)
            //{

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

        /// <summary>
@@ -3731,12 +3736,26 @@
                                                            CMMLog.Debug($"（四钴车间）包装下线流程-{pmInfo.location}：员工编码：{employeeId}");
                                                            // 判断当前【员工编号】通道信息读出来的员工编号是否已经存在于我们的员工信息表-ERPEmployeeTable(查询字段-employee_id)
                                                            var erpEmployeeInfo = MongoDBSingleton.Instance.FindOne<ERPEmployeeTable>(Query.EQ("employee_id", employeeId), "ERPEmployeeTable");
                                                            if (erpEmployeeInfo == null) IsContLaterCode = false;
                                                            var erpItemInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", tray.materialCode), "ERPItemTable");
                                                            if (string.IsNullOrEmpty(tray.empCode) || string.IsNullOrEmpty(tray.materialCode) || erpEmployeeInfo == null || erpEmployeeInfo == null)
                                                            {
                                                                CMMLog.Debug($"（四钴车间）包装下线流程-{pmInfo.location}：人员表或者物料表未找到该数据，员工编号：{employeeId}，物料编码：{tray.materialCode}！");
                                                                IsContLaterCode = false;
                                                            }
                                                            else CMMLog.Debug($"（四钴车间）包装下线流程-{pmInfo.location}：员工编码查询成功");
                                                        }

                                                        if (IsContLaterCode)
                                                        {
                                                            //检索员工信息成功
                                                            var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                                            {
                                                                addr = pmInfo.writeAddr,
                                                                host = pmInfo.ip,
                                                                port = pmInfo.port,
                                                                data = 4
                                                            });

                                                            //string timeStamp = ProcessHelper.GetTimeStamp(31, 1, 1);
                                                            //tray.trayCode = "VW" + timeStamp;
                                                            //MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("_id", tray._id), Update.Set("trayCode", tray.trayCode), UpdateFlags.None);
@@ -4081,6 +4100,16 @@
            {
                if (action)
                {
                    var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                    {
                        dataNum = 1,
                        addr = plc.readAddr + 3,
                        host = plc.ip,
                        port = plc.port
                    });
                    CMMLog.Debug($"查询设备{plc.location}通道{plc.readAddr + 3}里面数据为{result.result[0]}.");
                    if (result.result[0] == 1)
                    {
                    int[] num = new int[4] { 2, 0, 0, 1 };
                    var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                    {
@@ -4090,8 +4119,9 @@
                        port = plc.port
                    });
                    CMMLog.Debug($"写入设备{plc.location}通道{plc.writeAddr}里面数据为{JsonConvert.SerializeObject(num)}.");
                    }

                    var result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                    result = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                    {
                        dataNum = 4,
                        addr = plc.readAddr,
@@ -4105,7 +4135,7 @@
                        {
                            //推送小车进入
                            TSHelper.GoToAGV(taskNo, 10, 3);
                            writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                            var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                            {
                                host = plc.ip,
                                addr = plc.writeAddr + 3,

 ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/ProcessHelper.cs

@@ -254,6 +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);
                }
            }
        }
@@ -471,7 +472,7 @@
                {
                    #region 判断输送线模式 变更注释
                    bool action = true;
                    plc.ForEach(a =>
                    foreach(var a in plc)
                    {
                        var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                        {
@@ -487,6 +488,7 @@
                            {
                                action = false;
                                CMMLog.Debug($"OutWareTask:输送线为 入库模式，输送线点位：{a.location}");
                                break;
                            }
                            else
                            {
@@ -498,6 +500,18 @@
                                    {
                                        action = false;
                                        CMMLog.Debug($"OutWareTask:中间表 ModeList为 入库模式");

                                    }
                                    else
                                    {
                                        int[] num = new int[1] { 1 };
                                        var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                                        {
                                            host = a.ip,
                                            addr = a.writeAddr,
                                            data = num,
                                            port = a.port
                                        });
                                    }
                                }
                                else
@@ -507,7 +521,7 @@
                                }
                            }
                        }
                    });
                    };
                    if (!action)
                    {
                        return false;
@@ -631,6 +645,14 @@
                                }
                                else
                                {
                                    int[] num = new int[1] { 2 };
                                    var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
                                    {
                                        host = plc.ip,
                                        addr = plc.writeAddr,
                                        data = num,
                                        port = plc.port
                                    });
                                    return true;
                                }
                            }