diff --git a/.vs/HighWayIot/FileContentIndex/0895362d-5632-40f8-9b23-1fef5c349fc4.vsidx b/.vs/HighWayIot/FileContentIndex/0895362d-5632-40f8-9b23-1fef5c349fc4.vsidx
deleted file mode 100644
index 9f19028b..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/0895362d-5632-40f8-9b23-1fef5c349fc4.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/19cf76b1-aef5-45ea-afba-2afde4812d32.vsidx b/.vs/HighWayIot/FileContentIndex/19cf76b1-aef5-45ea-afba-2afde4812d32.vsidx
deleted file mode 100644
index 0a6ef9d4..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/19cf76b1-aef5-45ea-afba-2afde4812d32.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/5430c243-eb27-480d-9470-7fdc1bfc2a1c.vsidx b/.vs/HighWayIot/FileContentIndex/5430c243-eb27-480d-9470-7fdc1bfc2a1c.vsidx
deleted file mode 100644
index 595a2134..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/5430c243-eb27-480d-9470-7fdc1bfc2a1c.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/557fa9b3-2e8d-4b22-88ac-0dc1dcee2169.vsidx b/.vs/HighWayIot/FileContentIndex/557fa9b3-2e8d-4b22-88ac-0dc1dcee2169.vsidx
deleted file mode 100644
index 6337c6bb..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/557fa9b3-2e8d-4b22-88ac-0dc1dcee2169.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/57a41399-47fb-4a84-af52-19ee34bd76f7.vsidx b/.vs/HighWayIot/FileContentIndex/57a41399-47fb-4a84-af52-19ee34bd76f7.vsidx
deleted file mode 100644
index be2fb074..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/57a41399-47fb-4a84-af52-19ee34bd76f7.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx b/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx
deleted file mode 100644
index 950c378a..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/8a47eaef-a22f-4f48-b2c6-25ad0ec704b9.vsidx b/.vs/HighWayIot/FileContentIndex/8a47eaef-a22f-4f48-b2c6-25ad0ec704b9.vsidx
deleted file mode 100644
index 3dac3a1a..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/8a47eaef-a22f-4f48-b2c6-25ad0ec704b9.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/8d47836d-3bbe-4aab-86af-75b6670aaf77.vsidx b/.vs/HighWayIot/FileContentIndex/8d47836d-3bbe-4aab-86af-75b6670aaf77.vsidx
deleted file mode 100644
index 7293739c..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/8d47836d-3bbe-4aab-86af-75b6670aaf77.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx b/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx
deleted file mode 100644
index 77f88cc7..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/9a124108-2ac9-4fb4-8d62-4ae461e49b98.vsidx b/.vs/HighWayIot/FileContentIndex/9a124108-2ac9-4fb4-8d62-4ae461e49b98.vsidx
deleted file mode 100644
index 50d77ab2..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/9a124108-2ac9-4fb4-8d62-4ae461e49b98.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/a9d827ba-c95a-4229-b4a0-845db3f46199.vsidx b/.vs/HighWayIot/FileContentIndex/a9d827ba-c95a-4229-b4a0-845db3f46199.vsidx
deleted file mode 100644
index e9586b56..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/a9d827ba-c95a-4229-b4a0-845db3f46199.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/c6e094f0-be7d-4a38-9225-1c622a75d031.vsidx b/.vs/HighWayIot/FileContentIndex/c6e094f0-be7d-4a38-9225-1c622a75d031.vsidx
deleted file mode 100644
index 7f8613fa..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/c6e094f0-be7d-4a38-9225-1c622a75d031.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/e7db3c84-9aa6-4922-8386-eaf86267d61c.vsidx b/.vs/HighWayIot/FileContentIndex/e7db3c84-9aa6-4922-8386-eaf86267d61c.vsidx
deleted file mode 100644
index 1afb0cb8..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/e7db3c84-9aa6-4922-8386-eaf86267d61c.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/ed73aaab-573c-4588-b9b8-bc3c7bce0bd7.vsidx b/.vs/HighWayIot/FileContentIndex/ed73aaab-573c-4588-b9b8-bc3c7bce0bd7.vsidx
deleted file mode 100644
index 66e0b14b..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/ed73aaab-573c-4588-b9b8-bc3c7bce0bd7.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/FileContentIndex/f672c631-19c5-4fd2-8d5e-6a38f8abd6df.vsidx b/.vs/HighWayIot/FileContentIndex/f672c631-19c5-4fd2-8d5e-6a38f8abd6df.vsidx
deleted file mode 100644
index 69c0c4f7..00000000
Binary files a/.vs/HighWayIot/FileContentIndex/f672c631-19c5-4fd2-8d5e-6a38f8abd6df.vsidx and /dev/null differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 0833d433..672c8970 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs
index 0108380d..3571e898 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -100,11 +100,11 @@ namespace Aucma.Scada.Business
//Task.Run(() =>
//{
// Thread.Sleep(6000);
- // for (int i = 1; i < 15; i++)
+ // for (int i = 1; i < 3; i++)
// {
- // InStore(appConfig.shellStoreCode, "B2360000078110230" + i.ToString().PadLeft(2, '0'));
+ // InStore(appConfig.shellStoreCode, "B2360000078110240" + i.ToString().PadLeft(2, '0'));
// Thread.Sleep(1000);
- // InStore(appConfig.linerStoreCode, "L2360000078810230" + i.ToString().PadLeft(2, '0'));
+ // InStore(appConfig.linerStoreCode, "L2360000078810240" + i.ToString().PadLeft(2, '0'));
// Thread.Sleep(1000);
// }
//});
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index e017ab03..ea5a3f2e 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
index 728fe8f1..3c54f213 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
index e017ab03..ea5a3f2e 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
index 728fe8f1..3c54f213 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
index 75f86db8..dbcd9fbc 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
index e017ab03..ea5a3f2e 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
index 728fe8f1..3c54f213 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 6f66d2a1..031ef132 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
index 5252d105..5ea7d513 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
index a20aed01..f8fe1999 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
index 6f66d2a1..031ef132 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index 5252d105..5ea7d513 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
index 7eb971a8..f066bb06 100644
--- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
+++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
@@ -1,4 +1,4 @@
-E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
diff --git a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs
index c65238fb..ffa4e1ed 100644
--- a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs
@@ -1,2 +1,62 @@
-
+//------------------------------------------------------------------------------
+//
+// 此代码由工具生成。
+// 运行时版本:4.0.30319.42000
+//
+// 对此文件的更改可能会导致不正确的行为，并且如果
+// 重新生成代码，这些更改将会丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+
+
+ ///
+ /// GeneratedInternalTypeHelper
+ ///
+ [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+ public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+
+ ///
+ /// CreateInstance
+ ///
+ protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+ return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
+ | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+ }
+
+ ///
+ /// GetPropertyValue
+ ///
+ protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+ return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+ }
+
+ ///
+ /// SetPropertyValue
+ ///
+ protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+ propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+ }
+
+ ///
+ /// CreateDelegate
+ ///
+ protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+ return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
+ | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+ delegateType,
+ handler}, null)));
+ }
+
+ ///
+ /// AddEventHandler
+ ///
+ protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+ eventInfo.AddEventHandler(target, handler);
+ }
+ }
+}
diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index d080a1f7..134e0039 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
@@ -231,6 +231,20 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
var info = inStoreBusiness.GetInStoreTask();
if (info != null)
{
+ if (materialTypeCombox == "箱壳")
+ {
+ materialTypeCombox = appConfig.shellStoreCode;
+ }
+ else if (materialTypeCombox == "内胆")
+ {
+ materialTypeCombox = appConfig.linerStoreCode;
+ }
+ else if (materialTypeCombox == "所有")
+ {
+ materialTypeCombox = string.Empty;
+ }
+ info = info.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1).ToList();
+
taskItems = new ObservableCollection();
//info.ForEach(x => RefreshInStoreTask(x));
try
@@ -242,8 +256,9 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
{
item.materialType = inStoreBusiness.GetMaterialName(item.materialType);
taskItems.Add(item);
- InstoreTask = taskItems;
}
+
+ InstoreTask = taskItems;
}));
}
catch (Exception ex)
@@ -252,20 +267,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
}
}
#endregion
-
- if (materialTypeCombox == "箱壳")
- {
- materialTypeCombox = "X-001";
- }
- else if (materialTypeCombox == "内胆")
- {
- materialTypeCombox = "X-002";
- }
- else
- {
- materialTypeCombox = string.Empty;
- }
- InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1);
}
}
@@ -286,6 +287,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
///
public void Init()
{
+ Query();
ChartValues achievement = new ChartValues();
ChartValues achievement2 = new ChartValues();
App.Current.Dispatcher.BeginInvoke((Action)(() =>
@@ -335,8 +337,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
{
if (isFinsih)
{
-
- Query();
Init();
}
else