From e0471620ed16295a330ce18bcfe1654c91138996 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 18 七月 2025 17:24:42 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 8 ++--
/dev/null | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs | 23 ++++++-----
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs | 20 +++++++--
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 18 ++++----
5 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx
deleted file mode 100644
index 826ad34..0000000
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx
+++ /dev/null
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx
deleted file mode 100644
index 1ad2cd0..0000000
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx
+++ /dev/null
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
index aa44d84..61f4a59 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
@@ -487,6 +487,7 @@
//鍙樻洿娉ㄩ噴
totalNeedWeight = (int)req.data.FMustQty,
FEntryID_1 = 0,
+ orderCode = ""
});
}
else
@@ -553,17 +554,17 @@
//涓婃姤鏉＄爜琛� CMMLog.Info($"INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
- //var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
- //if(plc != null)
- //{
- // var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
- // {
- // addr = plc.writeAddr,
- // host = plc.ip,
- // port = plc.port,
- // data = 4
- // });
- //}
+ var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
+ if(plc != null)
+ {
+ var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = plc.writeAddr,
+ host = plc.ip,
+ port = plc.port,
+ data = 4
+ });
+ }
}
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index 6fa8241..e9f0197 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -601,10 +601,10 @@
var plc = Settings.GetPlcInfo().Where(a => a.ip == ip).FirstOrDefault();
//ASM鍐欏叆閫氶亾0灏忚溅鍔ㄤ綔锛�-鍙栨枡
int[] num = new int[2] { 1, 1 };
- //if(type == "PDA鎵撳寘涓嬬嚎")
- //{
- // num[0] = 4;
- //}
+ if(type == "PDA鎵撳寘涓嬬嚎")
+ {
+ num[0] = 4;
+ }
var writeRes0 = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
host = ip,
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 7199b41..8f9ec54 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -353,7 +353,7 @@
//if (plc != null || mst.CN_S_BUSS_TYPE == "3妤煎绉板叆缂撳瓨鏋�)
CMMLog.Info($"{mst.CN_S_END_BIT}");
CMMLog.Info($"{plc}");
- if (plc != null || mst.CN_S_BUSS_TYPE == "3妤兼墦鍖呬笅绾�)
+ if (plc != null || mst.CN_S_BUSS_TYPE == "3妤兼墦鍖呬笅绾� || mst.CN_S_BUSS_TYPE == "PDA鎵撳寘涓嬬嚎")
{
CMMLog.Info($"杩涘叆{mst.CN_S_BUSS_TYPE}娴佺▼{code}鐨勫鐞�);
if (code == 1013)
@@ -945,14 +945,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;
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index b725d86..2ac64f5 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -348,7 +348,7 @@
/// <summary>
/// 鏃堕棿鎴� /// </summary>
- public int timeStamp { get; set; }
+ public string timeStamp { get; set; }
/// <summary>
/// 鐓х墖url
/// </summary>
@@ -428,7 +428,7 @@
}
if (ItemCode == "time" && time != null)
{
- int TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp : int.Parse(timeStamp);
+ string TimeStamp = string.IsNullOrEmpty(timeStamp) ? time.timeStamp.ToString() : timeStamp;
CMMLog.Info($"time鑾峰彇鏃堕棿鎴虫暟鎹紝鑾峰彇淇℃伅锛�);
model.data.Add(new ItemData()
{
@@ -468,7 +468,7 @@
foldingbag = "1",
//totalWeight = time.totalWeight,
- timeStamp = 1,
+ timeStamp = "1",
photoURL = "1",
//productType = time.productModel,
//bagNumber = time.bagNumber,
@@ -480,7 +480,7 @@
}
else if (ItemCode == "鎵撳寘涓嬬嚎")
{
- int TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp : int.Parse(trayCode);
+ string TimeStamp = string.IsNullOrEmpty(trayCode) ? time.timeStamp.ToString() : trayCode;
//List<string> batchList = time.batchNumber.Split('-').ToList();
//string batch = "";
//for(int i = 0; i < 1; i++)
@@ -594,7 +594,17 @@
var wmsResponse = JsonConvert.DeserializeObject<WMSResponseModel>(feedback);
//var res = feedback.Replace("{", "").Replace("}", "").Replace(":", "=").Replace(",", ";").Replace('"', ' ');
if (wmsResponse.Success == true) {
- if(ItemCode == "鎵撳寘涓嬬嚎") MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
+ if (ItemCode == "鎵撳寘涓嬬嚎")
+ {
+ if (trayCode.Contains("MES"))
+ {
+ MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStampMES", trayCode), RemoveFlags.Single);
+ }
+ else
+ {
+ MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), RemoveFlags.Single);
+ }
+ }
msg = $"WMSIn-{startBit}:銆愯皟鐢╳ms鑾峰彇鍏ュ簱璐т綅銆戞垚鍔燂紒杩斿洖缁撴灉=" + wmsResponse.Success + ";璋冪敤WebUrl=" + url + ";杈撳叆鍙傛暟=" + msgData;
}
else {
--
Gitblit v1.9.1