111

cjs

2025-06-11 67f54fd5f720263e8a2937b0f0b0a610141bef08

111

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs

@@ -149,5 +149,19 @@
            result = ApiHelper.ZZTPWNum(factory);
            return result;
        }

        /// <summary>
        /// pda打包下线
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("Bzxx")]
        public BZXXResult Bzxx(bzxxModel model)
        {
            BZXXResult result = new BZXXResult();
            CMMLog.Debug("Bzxx Request：" + JsonConvert.SerializeObject(model));
            result = ApiHelper.Bzxx(model);
            return result;
        }
    }
}

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs

@@ -302,7 +302,12 @@
            /// </summary>
            public int direction { get; set; }
        }
        

        public class bzxxModel
        {
            public string mesCode { get; set; }
        }


        #region   教称流程，人工PDA返回复称平台，包装机复称信息

@@ -420,6 +425,21 @@
            return result;
        }

        internal static BZXXResult Bzxx(bzxxModel models)
        {
            BZXXResult result = new BZXXResult() {sucess = false };
            if(models != null && !string.IsNullOrEmpty(models.mesCode))
            {
                //通过mesCode获取mes的物料信息

            }
            else
            {
                result.errMsg = "参数输入错误";
            }
            return result;
        }

        public class AGV_STATE
        {
            public ObjectId _id { get; set; }
@@ -523,6 +543,12 @@
            public int N_QTY { get; set; }
        }

        public class BZXXResult
        {
            public bool sucess { get; set;}
            public string errMsg { get; set; }
        }

        /// <summary>
        /// hosttoagv上报车辆状态（参数在hosttoagv服务配置，可修改）
        /// </summary>

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -183,7 +183,6 @@
                                                if (trayCode.errCode == 0 && trayCode.result.Length == 95)
                                                {
                                                    //获取托盘码等信息  读取通道 11、12、13的数据作为托盘码   读取其它通道 重量 叠包等信息 所有数据存入MachineInfo表

                                                    string flLoc = "";
                                                    string location = "";
                                                    GetMachineData(pmInfo,ref location, trayCode.result, false, "1");
@@ -731,7 +730,7 @@
        internal static void PickUpFullDoorComplete(string ip, string taskNo)
        {
            var plc = Settings.GetPlcInfo().Where(a => a.ip == ip).FirstOrDefault();
            if (plc != null)
            if (plc != null && !plc.location.Contains("FLZT"))
            {
                //写入包装机--安全门关门指令
                var writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel

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

New file
@@ -0,0 +1,61 @@
{
  "Version": 1,
  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\ams\\Hanhe.iWCS.JingmenGEMTwoTCP\\",
  "Documents": [],
  "DocumentGroupContainers": [
    {
      "Orientation": 0,
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "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}"
            }
          ]
        },
        {
          "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}"
            }
          ]
        }
      ]
    }
  ]
}