From fb892155304372a62658b48a351f392f227c30bb Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 10 六月 2025 17:33:51 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs | 203 +++++++++++++++++++++++++++-----------------------
1 files changed, 109 insertions(+), 94 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
index a87bf99..596065b 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/PLCControl.cs
@@ -569,8 +569,7 @@
// num[b] = Convert.ToInt32(Convert.ToString(int.Parse(taskInfo.Ext2), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
//}
- CMMLog.Debug($"{num}");
- Console.WriteLine(num);
+ CMMLog.Debug($"{JsonConvert.SerializeObject(num)}");
var wirteall = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
addr = plc.writeAddr + 5,
@@ -737,7 +736,9 @@
{
if(plc.deviceType == "22")
{
+ var newWeight = result.result[19] + "," + result.result[20];
MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("trayCode", model.ext2), Update.Set("secondNg", result.result[2]), UpdateFlags.None);
+ MongoDBSingleton.Instance.Update<MachineInfoTwoTetracobalt>(Query.EQ("trayCode", model.ext2), Update.Set("secondNg", result.result[2]).Set("oneTrayWeightFC",newWeight), UpdateFlags.None);
}
else
{
@@ -1159,32 +1160,6 @@
else if (readres.result[0] == 2)
{
TSHelper.GoToAGV(taskNo, 10, 3);
- //var task = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
- //var machine = MongoDBSingleton.Instance.FindOne<WMSInfo>(Query.EQ("trayCode", task.CN_S_BATCH_NO), "WMSInfo");
- //if (machine != null)
- //{
- // if (Settings.cacheStackWrite == "0")
- // {
- // int[] num = DiePan(machine);
- //
- // var wirteall01 = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
- // {
- // addr = plc.writeAddr + 10,
- // host = plc.ip,
- // port = plc.port,
- // data = num
- // });
- // }
- // else WriteCacheStackingData(plc, task, machine);
- //
- // var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
- // {
- // addr = plc.writeAddr + 1,
- // host = plc.ip,
- // port = plc.port,
- // data = 2
- // });
- //}
}
}
else CMMLog.Debug($"缂撳瓨鍏ュ彔鐩樻満锛�013锛宲lc=null!");
@@ -1192,7 +1167,7 @@
public static void WriteCacheStackingData(Settings.PlcInfo plc, TN_I_TASK_MST task, WMSInfo machine)
{
- if (plc.deviceType == "22")
+ if (plc.deviceType == "23")
{
//鍥涢挻杞﹂棿
var machineTwo = MongoDBSingleton.Instance.FindOne<MachineInfoTwoTetracobalt>(Query.EQ("trayCode", task.CN_S_BATCH_NO), "MachineInfoTwoTetracobalt");
@@ -1204,7 +1179,7 @@
CMMLog.Info($"3妤肩紦瀛樻灦鍏ュ彔鎵�鍐欏叆鏁版嵁锛歿JsonConvert.SerializeObject(num)},IPort:{plc.ip},{plc.port}");
var wirteall01 = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
- addr = plc.writeAddr + 10,
+ addr = plc.writeAddr + 5,
host = plc.ip,
port = plc.port,
data = num
@@ -1245,12 +1220,12 @@
{
var ErpItemInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", machineInfoTwo.materialCode), "ERPItemTable");
- CMMLog.Info($"3妤肩紦瀛樻灦鍏ュ彔鎵�鏀跺埌淇″彿5锛屾煡璇achineInfoTwoTetracobalt琛ㄤ俊鎭細{JsonConvert.SerializeObject(ErpItemInfo)}銆�);
+ CMMLog.Info($"3妤肩紦瀛樻灦鍏ュ彔鎵�鏀跺埌淇″彿4锛屾煡璇RPItemTable琛ㄤ俊鎭細{JsonConvert.SerializeObject(ErpItemInfo)}銆�);
//鍋忕Щ閲�+11 閫氶亾鑼冨洿锛�40311 ~ 40390
CMMLog.Info($"鍙犵洏鏈烘暟鎹鐞�");
//10~19閫氶亾
- int[] num = new int[105];//鎬婚暱搴︼細80
+ int[] num = new int[105];//鎬婚暱搴︼細105
#region 0~23 => 6~29
int a = 0;//鍛樺伐缂栧彿澶勭悊
@@ -1262,8 +1237,10 @@
a = 0;//鎵樼洏鐮佸鐞� for (int b = 5; b <= 7; b++)
{
- num[b] = int.Parse(AsciiToTen(machine.trayCode.Substring(a, 2)));
- a = a + 2;
+ //num[b] = int.Parse(AsciiToTen(machine.trayCode.Substring(a, 2)));
+ //a = a + 2;
+
+ num[b] = 0;
}
num[8] = int.Parse(AsciiToTen(machine.location));//鍖呰鏈哄彿
for (int b = 9; b <= 10; b++)
@@ -1281,7 +1258,12 @@
int k = b % 2 == 0 ? 0 : 16;
num[b] = Convert.ToInt32(Convert.ToString(int.Parse(machine.oneTrayWeight), 2).PadLeft(32, '0').ToString().Substring(k, 16), 2);
}
- for (int b = 15; b <= 16; b++) num[b] = 0;// 鍙犲寘鍚庡疄闄呴噸閲�&& 澶嶇О缁撴灉 榛樿锛�
+ for (int b = 15; b <= 16; b++)
+ {
+ var arrTwo = machineInfoTwo.oneTrayWeightFC.Split(',').ToList();
+ num[b] = int.Parse(arrTwo[b - 15]);//澶嶇О閲嶉噺
+ }
+ //for (int b = 15; b <= 16; b++) num[b] = 0;// 鍙犲寘鍚庡疄闄呴噸閲�&& 澶嶇О缁撴灉 榛樿锛�
num[17] = int.Parse(machineInfoTwo.trayType);
num[18] = machine.addState;//鏄惁闇�鍙犲寘
@@ -1388,69 +1370,96 @@
var plc = Settings.GetPlcInfo().Where(a => a.deviceType == ip).FirstOrDefault();
if(plc != null)
{
- OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ if(plc.deviceType == "23")
{
- addr = plc.writeAddr + 1,
- host = plc.ip,
- data = 2,//4
- port = plc.port
- });
- Thread.Sleep(100);
- var readres = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
- {
- dataNum = 2,
- addr = plc.readAddr + 1,
- host = plc.ip,
- port = plc.port
- });
- if (readres != null)
- {
- var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
- if (readres.result[0] == 3 && readres.result[1] == 1)
+ var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
- CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊�銆�);
- //璇荤爜淇℃伅姣斿缁撴灉锛歄K 璇诲埌閫氶亾2鍙傛暟涓�鏃�灏忚溅灏嗘墭鐩樻斁缃湪鍙犵洏鏈轰笂锛堟敼鍙傛暟10涓�锛�- var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ addr = plc.writeAddr + 1,
+ host = plc.ip,
+ data = 3,
+ port = plc.port
+ });
+ if (wirte.errCode == 0)
+ {
+ var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
+ MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
+
+ wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
addr = plc.writeAddr + 1,
host = plc.ip,
- data = 3,//4
+ data = 0,
port = plc.port
});
- if (wirte.errCode == 0)
+ TSHelper.GoToAGV(taskNo, 10, 7);
+ }
+ }
+ else
+ {
+ OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = plc.writeAddr + 1,
+ host = plc.ip,
+ data = 2,
+ port = plc.port
+ });
+ var readres = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
+ {
+ dataNum = 2,
+ addr = plc.readAddr + 1,
+ host = plc.ip,
+ port = plc.port
+ });
+ if (readres != null)
+ {
+ var taskInfo = MongoDBSingleton.Instance.FindOne<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), "TN_I_TASK_MST");
+ if (readres.result[0] == 3 && readres.result[1] == 1)
{
- //骞跺垹闄MSInfo涓棿琛ㄤ腑瀵瑰簲鎵樼洏鍙风殑鏁版嵁锛堜篃鍙湪灏忚溅绂诲紑鍙犵洏鏈轰箣鍚庡垹闄わ紝鏆傚畾閫氶亾2鍙傛暟1锛�- CMMLog.Debug($"璇荤爜淇℃伅姣斿缁撴灉锛歄K ,骞跺垹闄MSInfo涓棿琛ㄤ腑瀵瑰簲鎵樼洏鍙风殑鏁版嵁");
- MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
- CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊�銆�);
- if (CacheStackingMouth8(plc))
+ CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊�銆�);
+ //璇荤爜淇℃伅姣斿缁撴灉锛歄K 璇诲埌閫氶亾2鍙傛暟涓�鏃�灏忚溅灏嗘墭鐩樻斁缃湪鍙犵洏鏈轰笂锛堟敼鍙傛暟10涓�锛�+ var wirte = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
- CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊兼垚鍔燂紝鏇存敼AGV鍙傛暟10涓�锛岃灏忚溅绂诲紑銆�);
- TSHelper.GoToAGV(taskNo, 10, 7);
+ addr = plc.writeAddr + 1,
+ host = plc.ip,
+ data = 3,
+ port = plc.port
+ });
+ if (wirte.errCode == 0)
+ {
+ //骞跺垹闄MSInfo涓棿琛ㄤ腑瀵瑰簲鎵樼洏鍙风殑鏁版嵁锛堜篃鍙湪灏忚溅绂诲紑鍙犵洏鏈轰箣鍚庡垹闄わ紝鏆傚畾閫氶亾2鍙傛暟1锛�+ CMMLog.Debug($"璇荤爜淇℃伅姣斿缁撴灉锛歄K ,骞跺垹闄MSInfo涓棿琛ㄤ腑瀵瑰簲鎵樼洏鍙风殑鏁版嵁");
+ MongoDBSingleton.Instance.Remove<WMSInfo>(Query.EQ("trayCode", taskInfo.CN_S_BATCH_NO), RemoveFlags.Single);
+ CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊�銆�);
+ if (CacheStackingMouth8(plc))
+ {
+ CMMLog.Debug($"3妤肩紦瀛樻灦鍏ュ彔鎵極K锛歍askNo:{taskInfo.CN_S_TASK_NO},鍙犲寘OK鍐欏叆鍊兼垚鍔燂紝鏇存敼AGV鍙傛暟10涓�锛岃灏忚溅绂诲紑銆�);
+ TSHelper.GoToAGV(taskNo, 10, 7);
+ }
}
}
- }
- else if (readres.result[0] == 3 && readres.result[1] == 2)
- {
- CMMLog.Debug($"璇荤爜淇℃伅姣斿缁撴灉锛氭潯鐮佷笌浼犻�鐨勬暟鎹笉涓�嚧");
- //浜屾湡--璋冪敤 WMS 鏀归亾鎺ュ彛 鑾峰彇 鐩爣鐐逛綅锛屽苟 鏇存敼 AGV 绔欑偣
- string ChangeBit = WMSHelper.WmsUpdateWay(taskInfo.CN_S_SOURCE_NO, plc.Extend);
- if (!string.IsNullOrEmpty(ChangeBit))
+ else if (readres.result[0] == 3 && readres.result[1] == 2)
{
- int[] parms = { StockInstance.Instance.GetAGVCodeForBitCode(taskInfo.CN_S_END_BIT), StockInstance.Instance.GetAGVCodeForBitCode(ChangeBit) };
- TSHelper.ChangeParam(taskNo, 1, parms);
- TSHelper.GoToAGV(taskNo, 3, 1);// 娉板窞鏍兼灄缇庢洿鏀硅捣鐐瑰眰鏁颁负1-鑽嗛棬涔熼渶瑕佹洿鏀�+ CMMLog.Debug($"璇荤爜淇℃伅姣斿缁撴灉锛氭潯鐮佷笌浼犻�鐨勬暟鎹笉涓�嚧");
+ //浜屾湡--璋冪敤 WMS 鏀归亾鎺ュ彛 鑾峰彇 鐩爣鐐逛綅锛屽苟 鏇存敼 AGV 绔欑偣
+ string ChangeBit = WMSHelper.WmsUpdateWay(taskInfo.CN_S_SOURCE_NO, plc.Extend);
+ if (!string.IsNullOrEmpty(ChangeBit))
+ {
+ int[] parms = { StockInstance.Instance.GetAGVCodeForBitCode(taskInfo.CN_S_END_BIT), StockInstance.Instance.GetAGVCodeForBitCode(ChangeBit) };
+ TSHelper.ChangeParam(taskNo, 1, parms);
+ TSHelper.GoToAGV(taskNo, 3, 1);// 娉板窞鏍兼灄缇庢洿鏀硅捣鐐瑰眰鏁颁负1-鑽嗛棬涔熼渶瑕佹洿鏀�
- //TSHelper.ChangeParam(taskNo, 1, StockInstance.Instance.GetAGVCodeForBitCode(taskInfo.CN_S_END_BIT));
- //TSHelper.ChangeParam(taskNo, 2, StockInstance.Instance.GetAGVCodeForBitCode(ChangeBit));
- TSHelper.GoToAGV(taskNo, 10, 8);
- MongoDBSingleton.Instance.Update<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), Update.Set("CN_S_END_BIT", ChangeBit).Set("CN_S_START_BIT", taskInfo.CN_S_END_BIT), "TN_I_TASK_MST", UpdateFlags.None);
+ //TSHelper.ChangeParam(taskNo, 1, StockInstance.Instance.GetAGVCodeForBitCode(taskInfo.CN_S_END_BIT));
+ //TSHelper.ChangeParam(taskNo, 2, StockInstance.Instance.GetAGVCodeForBitCode(ChangeBit));
+ TSHelper.GoToAGV(taskNo, 10, 8);
+ MongoDBSingleton.Instance.Update<TN_I_TASK_MST>(Query.EQ("CN_S_TASK_NO", taskNo), Update.Set("CN_S_END_BIT", ChangeBit).Set("CN_S_START_BIT", taskInfo.CN_S_END_BIT), "TN_I_TASK_MST", UpdateFlags.None);
+ }
+ else CMMLog.Debug($"璋冪敤WMS鏀归亾鎺ュ彛锛屾湭鑾峰彇鍒板彲鐢ㄧ偣浣嶃�");
+ Console.WriteLine($"璇荤爜淇℃伅姣斿缁撴灉锛氭潯鐮佷笌浼犻�鐨勬暟鎹笉涓�嚧");
}
- else CMMLog.Debug($"璋冪敤WMS鏀归亾鎺ュ彛锛屾湭鑾峰彇鍒板彲鐢ㄧ偣浣嶃�");
- Console.WriteLine($"璇荤爜淇℃伅姣斿缁撴灉锛氭潯鐮佷笌浼犻�鐨勬暟鎹笉涓�嚧");
+ //PLCControl.CacheStackingMouth6(plc);
}
- //PLCControl.CacheStackingMouth6(plc);
}
+
}
}
@@ -2742,7 +2751,7 @@
/// <param name="info"></param>
/// <param name="result"></param>
/// <param name="noPack">true : MES浜や簰鏂瑰紡 false : 鏃燤ES浜や簰鏂瑰紡</param>
- private static void GetMachineDataTetracobalt(int[] result ,bool noPack = true)
+ private static void GetMachineDataTetracobalt(int[] result, ref string timeStamp, bool noPack = true)
{
CMMLog.Info($"鏁版嵁澶勭悊娴佺▼锛氳繘鍏ユ暟鎹鐞嗘祦绋嬶紒");
@@ -2792,7 +2801,7 @@
info.addState = Convert.ToInt32(Completion(result[18]), 2);
if (info.addState == 0) CMMLog.Error($"鏁版嵁澶勭悊娴佺▼锛氳幏鍙朚ODBUS淇℃伅寮傚父:鏄惁鍙犲寘鍊间负0.");
info.packageCode = Convert.ToInt32(Completion(result[19]), 2).ToString();
- info.productTime = Convert.ToInt32(Completion(result[21]) + Completion(result[22]), 2).ToString();
+ info.productTime = Convert.ToInt32(Completion(result[20]) + Completion(result[21]), 2).ToString();
//info.addWeight = Convert.ToInt32(Completion(result[10]) + Completion(result[11]), 2).ToString();
//info.packNg = 1;//涓嶉渶瑕佹鍙傛暟 result[12]
@@ -2847,18 +2856,22 @@
//娉ㄦ剰锛氳繖閲岃祴鍊间腑闂磋〃鍙傛暟璇峰鐓т俊鎭氦浜掕〃鍏蜂綋閫氶亾鍊煎搴� UpdateBuilder update = Update.Set("palletLayers", info.secondNg.ToString()).Set("overlappingLayers", info.addState.ToString()).Set("bagNo", info.packageCode).
Set("lotNo", info.lotNo).Set("productType", info.productType).Set("materialCode", info.materialCode).Set("materialName", info.materialName).Set("measurementUnit", info.measurementUnit);
- MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("machineNo", location), update, "MachiMachineInfoTetracobaltneInfo", UpdateFlags.None);
+ MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(Query.EQ("machineNo", location), update, "MachineInfoTetracobalt", UpdateFlags.None);
MongoDBSingleton.Instance.Update<MachineInfoTwoTetracobalt>(Query.EQ("trayCode", trayCode), update, "MachineInfoTwoTetracobalt", UpdateFlags.None);
}
//鍦ㄤ腑闂磋〃涓壘鍒板垰鍒氭彃鍏ョ殑MES鏁版嵁锛堢洰鍓嶈繕娌℃湁璇诲彇骞跺啓鍏ヨ澶囨暟鎹級
+
+ timeStamp = ProcessHelper.GetTimeStamp(31, 1, 1);
+ trayCode = "VW" + timeStamp;
+
var query1 = Query.And(Query.EQ("machineNo", location), Query.EQ("trayCode", "0"));
UpdateBuilder updateBuider = Update.Set("empCode", info.empCode).Set("location", info.location).
- Set("trayCode", info.trayCode).Set("productWeight", info.productWeight).
+ Set("trayCode", trayCode).Set("productWeight", info.productWeight).
Set("trayCodeWeight", info.trayCodeWeight).Set("oneTrayWeight", info.oneTrayWeight).Set("trayType", info.trayType).Set("addState", info.addState).
- Set("addWeight", info.addWeight).Set("packNg", info.packNg).Set("secondNg", info.secondNg).Set("productTime", info.productTime).
+ Set("addWeight", info.addWeight).Set("packNg", info.packNg).Set("secondNg", info.secondNg).Set("productTime", info.productTime).Set("packageCode", info.packageCode).
Set("jsonData", json).Set("modify", DateTime.Now);
MongoDBSingleton.Instance.Update<MachineInfoTetracobalt>(query1, updateBuider, "MachineInfoTetracobalt", UpdateFlags.None);
- MongoDBSingleton.Instance.Update<MachineInfoTwoTetracobalt>(Query.EQ("trayCode", trayCode), updateBuider, "MachineInfoTwoTetracobalt", UpdateFlags.None);
+ MongoDBSingleton.Instance.Update<MachineInfoTwoTetracobalt>(query1, updateBuider, "MachineInfoTwoTetracobalt", UpdateFlags.None);
CMMLog.Info($"鏁版嵁澶勭悊娴佺▼锛氭洿鏂癕achineInfoTetracobalt涓棿琛ㄥ垰鍒氭彃鍏ョ殑MES鏁版嵁!璁惧鍙蜂负锛歿location},鎵樼洏鍙蜂负锛歿trayCode}");
}
else
@@ -3705,7 +3718,8 @@
if (trayCode.errCode == 0 && trayCode.result.Length == 105)
{
//鑾峰彇鎵樼洏鐮佺瓑淇℃伅 璇诲彇閫氶亾 11銆�2銆�3鐨勬暟鎹綔涓烘墭鐩樼爜 璇诲彇鍏跺畠閫氶亾 閲嶉噺 鍙犲寘绛変俊鎭�鎵�湁鏁版嵁瀛樺叆MachineInfo琛�- GetMachineDataTetracobalt(trayCode.result, false);
+ string timeStamp = "";
+ GetMachineDataTetracobalt(trayCode.result, ref timeStamp, false);
var tray = MongoDBSingleton.Instance.FindOne<MachineInfoTetracobalt>(Query.EQ("machineNo", pmInfo.location), "MachineInfoTetracobalt");
if (tray != null)
{
@@ -3723,9 +3737,10 @@
if (IsContLaterCode)
{
- 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);
+ //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);
+ //MongoDBSingleton.Instance.Update<MachineInfoTwoTetracobalt>(Query.EQ("_id", tray._id), Update.Set("trayCode", tray.trayCode), UpdateFlags.None);
CMMLog.Debug($"锛堝洓閽磋溅闂达級鍖呰涓嬬嚎娴佺▼-{pmInfo.location}锛氭墭鐩樼爜锛歿tray.trayCode}");
if (tray.addState == 0)
{
@@ -4066,7 +4081,7 @@
{
if (action)
{
- int[] num = new int[4] { 2, 0, 1, 1 };
+ int[] num = new int[4] { 2, 0, 0, 1 };
var writeRes = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
{
host = plc.ip,
@@ -4086,7 +4101,7 @@
CMMLog.Debug($"鏌ヨ璁惧{plc.location}閫氶亾{plc.readAddr}閲岄潰鏁版嵁涓簕result.result[0]}銆亄result.result[1]}銆亄result.result[3]}.");
if (result != null && result.errCode == 0)
{
- if (result.result[0] == 2 && result.result[1] == 2 && result.result[2] == 2)
+ if (result.result[0] == 2 && result.result[1] == 2 && result.result[3] == 2)
{
//鎺ㄩ�灏忚溅杩涘叆
TSHelper.GoToAGV(taskNo, 10, 3);
--
Gitblit v1.9.1