diff --git a/.vs/HighWayIot/FileContentIndex/45b72eab-16bf-43a8-a07e-57f86f319e04.vsidx b/.vs/HighWayIot/FileContentIndex/45b72eab-16bf-43a8-a07e-57f86f319e04.vsidx new file mode 100644 index 00000000..87553bb4 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/45b72eab-16bf-43a8-a07e-57f86f319e04.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/64f9c86f-e9cd-4985-8b24-d3f69b65b4f5.vsidx b/.vs/HighWayIot/FileContentIndex/64f9c86f-e9cd-4985-8b24-d3f69b65b4f5.vsidx new file mode 100644 index 00000000..e2fc2354 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/64f9c86f-e9cd-4985-8b24-d3f69b65b4f5.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx b/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx deleted file mode 100644 index 90c6b3b5..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/6f4e38f9-264f-4edc-b032-550c2b14fe3e.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx b/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx deleted file mode 100644 index 62b183c4..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/8efbf8a6-9f2c-40b7-b820-5a0339d2c254.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/934de256-cba9-437a-b170-56656c006175.vsidx b/.vs/HighWayIot/FileContentIndex/934de256-cba9-437a-b170-56656c006175.vsidx new file mode 100644 index 00000000..4c5a859a Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/934de256-cba9-437a-b170-56656c006175.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx b/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx deleted file mode 100644 index 35d8f0e2..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/9f8e3afd-e844-4336-9c87-4b482e17940e.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/d625a7cd-ff45-4c99-bde9-954718bd4359.vsidx b/.vs/HighWayIot/FileContentIndex/d625a7cd-ff45-4c99-bde9-954718bd4359.vsidx new file mode 100644 index 00000000..0f195c75 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/d625a7cd-ff45-4c99-bde9-954718bd4359.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx b/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx deleted file mode 100644 index 29e6a4a8..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f6212b58-736f-47c6-aec0-cbf8afd61f9d.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 36ba4f74..7e565e39 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index a2943fe9..99db1bfd 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -208,7 +208,7 @@ namespace Aucma.Scada.Business realTaskInfo.storeCode = spaceInfo.storeCode; realTaskInfo.spaceCode = spaceInfo.spaceCode; realTaskInfo.spaceName = spaceInfo.spaceName; - realTaskInfo.materialType = spaceDetail.materialName; + realTaskInfo.materialType = spaceDetail.materialType; realTaskInfo.materialCode = spaceDetail.materialCode; realTaskInfo.planAmount = 1; realTaskInfo.taskStatus = 1; diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index c1b87831..f3c6be64 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 4e912974..4eb4ed62 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 c1b87831..f3c6be64 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 4e912974..4eb4ed62 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.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index c1b87831..f3c6be64 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 4e912974..4eb4ed62 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 ab20a553..8346ee2b 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 36cc7654..dfc23699 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 fbde9f1b..107f2ccd 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 ab20a553..8346ee2b 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 36cc7654..dfc23699 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 f066bb06..7eb971a8 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 ffa4e1ed..c65238fb 100644 --- a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,62 +1,2 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本: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); - } - } -} +