From 23b4700a5a8555684de58b5d80ff06ae387432f2 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期五, 16 五月 2025 17:24:49 +0800
Subject: [PATCH] 流程开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs | 103 +++++++++-----
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs | 178 +++++++++++++++++++++++--
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs | 48 ++++++
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/HH.WCS.DaYang.csproj | 1
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs | 21 ++
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs | 4
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/models/EquipmentStatus.cs | 22 +++
8 files changed, 318 insertions(+), 61 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/HH.WCS.DaYang.csproj b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/HH.WCS.DaYang.csproj
index d8eb178..b670cfd 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/HH.WCS.DaYang.csproj
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/HH.WCS.DaYang.csproj
@@ -188,6 +188,7 @@
<Compile Include="core\Monitor.cs" />
<Compile Include="models\BaseModel.cs" />
<Compile Include="models\Area.cs" />
+ <Compile Include="models\EquipmentStatus.cs" />
<Compile Include="models\CntrItem.cs" />
<Compile Include="models\CntrItemDetail.cs" />
<Compile Include="models\OI_WMS_OP_DEF.cs" />
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
index 46fa97f..5f8b1bc 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiHelper.cs
@@ -140,7 +140,7 @@
return result;
}
-
+
private static object lockObj = new object();
/// <summary>
@@ -268,7 +268,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- internal static Result EquipmentInfo(EquipmentInfoModel model)
+ internal static Result NotifyDeviceSignal(NotifyDeviceSignalModel model)
{
Result result = new Result { resultCode = 0, resultMsg = "鍒涘缓鎴愬姛" };
if (model == null)
@@ -282,28 +282,29 @@
string cntrcode = model.CntrNo;
var db = new SqlHelper<object>().GetInstance();
- if (model.DeviceNo=="1")//鍙犵洏鏈�+ if (model.DeviceNo == "1")//鍙犵洏鏈� {
-
- }
- else //鍏ュ簱绌�- {
- #region 鑾峰彇璧风偣淇℃伅
- //鏍规嵁鎵樼洏鑾峰彇璧风偣淇℃伅
- var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == cntrcode).First();
- if (CntrLoc == null)
+ #region 鑾峰彇璧风偣淇℃伅锛屽苟鍒ゆ柇绌烘墭鏄惁鍙犳弧
+ //鏍规嵁璧风偣 鑾峰彇缁戝畾鎵樼洏鏁伴噺
+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == model.Loc).ToList();
+ if (CntrLoc.Count < 4)
{
result.resultCode = -1;
- result.resultMsg = $"鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�;
- LogHelper.Info($"creattask:鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�);
+ result.resultMsg = $"鏍规嵁璐т綅:{model.Loc}鑾峰彇鎵樼洏鏁伴噺灏忎簬4";
+ LogHelper.Info($"EquipmentInfo:鏍规嵁璐т綅:{model.Loc}鑾峰彇鎵樼洏鏁伴噺灏忎簬4");
return result;
}
- startloc = LocationHelper.GetLoc(CntrLoc.S_LOC_CODE);
+ else
+ {
+ //鎷兼帴鎵樼洏鍙�+ cntrcode = CntrLoc.Select(a => a.S_CNTR_CODE).ToString();
+ }
+ startloc = LocationHelper.GetLoc(model.Loc);
if (startloc == null)
{
result.resultCode = -1;
- result.resultMsg = $"鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�;
- LogHelper.Info($"creattask:鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�);
+ result.resultMsg = $"鏍规嵁璧风偣:{model.Loc}鏈壘鍒拌揣浣嶄俊鎭�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁璧风偣:{model.Loc}鏈壘鍒拌揣浣嶄俊鎭�);
return result;
}
@@ -315,9 +316,10 @@
{
result.resultCode = -1;
result.resultMsg = $"鏈绠楀埌绔嬪簱缁堢偣璐т綅锛岃妫�煡璐т綅鎯呭喌";
- LogHelper.Info($"creattask:鏈绠楀埌绔嬪簱缁堢偣璐т綅锛岃妫�煡璐т綅鎯呭喌");
+ LogHelper.Info($"EquipmentInfo:鏈绠楀埌绔嬪簱缁堢偣璐т綅锛岃妫�煡璐т綅鎯呭喌");
return result;
}
+
#endregion
#region 鍒涘缓浠诲姟
@@ -347,6 +349,148 @@
}
#endregion
}
+ else //鍏ュ簱绌�+ {
+ //鍏ュ簱鍙ｇ敵璇峰叆搴�+ if (model.SignalType == 1)
+ {
+ #region 鑾峰彇璧风偣淇℃伅
+ //鏍规嵁鎵樼洏鑾峰彇璧风偣淇℃伅
+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == cntrcode).First();
+ if (CntrLoc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�);
+ return result;
+ }
+ startloc = LocationHelper.GetLoc(CntrLoc.S_LOC_CODE);
+ if (startloc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�);
+ return result;
+ }
+
+ #endregion
+
+ #region 璁＄畻绔嬪簱缁堢偣
+ endloc = LocationHelper.InStorage(startloc);
+ if (endloc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏈绠楀埌绔嬪簱缁堢偣璐т綅锛岃妫�煡璐т綅鎯呭喌";
+ LogHelper.Info($"EquipmentInfo:鏈绠楀埌绔嬪簱缁堢偣璐т綅锛岃妫�煡璐т綅鎯呭喌");
+ return result;
+ }
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (startloc != null && endloc != null)
+ {
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鍏ュ簱",
+ S_START_LOC = startloc.S_CODE,
+ S_END_LOC = endloc.S_CODE,
+ S_START_WH = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_CNTR_COUNT = 1,
+ N_SCHEDULE_TYPE = 2,
+ S_CNTR_CODE = cntrcode
+ };
+ LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ LocationHelper.LockLoc(startloc.S_CODE, 2);
+ LocationHelper.LockLoc(endloc.S_CODE, 1);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ }
+ #endregion
+ }
+ //鍏ュ簱绌虹敵璇峰彔鐩�+ else
+ {
+ //鍒ゆ柇璁惧鐘舵�鏄惁灞炰簬鍙犵洏鐘舵�
+ var DeviceStatu = db.Queryable<EquipmentStatus>().Where(a => a.deviceNo == model.DeviceNo).First();
+ if (DeviceStatu != null && DeviceStatu.Status == "1")
+ {
+ #region 鑾峰彇璧风偣淇℃伅
+ //鏍规嵁鎵樼洏鑾峰彇璧风偣淇℃伅
+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == cntrcode).First();
+ if (CntrLoc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁鎵樼洏:{cntrcode}鏈壘鍒扮粦瀹氭墭鐩�);
+ return result;
+ }
+ startloc = LocationHelper.GetLoc(CntrLoc.S_LOC_CODE);
+ if (startloc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁璧风偣:{CntrLoc.S_LOC_CODE}鏈壘鍒拌揣浣嶄俊鎭�);
+ return result;
+ }
+
+ #endregion
+
+ #region 鑾峰彇缁堢偣淇℃伅
+ string DiePanLoc = "";
+ //鏍规嵁鎵樼洏鑾峰彇璧风偣淇℃伅
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == DiePanLoc).First();
+ if (endloc == null)
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"鏍规嵁璐т綅缂栫爜锛歿DiePanLoc}鏈壘鍒板彔鐩樿揣浣�;
+ LogHelper.Info($"EquipmentInfo:鏍规嵁璐т綅缂栫爜锛歿DiePanLoc}鏈壘鍒板彔鐩樿揣浣�);
+ return result;
+ }
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (startloc != null && endloc != null)
+ {
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鍏ュ簱",
+ S_START_LOC = startloc.S_CODE,
+ S_END_LOC = endloc.S_CODE,
+ S_START_WH = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_CNTR_COUNT = 1,
+ N_SCHEDULE_TYPE = 2,
+ S_CNTR_CODE = cntrcode
+ };
+ LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ LocationHelper.LockLoc(startloc.S_CODE, 2);
+ LocationHelper.LockLoc(endloc.S_CODE, 1);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ }
+
+ #endregion
+ }
+ else
+ {
+ result.resultCode = -1;
+ result.resultMsg = $"褰撳墠鍙犵洏鏈虹姸鎬佷笉灞炰簬鍙犵洏鐘舵�锛屼笉鍏佽绌烘墭鍙犳墭";
+ LogHelper.Info($"EquipmentInfo:褰撳墠鍙犵洏鏈虹姸鎬佷笉灞炰簬鍙犵洏鐘舵�锛屼笉鍏佽绌烘墭鍙犳墭");
+ return result;
+ }
+ }
+ }
return result;
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
index 565a7a7..90ec591 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
@@ -256,19 +256,81 @@
/// <summary>
/// 璁惧淇″彿鍙嶉
/// </summary>
- public partial class PutInModel
+ public partial class NotifyDeviceSignalModel
{
/// <summary>
- /// 璧风偣
+ /// 鎵樼洏鍙凤紝鍙┖锛屽涓墭鐩樺彿鍙互鎷兼帴
/// </summary>
- public string startBit { get; set; }
+ [JsonProperty("cntrNo")]
+ public string CntrNo { get; set; }
+ /// <summary>
+ /// 璁惧缂栧彿
+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ [JsonProperty("extData")]
+ public Dictionary<string, object>[] ExtData { get; set; }
+
+ /// <summary>
+ /// 璐т綅锛屼笂鏂欑偣銆佷笅鏂欑偣銆佽鐮佷綅銆佺О閲嶄綅
+ /// </summary>
+ [JsonProperty("loc")]
+ public string Loc { get; set; }
+
+ /// <summary>
+ /// 璇锋眰绫诲瀷锛�:鍏ュ簱鐢宠
+ /// </summary>
+ [JsonProperty("signalType")]
+ public int SignalType { get; set; }
}
+ /// <summary>
+ /// 浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ public partial class NotifyTaskStatusModel
+ {
+ /// <summary>
+ /// 璁惧鍙�+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ /// <summary>
+ /// 寮傚父浠ｇ爜锛屼富瑕佹槸閽堝鍚勭寮傚父鍙栨秷鐨勬弿杩�+ /// </summary>
+ [JsonProperty("errCode")]
+ public int ErrCode { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鎵樼洏浣嶇疆
+ /// </summary>
+ [JsonProperty("loc")]
+ public string Loc { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�锛�锛氬紑濮�鎵ц涓紱2锛氬畬鎴愶紱3锛氬噯澶囧彇璐э紱4锛氬彇璐у畬鎴愶紱5锛氬噯澶囧嵏璐э紱6锛氬嵏璐у畬鎴愶紱7锛氬紓甯稿彇娑堬紱8锛氬己鍒跺畬鎴�+ /// </summary>
+ [JsonProperty("status")]
+ public int Status { get; set; }
+
+ /// <summary>
+ /// wcs鐨勫瓙浠诲姟鍙凤紝濡傛灉wcs浠诲姟鎷嗗垎浜嗭紝鍙互涓�捣涓婃姤瀛愪换鍔″彿锛屾柟渚挎棩蹇楄拷韪�+ /// </summary>
+ [JsonProperty("subTaskNo")]
+ public string SubTaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ [JsonProperty("taskNo")]
+ public string TaskNo { get; set; }
+ }
#endregion
#region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹杩斿洖鍙傛暟
-
+
/// <summary>
/// 璁惧淇℃伅杩斿洖
/// </summary>
@@ -318,38 +380,7 @@
[JsonProperty("workStatus")]
public int WorkStatus { get; set; }
}
- /// <summary>
- /// 璁惧淇″彿鍙嶉
- /// </summary>
- public partial class EquipmentInfoModel
- {
- /// <summary>
- /// 鎵樼洏鍙凤紝鍙┖锛屽涓墭鐩樺彿鍙互鎷兼帴
- /// </summary>
- [JsonProperty("cntrNo")]
- public string CntrNo { get; set; }
-
- /// <summary>
- /// 璁惧缂栧彿
- /// </summary>
- [JsonProperty("deviceNo")]
- public string DeviceNo { get; set; }
-
- [JsonProperty("extData")]
- public Dictionary<string, object>[] ExtData { get; set; }
-
- /// <summary>
- /// 璐т綅锛屼笂鏂欑偣銆佷笅鏂欑偣銆佽鐮佷綅銆佺О閲嶄綅
- /// </summary>
- [JsonProperty("loc")]
- public string Loc { get; set; }
-
- /// <summary>
- /// 璇锋眰绫诲瀷锛�:鍏ュ簱鐢宠
- /// </summary>
- [JsonProperty("signalType")]
- public long SignalType { get; set; }
- }
+
public partial class Empty
{
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
index 12861d1..d756ce6 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -1,4 +1,5 @@
锘�+using HH.WCS.DaYang.core;
using Newtonsoft.Json;
using System.Web.Http;
using static HH.WCS.DaYang.api.ApiHelper;
@@ -35,13 +36,25 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public Result EquipmentInfo(EquipmentInfoModel model)
+ public Result notifyDeviceSignal(NotifyDeviceSignalModel model)
{
Result result = new Result();
- LogHelper.Info("EquipmentInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
- result = ApiHelper.EquipmentInfo(model);
- LogHelper.Info("EquipmentInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ result = ApiHelper.NotifyDeviceSignal(model);
+ LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
return result;
}
+
+ /// <summary>
+ /// 浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ReturnResult notifyTaskStatus(NotifyTaskStatusModel model)
+ {
+ LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
+ WCSCore.NotifyTaskStatus(model);
+ return new ReturnResult();
+ }
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
index bfc9635..f2a2a48 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
@@ -65,7 +65,7 @@
WCSHelper.Fail(TN_Task);
break;
}
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
+ WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData,"agv");
//璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
}
else
@@ -80,6 +80,52 @@
}
}
+ public static void NotifyTaskStatus(NotifyTaskStatusModel model)
+ {
+
+ var TN_Task = WCSHelper.GetTask(model.TaskNo);
+ if (TN_Task != null)
+ {
+ if (model.Status <= 7)
+ {
+ //鏈変换鍔″彿璇锋眰
+ switch (model.Status)
+ {
+ case 1:
+ WCSHelper.Begin(TN_Task);
+ break;
+ #region MyRegion
+ case 3:
+ WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣");
+ break;
+ case 4:
+ WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚");
+ TaskProcess.OperateStatus(TN_Task, 4);
+ break;
+ case 5:
+ WCSHelper.UpdateStatus(TN_Task, "寮�鍗歌揣");
+ break;
+ case 6:
+ WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
+ TaskProcess.OperateStatus(TN_Task, 6);
+ break;
+ #endregion
+ case 2:
+ WCSHelper.End(TN_Task);
+ break;
+ case 7:
+ TaskProcess.OperateStatus(TN_Task, 7);
+ WCSHelper.Fail(TN_Task);
+ break;
+ }
+ WCSHelper.AddActionRecord(model.TaskNo, model.Status,"","","wcs");
+ //璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
+ }
+
+ }
+
+
+ }
/// <summary>
/// 浠诲姟鍒嗗彂锛屾牴鎹皟搴︾被鍨嬪彂缁欎笉鍚岀殑璋冨害绯荤粺
/// </summary>
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/models/EquipmentStatus.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/models/EquipmentStatus.cs
new file mode 100644
index 0000000..8a3921c
--- /dev/null
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/models/EquipmentStatus.cs
@@ -0,0 +1,22 @@
+using HH.WCS.DaYang.models;
+using SqlSugar;
+using System;
+
+namespace HH.WCS.DaYang
+{
+ [SugarTable("TN_EquipmentStatus")]
+ public class EquipmentStatus : BaseModel
+ {
+
+ /// <summary>
+ /// 状态
+ /// </summary>
+ public string Status { get; set; }
+ /// <summary>
+ /// 设备号
+ /// </summary>
+ public string deviceNo { get; set; }
+
+
+ }
+}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs
index 08c8a63..e620c3f 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs
@@ -79,7 +79,7 @@
}
}
- //绌烘墭鍏ュ簱锛岀浉鍚岀墿鏂欏唴娴嬫帓鐨勮揣浣�+ //鎵樼洏鍏ュ簱锛岀浉鍚岀墿鏂欏唴娴嬫帓鐨勮揣浣� var Locs = GetLocByItemCode(areaCode, itemCode, new int[] { 1, 4 }).OrderByDescending(b => b.N_COL).ToList();
if (Locs.Count > 0)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
index 184a519..f0d1e7a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
@@ -145,7 +145,7 @@
}
return res;
}
- internal static bool AddActionRecord(string no, int state, string forkliftNo, string extData)
+ internal static bool AddActionRecord(string no, int state, string forkliftNo, string extData,string Type)
{
var db = new SqlHelper<TaskAction>().GetInstance();
var action = new TaskAction()
@@ -153,7 +153,7 @@
N_ACTION_CODE = state,
S_TASK_CODE = no,
S_EQ_CODE = forkliftNo,
- S_EQ_TYPE = "agv",
+ S_EQ_TYPE = Type,
S_DATA = extData
};
return db.Insertable(action).ExecuteCommand() > 0;
--
Gitblit v1.9.1