From 0fc71730109bb5904ded8e1a14c945e45b289c50 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 03 七月 2025 18:24:05 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 87 +++++++++++++--------
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 44 ++++++----
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs | 1
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs | 19 ++--
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/settings.xml | 4
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Settings.cs | 24 +++---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs | 6
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs | 19 ++--
8 files changed, 115 insertions(+), 89 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
index b6316be..2736558 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
@@ -773,6 +773,7 @@
{
public ObjectId _id { get; set; }
public string trayCode { get; set; }
+ public string isUse { get; set; } = "0";
public DateTime createTime { get; set; }
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index fe87d5a..9f783b6 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -2046,7 +2046,7 @@
{
//閫氳繃鎵樼洏鍙疯皟鐢╳ms鎺ュ彛鑾峰彇鐗╂枡淇℃伅
- CMMLog.Info("SendErpTaskInfoTableDG 琛�寮�:" + startBit);
+ CMMLog.Info("SendErpTaskInfoTableDG 琛ㄦ煡璇�寮�:" + startBit);
var url = hao.WebUrl + "GlmTrayItemSet";
var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTableDG>(Query.EQ("Bit", startBit), "SendErpTaskInfoTableDG");
if (erpInfo == null)
@@ -2072,34 +2072,42 @@
var wmsResponse = JsonConvert.DeserializeObject<LKInfoResModel>(feedback);
if (wmsResponse.Success == true)
{
- materiCode = wmsResponse.Data.CN_S_MATERI_CODE;
+ materiCode = wmsResponse.Data.CN_S_ITEM_CODE;
lotCode = wmsResponse.Data.CN_S_LOT_NO;
- totalWeight = wmsResponse.Data.CN_N_WEIGHT;
- productTime = wmsResponse.Data.CN_S_Data;
+ totalWeight = (int)wmsResponse.Data.CN_F_QUANTITY * wmsResponse.Data.CN_N_CONUT;
+ productTime = wmsResponse.Data.CN_T_PRODUCTION_S;
}
}
- CMMLog.Info("SendErpTaskInfoTableDG 琛�1");
- MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableDG>(new SendErpTaskInfoTableDG
+ CMMLog.Info("SendErpTaskInfoTableDG琛�1");
+ if (!string.IsNullOrEmpty(materiCode) && !string.IsNullOrEmpty(lotCode) && totalWeight != 0 && !string.IsNullOrEmpty(productTime))
{
- Bit = startBit,
- materiCode = materiCode,
- lotCode = lotCode,
- totalWeight = totalWeight,
- productTime = Convert.ToDateTime(productTime).AddHours(8),
- invalidationTime = Convert.ToDateTime(productTime).AddHours(8).AddDays(365),
- dateTime = DateTime.Now.AddHours(8),
- //鍙樻洿娉ㄩ噴
- mesSucess = "0"
- }, "SendErpTaskInfoTable");
+ MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableDG>(new SendErpTaskInfoTableDG
+ {
+ Bit = startBit,
+ materiCode = materiCode,
+ lotCode = lotCode,
+ totalWeight = totalWeight,
+ productTime = Convert.ToDateTime(productTime).AddHours(8),
+ invalidationTime = Convert.ToDateTime(productTime).AddHours(8).AddDays(365),
+ dateTime = DateTime.Now.AddHours(8),
+ //鍙樻洿娉ㄩ噴
+ mesSucess = "0"
+ }, "SendErpTaskInfoTableDG");
+ }
+ else
+ {
+ CMMLog.Info($"SendErpTaskInfoTableDG:鑾峰彇鏁版嵁閿欒锛宮ateriCode锛歿materiCode},lotCode:{lotCode},totalWeight:{totalWeight},productTime:{productTime}");
+ }
+
}
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�缁撴潫");
+ CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�缁撴潫");
}
catch (Exception ex)
{
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�err:" + ex.Message);
+ CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�err:" + ex.Message);
}
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
index 30e138d..2fdcd3b 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
@@ -119,7 +119,7 @@
if (timeReq.ProductionDate1.Length == 8) productTime = productTime.Substring(0, 4) + "-" + productTime.Substring(4, 2) + "-" + productTime.Substring(6, 2);
CMMLog.Info("time 05");
- var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("packingMachineNumber", timeReq.packingMachineNumber_1), "TimeCuoInfoCom");
+ var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeReq", timeReq.timeStamp), "TimeCuoInfoCom");
if (timeCuo == null)
{
MongoDBSingleton.Instance.Insert<TimeCuoInfoCom>(new TimeCuoInfoCom
@@ -171,7 +171,7 @@
}
else
{
- var query = Query.EQ("packingMachineNumber", timeReq.packingMachineNumber_1);
+ var query = Query.EQ("timeReq", timeReq.timeStamp);
//UpdateBuilder update = Update.Set("isFold", timeReq.isFold).Set("realWeight", timeReq.realWeight_1 / 100).Set("totalWeight", timeReq.totalWeight)
// .Set("batchNumber", timeReq.batchNumber).Set("productModel", timeReq.productModel).Set("needWeight", timeReq.needWeight_1).Set("bagNumber", timeReq.bagNumber_1).Set("isNeedTray", timeReq.isNeedTray)
// .Set("totalCount", timeReq.totalCount).Set("timeStamp", timeReq.timeStamp).Set("photoURL", timeReq.photoURL).Set("ProductionDate", productTime)
@@ -183,7 +183,7 @@
UpdateBuilder update = Update.Set("isFold", timeReq.isFold).Set("realWeight", timeReq.realWeight_1 / 100).Set("totalWeight", timeReq.totalWeight)
.Set("batchNumber", timeReq.batchNumber).Set("productModel", timeReq.productModel).Set("needWeight", timeReq.needWeight_1 / 100)
.Set("bagNumber_1", timeReq.bagNumber_1).Set("bagNumber_2", timeReq.bagNumber_2).Set("bagNumber_3", timeReq.bagNumber_3).Set("bagNumber_4", timeReq.bagNumber_4)
- .Set("isNeedTray", timeReq.isNeedTray)
+ .Set("isNeedTray", timeReq.isNeedTray).Set("packingMachineNumber", timeReq.packingMachineNumber_1)
.Set("totalCount", timeReq.totalCount).Set("timeStamp", timeReq.timeStamp).Set("photoURL", timeReq.photoURL).Set("ProductionDate", productTime)
.Set("materialCode", timeReq.materialCode).Set("materialName", timeReq.materialName).Set("measurementUnit", timeReq.measurementUnit)
.Set("createOrganization", timeReq.createOrganization).Set("count", timeReq.count).Set("WarehouseCode", timeReq.WarehouseCode)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index 8ccc524..a4b374b 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -3993,8 +3993,8 @@
{
CMMLog.Info("DGInWarehouse:" + JsonConvert.SerializeObject(locInfo));
string wmstaskno = "";
- string trayCode = "";
- bool req = WMSHelper.WMSIn(locCode, "鐢甸挻鎵撳寘涓嬬嚎", ref wmstaskno, ref trayCode, "", "CKHJ");
+ string trayCode = locInfo.trayCode;
+ bool req = WMSHelper.WMSIn(locCode, "鐢甸挻鎵撳寘涓嬬嚎", ref wmstaskno, ref trayCode, "", "DGCK");
if (req)
{
CMMLog.Info($"鐢甸挻鎺ラ┏浣嶅叆绔嬪簱娴佺▼锛歐MS鐢熸垚浠诲姟鎴愬姛锛�);
@@ -4727,59 +4727,72 @@
host = plc.ip,
port = plc.port
});
+ CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細璇诲彇閫氶亾鍙蜂负锛歿plc.readAddr},ip:{plc.ip},绔彛锛歿plc.port}");
+ CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾垮�涓猴細{result.result[0]}");
if (result != null && result.errCode == 0)
{
if (result.result[0] == 1)
{
//鎴愬搧涓嬬嚎浠诲姟鐢熸垚鍒版帴椹冲钩鍙�- string traycode = DateTime.Now.ToString("yyyy-MM-dd").Replace("-", "");
- //鍙敓鎴愪换鍔�- var CBInfo = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
- if (CBInfo != null)
+ string traycode = "";
+ var DGinfoList = MongoDBSingleton.Instance.FindAll<DGPackingLineFullModel>("DGPackingLineFullModel");
+ if (DGinfoList.Count > 0)
{
- //string timeStamp = timecuo.data.First().timeStamp.ToString();
- string timeStamp = "";
- foreach (var a in CBInfo)
+ var DGinfo = DGinfoList.Where(a => a.isUse == "0").OrderBy(a => a.createTime).First();
+ //灏嗘暟鎹彃鍏ヤ腑闂磋〃
+ traycode = DGinfo.trayCode;
+ }
+ //鍙敓鎴愪换鍔�+ CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾�鑾峰彇鎵樼洏鍙凤細{traycode}");
+ if (!string.IsNullOrEmpty(traycode))
+ {
+ var CBInfo = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
+ if (CBInfo != null)
{
- if (!string.IsNullOrEmpty(a.locCode))
+ foreach (var a in CBInfo)
{
- //鍦ㄤ腑闂磋〃涓煡鎵剧偣浣�- var CBTable = MongoDBSingleton.Instance.FindOne<DGConnectingBits>(Query.EQ("Bit", a.locCode), "DGConnectingBits");
- if (CBTable != null)
+ if (!string.IsNullOrEmpty(a.locCode))
{
- if (string.IsNullOrEmpty(CBTable.trayCode))
+ //鍦ㄤ腑闂磋〃涓煡鎵剧偣浣�+ var CBTable = MongoDBSingleton.Instance.FindOne<DGConnectingBits>(Query.EQ("Bit", a.locCode), "DGConnectingBits");
+ if (CBTable != null)
+ {
+ if (string.IsNullOrEmpty(CBTable.trayCode))
+ {
+ //鐢熸垚浠诲姟锛屽苟涓斿皢鐐逛綅鍐欏叆涓棿琛�+ var amsResult = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), plc.location, a.locCode, "鍖呰鏈烘弧鎵樹笅绾�, 0, traycode);
+ if (amsResult.success)
+ {
+ CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API鎴愬姛锛�);
+ MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", traycode), UpdateFlags.None);
+ MongoDBSingleton.Instance.Update<DGPackingLineFullModel>(Query.EQ("trayCode", traycode), Update.Set("isUse", "1"), UpdateFlags.None);
+ break;
+ }
+ else CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API澶辫触锛屽紑濮嬮噸鏂拌皟鐢紒");
+ }
+ }
+ else
{
//鐢熸垚浠诲姟锛屽苟涓斿皢鐐逛綅鍐欏叆涓棿琛� var amsResult = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), plc.location, a.locCode, "鍖呰鏈烘弧鎵樹笅绾�, 0, traycode);
if (amsResult.success)
{
CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API鎴愬姛锛�);
- MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", traycode).Set("timeCuo", timeStamp), UpdateFlags.None);
+ //鎵撳寘涓嬬嚎浠诲姟鐢熸垚鎴愬姛锛屽悜涓棿琛ㄦ彃鍏ユ暟鎹�
+ MongoDBSingleton.Instance.Insert<DGConnectingBits>(new DGConnectingBits { Bit = a.locCode, trayCode = traycode, state = "0" });
+ MongoDBSingleton.Instance.Update<DGPackingLineFullModel>(Query.EQ("trayCode", traycode), Update.Set("isUse", "1"), UpdateFlags.None);
break;
}
else CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API澶辫触锛屽紑濮嬮噸鏂拌皟鐢紒");
}
}
- else
- {
- //鐢熸垚浠诲姟锛屽苟涓斿皢鐐逛綅鍐欏叆涓棿琛�- var amsResult = AMSHelper.CreateTask(DateTime.Now.Ticks.ToString(), plc.location, a.locCode, "鍖呰鏈烘弧鎵樹笅绾�, 0, traycode);
- if (amsResult.success)
- {
- CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API鎴愬姛锛�);
- //鎵撳寘涓嬬嚎浠诲姟鐢熸垚鎴愬姛锛屽悜涓棿琛ㄦ彃鍏ユ暟鎹�-
- MongoDBSingleton.Instance.Insert<DGConnectingBits>(new DGConnectingBits { Bit = a.locCode, trayCode = traycode, state = "0", timeCuo = timeStamp });
- break;
- }
- else CMMLog.Debug($"鍖呰鏈烘弧鎵樹笅绾匡細AMS璋冪敤API澶辫触锛屽紑濮嬮噸鏂拌皟鐢紒");
- }
+ else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鐐逛綅鏈厤缃�);
}
- else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鐐逛綅鏈厤缃�);
}
+ else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鏈厤缃�);
}
- else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鏈厤缃�);
+
}
}
}
@@ -4846,15 +4859,19 @@
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
- public string CN_S_MATERI_CODE { get; set; }
+ public string CN_S_ITEM_CODE { get; set; }
/// <summary>
- /// 妗堕噸閲忥紙鍗曚釜妗堕噸閲�妗舵暟閲忥級
+ /// 妗堕噸閲� /// </summary>
- public int CN_N_WEIGHT { get; set; }
+ public float CN_F_QUANTITY { get; set; }
+ /// <summary>
+ /// 妗舵暟閲�+ /// </summary>
+ public int CN_N_CONUT { get; set; }
/// <summary>
/// 鐢熶骇鏃ユ湡
/// </summary>
- public string CN_S_Data { get; set; }
+ public string CN_T_PRODUCTION_S { get; set; }
public int CN_S_EXT8 { get; set; }
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
index 5d5d724..de44725 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
@@ -396,14 +396,15 @@
{
MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", mst.CN_S_START_BIT), Update.Set("trayCode", "").Set("state", "0"), UpdateFlags.None);
}
+ if (mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
+ {
+ MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", mst.CN_S_START_BIT), Update.Set("trayCode", "").Set("state", "0"), UpdateFlags.None);
+ MongoDBSingleton.Instance.Remove<DGPackingLineFullModel>(Query.EQ("trayCode", mst.CN_S_BATCH_NO), RemoveFlags.None);
+ }
//if (mst.CN_S_BUSS_TYPE == "3妤肩紦瀛樻灦鍏ュ彔鎵�) WMSHelper.ExecuteState(mst.CN_S_SOURCE_NO, action.CN_N_ACTION_CODE);
if (mst.CN_S_BUSS_TYPE == "3妤兼墦鍖呬笅绾�)
{
//鎵撳寘涓嬬嚎鍙栬揣瀹屾垚锛屽皢鏁版嵁鍐欏叆涓棿琛�- }
- if (mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
- {
- MongoDBSingleton.Instance.Remove<DGPackingLineFullModel>(Query.EQ("trayCode", mst.CN_S_BATCH_NO),RemoveFlags.None);
}
}
if (action.CN_N_ACTION_CODE == 6)
@@ -447,6 +448,12 @@
MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", mst.CN_S_END_BIT), Update.Set("state", "1"), UpdateFlags.None);
}
+ if (mst.CN_S_BUSS_TYPE == "鍖呰鏈烘弧鎵樹笅绾�)
+ {
+ MongoDBSingleton.Instance.Update<DGConnectingBits>(Query.EQ("Bit", mst.CN_S_END_BIT), Update.Set("state", "1"), UpdateFlags.None);
+
+ }
+
if (mst.CN_S_BUSS_TYPE == "3妤兼垚鍝佸嚭搴�)
{
//3妤兼垚鍝佸嚭搴撴敹鍒�涔嬪悗锛岀粓鐐硅揣浣嶆暟閲忓噺1锛岋紙娉細6淇″彿浼氬彂澶氭锛�@@ -857,10 +864,6 @@
/// 璐т綅鐘舵� 0 鏃犺揣 1 鏈夎揣
/// </summary>
public string state { get; set; }
- /// <summary>
- /// 鏃堕棿鎴�- /// </summary>
- public string timeCuo { get; set; }
/// <summary>
/// 浜屾浠诲姟鐨勭粓鐐硅揣浣� /// </summary>
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Settings.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Settings.cs
index 5159882..c47cb13 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Settings.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Settings.cs
@@ -499,31 +499,31 @@
}
#endregion
- #region SGConnectingbits
- private static string _SGConnectingbits = "";
- private static string SGConnectingbitsList
+ #region DGConnectingbits
+ private static string _DGConnectingbits = "";
+ private static string DGConnectingbitsList
{
get
{
- if (_SGConnectingbits == "")
+ if (_DGConnectingbits == "")
{
- _SGConnectingbits = XmlHelper.GetElementValue("SGConnectingbits");
+ _DGConnectingbits = XmlHelper.GetElementValue("DGConnectingbits");
}
- return _SGConnectingbits;
+ return _DGConnectingbits;
}
}
- private static List<SGConnectingbitsModel> SGconnectingbits = new List<SGConnectingbitsModel>();
- public static List<SGConnectingbitsModel> GetDGConnectingbitsList()
+ private static List<DGConnectingbitsModel> DGconnectingbits = new List<DGConnectingbitsModel>();
+ public static List<DGConnectingbitsModel> GetDGConnectingbitsList()
{
- if (SGconnectingbits.Count == 0 && SGConnectingbitsList != "")
+ if (DGconnectingbits.Count == 0 && DGConnectingbitsList != "")
{
- SGconnectingbits = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SGConnectingbitsModel>>(SGConnectingbitsList);
+ DGconnectingbits = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DGConnectingbitsModel>>(DGConnectingbitsList);
}
- return SGconnectingbits;
+ return DGconnectingbits;
}
- public class SGConnectingbitsModel
+ public class DGConnectingbitsModel
{
public string locCode { get; set; }
public int[] agvSite { get; set; }
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
index 349acb2..44e376a 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/WMSHelper.cs
@@ -404,7 +404,14 @@
CMMLog.Info($"WMSIn-{startBit}:ItemCode涓嶄负绌猴紝鑾峰彇淇℃伅锛�11!");
CMMLog.Info($"{ItemCode}");
- if (ItemCode == "time" || ItemCode == "鎷嗙洏鍙樻洿" || ItemCode == "鎵撳寘涓嬬嚎")
+ if (ItemCode == "鐢甸挻鎵撳寘涓嬬嚎")
+ {
+ model.trayCode = trayCode;
+ model.endArea = endArea;
+ //灏嗘暟鎹彃鍏ヤ腑闂磋〃
+ ERPService.senderpTaskDG(startBit, trayCode);
+ }
+ else if (ItemCode == "time" || ItemCode == "鎷嗙洏鍙樻洿" || ItemCode == "鎵撳寘涓嬬嚎")
{
CMMLog.Info($"{trayCode}");
var time = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(trayCode)), "TimeCuoInfoCom");
@@ -509,16 +516,6 @@
});
//灏嗘暟鎹彃鍏ヤ腑闂磋〃
ERPService.senderpTask(time, startBit);
- }
- else if (ItemCode == "鐢甸挻鎵撳寘涓嬬嚎")
- {
- var DGinfoList = MongoDBSingleton.Instance.FindAll<DGPackingLineFullModel>("DGPackingLineFullModel");
- if(DGinfoList.Count > 0){
- var DGinfo = DGinfoList.OrderBy(a => a.createTime).First();
- model.trayCode = DGinfo.trayCode;
- //灏嗘暟鎹彃鍏ヤ腑闂磋〃
- ERPService.senderpTaskDG(startBit, DGinfo.trayCode);
- }
}
}
else
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/settings.xml b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/settings.xml
index b16dac8..8318630 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/settings.xml
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/settings.xml
@@ -293,13 +293,13 @@
鍙傛暟璇存槑锛� locCode:璐т綅缂栫爜
-->
- <SGConnectingbits>
+ <DGConnectingbits>
<![CDATA[
[
{"locCode":"1","agvSite":[],"enable":1},
{"locCode":"2","agvSite":[],"enable":1}
]]]>
- </SGConnectingbits>
+ </DGConnectingbits>
<!--
绗笁鏂规帴鍙RL閰嶇疆椤�
--
Gitblit v1.9.1