diff --git a/WCS_YongFeng_CP/File/永丰CC10-WCS-PLC对接地址V1.0.xlsx b/WCS_YongFeng_CP/File/永丰CC10-WCS-PLC对接地址V1.0.xlsx
new file mode 100644
index 0000000..cdcad22
Binary files /dev/null and b/WCS_YongFeng_CP/File/永丰CC10-WCS-PLC对接地址V1.0.xlsx differ
diff --git a/WCS_YongFeng_CP/Page/SrmView.xaml b/WCS_YongFeng_CP/Page/SrmView.xaml
index b3bcfa9..ef3884c 100644
--- a/WCS_YongFeng_CP/Page/SrmView.xaml
+++ b/WCS_YongFeng_CP/Page/SrmView.xaml
@@ -28,8 +28,8 @@
-
-
+
+
@@ -39,8 +39,8 @@
-
+
+
@@ -54,12 +54,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs
index d20c3ab..9c9101c 100644
--- a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs
+++ b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs
@@ -69,35 +69,44 @@ namespace WCS_YongFeng
Height = vM_StationDR.Height
};
- var interfaceresult = WcsWebApiClient.FinishTask(reqTaskFinish);
- if (!interfaceresult.Success)
- {
- LogExecute.logNet.WriteError($"请求仓位时调用WMS接口失败,任务号{taskresur.tNo},高度{vM_StationDR.Height},错误原因{interfaceresult.Msg}");
- return BllResult.Error(); ;
- }
+ //var interfaceresult = WcsWebApiClient.FinishTask(reqTaskFinish);
+ //if (!interfaceresult.Success)
+ //{
+ // LogExecute.logNet.WriteError($"请求仓位时调用WMS接口失败,任务号{taskresur.tNo},高度{vM_StationDR.Height},错误原因{interfaceresult.Msg}");
+ // return BllResult.Error(); ;
+ //}
BaseDal _baseDal = new BaseDal();
Dictionary lstColumnValues = new Dictionary();
- lstColumnValues.Add("ExitPlace", interfaceresult.Data.LocationCode);
+ //lstColumnValues.Add("ExitPlace", interfaceresult.Data.LocationCode);
+ lstColumnValues.Add("ExitPlace", "L-01-04-03-01");
var updatewarecell = _baseDal.Update(lstColumnValues, a => a.tNo == taskresur.tNo);
- if (updatewarecell.Success)
+ if (!updatewarecell.Success)
{
LogExecute.logNet.WriteError($"请求仓位时更新数据库失败,任务号{taskresur.tNo},高度{vM_StationDR.Height},错误原因{updatewarecell.Msg}");
return BllResult.Error(); ;
}
- taskresur.ExitPlace = interfaceresult.Data.LocationCode;
+ //taskresur.ExitPlace = interfaceresult.Data.LocationCode;
+ taskresur.ExitPlace = "L-01-04-03-01";
+ }
+
+ var pose = App.poseList.FirstOrDefault(a => a.Station == device.Point);
+ if (pose == null)
+ {
+ LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,未找站台对应的坐标");
+ return BllResult.Sucess();
}
BaseDal baseDal = new BaseDal();
baseDal.BeginTran();
- var updateresult = _bll.NextStateChange(taskresur, baseDal);
+ var updateresult = _bll.NextStateChange2(taskresur, pose.wcName, baseDal);
if (updateresult.Success)
{
var sendtask_send = this.PutWriteAddress();
if (sendtask_send.Success)
{
baseDal.CommitTran();
- _bll.NextStateChangeCache(taskresur);
+ _bll.NextStateChangeCache2(taskresur, pose.wcName);
LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址请求成功,托盘号{vM_StationDR.PalletID},目的地{vM_StationDACK.DeStation}");
return BllResult.Sucess();
}
@@ -118,7 +127,7 @@ namespace WCS_YongFeng
}
else if (device.Type == "OutStation")
{
- var taskresur = App.taskList.FirstOrDefault(a => a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.中间站台地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
+ var taskresur = App.taskList.FirstOrDefault(a => (a.Type == E_TaskType.出库.GetIndexString() || a.Type == E_TaskType.出库1.GetIndexString()) && a.NextState == E_TaskState.中间站台地址请求.GetIndexInt() && a.PalletOrBoxNo == pallet);
if (taskresur != null)
{
//var topose = App.poseList.FirstOrDefault(a => a.wcName == taskresur.ToPlace);
diff --git a/WCS_YongFeng_CP/Service/DevicesExcute/StationPRExcute.cs b/WCS_YongFeng_CP/Service/DevicesExcute/StationPRExcute.cs
index 4cc32e9..951c965 100644
--- a/WCS_YongFeng_CP/Service/DevicesExcute/StationPRExcute.cs
+++ b/WCS_YongFeng_CP/Service/DevicesExcute/StationPRExcute.cs
@@ -64,7 +64,8 @@ namespace WCS_YongFeng
}
else if (device.Type == "Exit")
{
- var _taskresur = App.taskList.ToList().FindAll(a => a.PalletOrBoxNo == vM_StationPR.PalletID && a.Type == E_TaskType.出库.GetIndexString() && a.NextState == E_TaskState.出入口地址到达.GetIndexInt()).OrderBy(a => a.Task_StartTime).ToList();
+ var _taskresur = App.taskList.ToList().FindAll(a => a.PalletOrBoxNo == vM_StationPR.PalletID && (a.Type == E_TaskType.出库.GetIndexString()
+ || a.Type == E_TaskType.出库1.GetIndexString()) && a.NextState == E_TaskState.出入口地址到达.GetIndexInt()).OrderBy(a => a.Task_StartTime).ToList();
if (_taskresur != null && _taskresur.Count > 0)
{
var taskresur = _taskresur[0];