diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
index fe9abf42..09fa7521 100644
--- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
+++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
@@ -418,7 +418,7 @@ namespace Aucma.Core.BoxFoam.Business
info = info.Where(x => x.SpaceStatus == 1 && x.SpaceCapacity > (x.SpaceStock + x.OnRouteAmount)).ToList();
if(info.Count > 0)
{
- result = info.OrderByDescending(x => x.SpaceStock).OrderBy(x => x.SpaceCode).First();
+ result = info.OrderByDescending(x => x.SpaceStock).First();
}
}
}
diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
index ac74f7b6..a08ba4a7 100644
--- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
+++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
@@ -95,37 +95,57 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs
index 6bccbd64..f09576eb 100644
--- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs
+++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs
@@ -37,7 +37,14 @@ namespace Aucma.Core.CodeBinding.Views
private void Button_Click(object sender, RoutedEventArgs e)
{
- SendPlcPass();
+ if (SendPlcPass())
+ {
+ MessageBox.Show("放行成功");
+ }
+ else
+ {
+ MessageBox.Show("放行失败，plc未连接");
+ }
}
///
@@ -59,11 +66,17 @@ namespace Aucma.Core.CodeBinding.Views
// 报警信号复位
obj.plc.WriteInt16("D7101", "0");
result = true;
+
+ }
+ else
+ {
+ result = false;
}
}
catch (Exception ex)
{
+ result = false;
// log.Error("下发plc停止信号方法出现异常,ex:" + ex);
}
return result;