From 67f54fd5f720263e8a2937b0f0b0a610141bef08 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期三, 11 六月 2025 17:20:28 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 3 -
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs | 14 +++++++
ams/Hanhe.iWCS.JingmenGEMTwoTCP/.vs/Hanhe.iWCS.JingmenGEMTwoTCP/v17/DocumentLayout.backup.json | 61 ++++++++++++++++++++++++++++++
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs | 28 +++++++++++++
4 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs
index 1e615e8..52d2459 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiController.cs
+++ b/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;
+ }
}
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
index ea1ad24..2c58360 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
+++ b/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 鏁欑О娴佺▼锛屼汉宸DA杩斿洖澶嶇О骞冲彴锛屽寘瑁呮満澶嶇О淇℃伅
@@ -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>
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index 890bb65..9c3767a 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -183,7 +183,6 @@
if (trayCode.errCode == 0 && trayCode.result.Length == 95)
{
//鑾峰彇鎵樼洏鐮佺瓑淇℃伅 璇诲彇閫氶亾 11銆�2銆�3鐨勬暟鎹綔涓烘墭鐩樼爜 璇诲彇鍏跺畠閫氶亾 閲嶉噺 鍙犲寘绛変俊鎭�鎵�湁鏁版嵁瀛樺叆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
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoTCP/.vs/Hanhe.iWCS.JingmenGEMTwoTCP/v17/DocumentLayout.backup.json b/ams/Hanhe.iWCS.JingmenGEMTwoTCP/.vs/Hanhe.iWCS.JingmenGEMTwoTCP/v17/DocumentLayout.backup.json
new file mode 100644
index 0000000..65d74a5
--- /dev/null
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoTCP/.vs/Hanhe.iWCS.JingmenGEMTwoTCP/v17/DocumentLayout.backup.json
@@ -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}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
--
Gitblit v1.9.1