diff --git a/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx b/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx new file mode 100644 index 00000000..89832608 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx b/.vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx new file mode 100644 index 00000000..eb20c41c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx b/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx new file mode 100644 index 00000000..433f130a Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx b/.vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx new file mode 100644 index 00000000..d54f94ad Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index c9031cfb..8e4cd68a 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 768307b1..37f06fc6 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -193,7 +193,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.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 52a1024d..9d6da8e9 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/MainWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs index 1951b60e..bd7f1ab6 100644 --- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "638A8878353241AB42E35E5685925D9F0CFF05E8C4379C5912D6CA9388326C41" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABE42667B526D4F2B0598785A37321B62458FBBD8BF44BD41D21D42410859ADD" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs index 89219b25..21cf7beb 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "430915393B7A687977740039B60BB56C199BB3E802591274D005F1B9698F1B23" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC24A1F20A67FD0EDFFAEE4607BA434052DADE4FF94D21C5A849EFFE3DB35D6A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 206ce735..be9b150d 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index a4255331..d4a84e2a 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ