111

cjs

2025-05-30 251e0a3deb75c529fa35408be4ce5bb6e46a01f0

111

 .vs/VSWorkspaceState.json

New file
@@ -0,0 +1,7 @@
{
  "ExpandedNodes": [
    ""
  ],
  "SelectedNode": "\\C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A",
  "PreviewInSolutionExplorer": false
}

 .vs/¾£ÃŸñÁÖÃÀÄÏÇø/v17/.wsuo

Binary files differ

 .vs/¾£ÃŸñÁÖÃÀÄÏÇø/v17/DocumentLayout.json

New file
@@ -0,0 +1,65 @@
{
  "Version": 1,
  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\",
  "Documents": [],
  "DocumentGroupContainers": [
    {
      "Orientation": 0,
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
          "DockedWidth": 16,
          "SelectedChildIndex": -1,
          "Children": [
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
            }
          ]
        },
        {
          "DockedWidth": 18,
          "SelectedChildIndex": -1,
          "Children": [
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:1:0:{e8034f19-ab72-4f06-83fd-f6832b41aa63}"
            }
          ]
        }
      ]
    }
  ]
}

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs

@@ -146,7 +146,7 @@
        public ZZTPWNumResult ZZTPWNum(string factory)
        {
            ZZTPWNumResult result = new ZZTPWNumResult();
            result = ApiHelper.ZZTPWNum();
            result = ApiHelper.ZZTPWNum(factory);
            return result;
        }
    }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -981,7 +981,7 @@

                        if (req)
                        {
                            ProcessHelper.deleteInfo(plc.location + "-复称入缓存架");
                            ProcessHelper.deleteInfo(plc.location + "-复称下线");
                            var queryList = MongoDBSingleton.Instance.Find<packageInfoModel>(Query.And(Query.EQ("machineNo", model.machince), Query.EQ("trayCode", model.ext2), Query.EQ("weight2", "")), "packageInfoModel");
                            if (queryList.Count > 0)
                            {
@@ -1027,6 +1027,10 @@
                                MongoDBSingleton.Instance.Update<ProductList>(Query.And(Query.EQ("Date", DateTime.Now.ToString("yyyy-MM-dd")), Query.EQ("machine", model.machince)), Update.Set("percentOfPass", proInfo.percentOfPass).Set("qualifiedQuantity", proInfo.qualifiedQuantity), UpdateFlags.None);
                            }
                        }
                        else
                        {
                            ProcessHelper.recordInfo(plc.location + "-复称下线", "当前半成品库区未获取到可用货位，检查是否已满");
                        }

                    }
                    if (result.result[2] == 2)
@@ -1037,7 +1041,7 @@
                        req = WMSHelper.WMSIn(plc.location, model.ext2, ref wmstaskno, ref traycode, timeStamp);
                        if (req)
                        {
                            ProcessHelper.deleteInfo(plc.location + "-复称入缓存架");
                            ProcessHelper.deleteInfo(plc.location + "-复称下线");
                            var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                            {
                                addr = plc.writeAddr + 3,
@@ -1083,7 +1087,11 @@
                                else CMMLog.Debug($"packageInfoModel未找到数据，machineNo:{model.machince},trayCode:{model.ext2}");
                            }
                        }
                        else CMMLog.Debug($"复称入缓存架NG流程：WMS生成任务失败！");
                        else
                        {
                            ProcessHelper.recordInfo("复称下线", "当前NG库区未获取到可用货位，检查是否已满");
                            CMMLog.Debug($"复称入缓存架NG流程：WMS生成任务失败！");
                        }
                    }
                    string PlcBit02 = Settings.GetPlcInfo().Where(a => a.deviceType == "2").FirstOrDefault().location;
                    UpdateBuilder update = Update.Set("ng", result.result[2]);
@@ -1501,6 +1509,7 @@
                            string ChangeBit = WMSHelper.WmsUpdateWay(taskInfo.CN_S_SOURCE_NO, plc.Extend);
                            if (!string.IsNullOrEmpty(ChangeBit))
                            {
                                ProcessHelper.deleteInfo("叠包NG");
                                CMMLog.Info($"起点：{taskInfo.CN_S_END_BIT}");
                                CMMLog.Info($"终点：{ChangeBit}");
                                int[] parms = { StockInstance.Instance.GetAGVCodeForBitCode(taskInfo.CN_S_END_BIT), StockInstance.Instance.GetAGVCodeForBitCode(ChangeBit) };
@@ -1515,8 +1524,11 @@
                                MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);

                            }
                            else CMMLog.Debug($"调用WMS改道接口，未获取到可用点位。");
                            //Console.WriteLine($"读码信息比对结果：条码与传送的数据不一致");
                            else
                            {
                                CMMLog.Debug($"调用WMS改道接口，未获取到可用点位。");
                                ProcessHelper.recordInfo("叠包NG","NG库区未获取到可用货位，检查NG库区是否已满");
                            }
                        }
                        
                    }
@@ -1863,8 +1875,16 @@
                            string wmstaskno = "";
                            string traycode = "";
                            bool req = WMSHelper.WMSIn(plc.location, "", ref wmstaskno, ref traycode);
                            if (req) CMMLog.Debug($"调用WMS获取三楼叠盘机生成任务成功！");
                            else CMMLog.Debug($"调用WMS获取三楼叠盘机生成任务失败！");
                            if (req)
                            {
                                CMMLog.Debug($"调用WMS获取三楼叠盘机生成任务成功！");
                                ProcessHelper.deleteInfo("叠盘下线");
                            }
                            else
                            {
                                ProcessHelper.recordInfo("叠盘下线", "叠盘机下线库区未查询到可用货位，检查叠盘机下线库区是否已满");
                                CMMLog.Debug($"调用WMS获取三楼叠盘机生成任务失败！");
                            }
                        }
                    }
                }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -692,51 +692,51 @@
                if (plc.Count > 0)
                {
                    #region åˆ¤æ–­è¾“送线模式 å˜æ›´æ³¨é‡Š
                    bool action = true;
                    foreach(var a in plc)
                    {
                        var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                        {
                            dataNum = 1,
                            addr = a.readAddr + 3,
                            host = a.ip,
                            port = a.port
                        });
                        if (modeResult != null && modeResult.errCode == 0)
                        {
                            CMMLog.Debug($"OutWareTask：读取滚筒机{a.ip}通道号为：{a.readAddr + 3}的值为：{modeResult.result[0]}");
                            if (modeResult.result[0] == 2)
                            {
                                action = false;
                                CMMLog.Debug($"OutWareTask:输送线为 å…¥åº“模式，输送线点位：{a.location}");
                                break;
                            }
                            else
                            {
                                //读取中间表模式
                                var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
                                if (modelInfo != null)
                                {
                                    if (modelInfo.Mode == "入库模式")
                                    {
                                        action = false;
                                        CMMLog.Debug($"OutWareTask:中间表 ModeList为 å…¥åº“模式");
                                        break;
                                    }
                                }
                                else
                                {
                                    action = false;
                                    CMMLog.Debug("OutWareTask:中间表 ModeList ä¸ºç©º");
                                    break;
                                }
                            }
                        }
                    };
                    if (!action)
                    {
                        return false;
                    }
                    //bool action = true;
                    //foreach(var a in plc)
                    //{
                    //    var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                    //    {
                    //        dataNum = 1,
                    //        addr = a.readAddr + 3,
                    //        host = a.ip,
                    //        port = a.port
                    //    });
                    //    if (modeResult != null && modeResult.errCode == 0)
                    //    {
                    //        CMMLog.Debug($"OutWareTask：读取滚筒机{a.ip}通道号为：{a.readAddr + 3}的值为：{modeResult.result[0]}");
                    //        if (modeResult.result[0] == 2)
                    //        {
                    //            action = false;
                    //            CMMLog.Debug($"OutWareTask:输送线为 å…¥åº“模式，输送线点位：{a.location}");
                    //            break;
                    //        }
                    //        else
                    //        {
                    //            //读取中间表模式
                    //            var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
                    //            if (modelInfo != null)
                    //            {
                    //                if (modelInfo.Mode == "入库模式")
                    //                {
                    //                    action = false;
                    //                    CMMLog.Debug($"OutWareTask:中间表 ModeList为 å…¥åº“模式");
                    //                    break;
                    //                }
                    //            }
                    //            else
                    //            {
                    //                action = false;
                    //                CMMLog.Debug("OutWareTask:中间表 ModeList ä¸ºç©º");
                    //                break;
                    //            }
                    //        }
                    //    }
                    //};
                    //if (!action)
                    //{
                    //    return false;
                    //}
                    #endregion


@@ -793,14 +793,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;
                    }

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs

@@ -668,8 +668,7 @@

                    if (result != null && result.errCode == 0)
                    {
                        CMMLog.Info($"电动门开门流程：读取电动门通道号为：{doorInfo.readAddr}里面的值为{result.result[0]},{doorInfo.readAddr + 1}里面的值为{result.result[1]}");
                        Console.WriteLine($"电动门开门流程：读取电动门通道号为：{doorInfo.readAddr}里面的值为{result.result[0]},{doorInfo.readAddr + 1}里面的值为{result.result[1]}");
                        CMMLog.Info($"电动门开门流程：读取电动门通道号为：{doorInfo.readAddr}里面的值为{result.result[0]},{doorInfo.readAddr + 1}里面的值为{result.result[1]},门号：{action.Ext2}");
                        if(action.Ext2 == "4")
                        {
                            if (result.result[0] == 1)
@@ -681,7 +680,6 @@
                            }
                        }
                        else if(result.result[0] == 1 && result.result[1] == 1)
                        //if(result.result[0] == 1 && result.result[1] == 1)
                        {
                            //推送小车进去
                            CMMLog.Info($"电动门已经打开，门号：{action.Ext2}");