diff --git a/.vs/HighWayIot/FileContentIndex/0e608aa8-92d7-4866-934c-0ef3131a7c38.vsidx b/.vs/HighWayIot/FileContentIndex/0e608aa8-92d7-4866-934c-0ef3131a7c38.vsidx new file mode 100644 index 0000000..162b4c3 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/0e608aa8-92d7-4866-934c-0ef3131a7c38.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/1ad1783a-0c62-4433-9207-3b0905692b41.vsidx b/.vs/HighWayIot/FileContentIndex/1ad1783a-0c62-4433-9207-3b0905692b41.vsidx new file mode 100644 index 0000000..6b99d62 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/1ad1783a-0c62-4433-9207-3b0905692b41.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/7924aa73-4da7-424a-b25d-8bac28cbd674.vsidx b/.vs/HighWayIot/FileContentIndex/7924aa73-4da7-424a-b25d-8bac28cbd674.vsidx new file mode 100644 index 0000000..0e44f7f Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/7924aa73-4da7-424a-b25d-8bac28cbd674.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/81f6fc64-7d78-4cf5-96ff-e811b4cc3aa7.vsidx b/.vs/HighWayIot/FileContentIndex/81f6fc64-7d78-4cf5-96ff-e811b4cc3aa7.vsidx deleted file mode 100644 index 74a52b3..0000000 Binary files a/.vs/HighWayIot/FileContentIndex/81f6fc64-7d78-4cf5-96ff-e811b4cc3aa7.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/9fdc27ee-8e40-4636-b3d9-5557b6124096.vsidx b/.vs/HighWayIot/FileContentIndex/9fdc27ee-8e40-4636-b3d9-5557b6124096.vsidx new file mode 100644 index 0000000..7393ef9 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/9fdc27ee-8e40-4636-b3d9-5557b6124096.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/cf673a9e-4296-4cd0-814d-2a689c4656e4.vsidx b/.vs/HighWayIot/FileContentIndex/cf673a9e-4296-4cd0-814d-2a689c4656e4.vsidx deleted file mode 100644 index d48fab6..0000000 Binary files a/.vs/HighWayIot/FileContentIndex/cf673a9e-4296-4cd0-814d-2a689c4656e4.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/d510d3c8-3027-490b-a915-23229ac29844.vsidx b/.vs/HighWayIot/FileContentIndex/d510d3c8-3027-490b-a915-23229ac29844.vsidx deleted file mode 100644 index aade27f..0000000 Binary files a/.vs/HighWayIot/FileContentIndex/d510d3c8-3027-490b-a915-23229ac29844.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/fed88810-5034-45fb-baa4-e33a35cc3961.vsidx b/.vs/HighWayIot/FileContentIndex/fed88810-5034-45fb-baa4-e33a35cc3961.vsidx deleted file mode 100644 index d58e804..0000000 Binary files a/.vs/HighWayIot/FileContentIndex/fed88810-5034-45fb-baa4-e33a35cc3961.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 52462af..640990b 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 32a7d6d..adc925b 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -124,7 +124,7 @@ namespace Aucma.Scada.Business { PrintLogInfoMessage($"扫码成功，物料码：{materialCode}"); string materialType = SubStringMaterialCode(materialCode); - #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为实时读取PLC数据 + #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为通过PLC获取货道信息 //var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(storeCode, materialType); #endregion var spaceInfo = GetSpaceInfoByMaterialType(storeCode, materialType); @@ -135,7 +135,7 @@ namespace Aucma.Scada.Business var result = CreateInStoreTask(spaceInfo, materialCode); //创建入库任务 if (result) { - spaceInfo.onRouteAmount += 1; + //spaceInfo.onRouteAmount += 1; //通过PLC获取货道信息（在库、在途数量）时不需要修改在途数量 _spaceInfoService.UpdateSpaceInfo(spaceInfo); } } @@ -397,11 +397,21 @@ namespace Aucma.Scada.Business if (spaceInfo != null) { - //读取PLC获取货道信息：存放数量、在途数量, - //实际应用改为读取PLC库存信息 + + spaceInfo.materialType = taskInfo.materialType; + spaceInfo.spaceStock = spaceInfo.spaceStock + 1; spaceInfo.onRouteAmount -= 1; + + //读取PLC获取货道信息：存放数量、在途数量, + #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 + var item = taskHandle.ReadSpaceInfoByPlc(spaceInfo); + spaceInfo.spaceStock = item.spaceStock; + spaceInfo.onRouteAmount = item.onRouteAmount; + spaceInfo.spaceStatus = item.spaceStatus; + #endregion + _spaceInfoService.UpdateSpaceInfo(spaceInfo); #region 添加货道明细 diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 89604b4..b180e43 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -166,7 +166,7 @@ namespace Aucma.Scada.Business try { PrintLogInfoMessage($"收到出库计划，物料码：{bomInfo.materialCode}"); - #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为实时读取PLC数据 + #region Delete By wenjy 2023-10-30 11:41:00 取消通过数据库获取货道数量、在途量，改为通过PLC获取货道信息 //BaseSpaceInfo spaceInfo = _spaceInfoService.OutStoreGetSpaceInfoByMaterialCode(storeCode, bomInfo.materialCode); #endregion BaseSpaceInfo spaceInfo = GetSpaceInfoByMaterialType(storeCode, bomInfo.materialCode); @@ -528,9 +528,17 @@ namespace Aucma.Scada.Business if (spaceInfo != null) { //读取PLC获取货道信息：存放数量、在途数量 - //spaceInfo.materialType = taskInfo.materialType; + spaceInfo.spaceStock -= 1; spaceInfo.outRouteAmount -= 1; + + #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 + var item = taskHandleBusiness.ReadSpaceInfoByPlc(spaceInfo); + spaceInfo.spaceStock = item.spaceStock; + spaceInfo.onRouteAmount = item.onRouteAmount; + spaceInfo.spaceStatus = item.spaceStatus; + #endregion + if (spaceInfo.spaceStock == 0) { spaceInfo.materialType = string.Empty; diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 9be17b2..998c82a 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 27572c4..37cce01 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/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll index 00146f1..535759d 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb index 729d8ba..370c298 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 38bfe37..23463be 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 9be17b2..998c82a 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 27572c4..37cce01 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.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index 11d7134..9949a85 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll index 00146f1..535759d 100644 Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb index 729d8ba..370c298 100644 Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.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 9be17b2..998c82a 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 27572c4..37cce01 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/config/Plc.Ini b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini index e5efac9..ed7e636 100644 --- a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini @@ -2,7 +2,7 @@ PLCIP=127.0.0.1 PLC˿=6000 ڵPLCIP=127.0.0.1 -ڵPLC˿=6000 +ڵPLC˿=6001 #ַ [shell_inStore_address] =D101 diff --git a/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini b/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini index 5f9599b..c90d5ad 100644 --- a/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/PlcSpace.Ini @@ -1,42 +1,87 @@ +#ǿϢ [XKJCK-001_XK_001] ڿ=D7201 ;=D7211 Ƿ=D7221 ״̬=D7231 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 [XKJCK-001_XK_002] ڿ=D7202 ;=D7212 Ƿ=D7222 ״̬=D7232 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 [XKJCK-001_XK_003] ڿ=D7203 ;=D7213 Ƿ=D7223 ״̬=D7233 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 [XKJCK-001_XK_004] ڿ=D7204 ;=D7214 Ƿ=D7224 ״̬=D7234 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 [XKJCK-001_XK_005] ڿ=D7205 ;=D7215 Ƿ=D7225 ״̬=D7235 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 [XKJCK-001_XK_006] ڿ=D7206 ;=D7216 Ƿ=D7226 ״̬=D7236 -ֿ״̬=D7300 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 + +#ڵϢ +[NDJCK-001_ND_001] +ڿ=D7201 +;=D7211 +Ƿ=D7221 +״̬=D7231 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 +[NDJCK-001_ND_002] +ڿ=D7202 +;=D7212 +Ƿ=D7222 +״̬=D7232 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 +[NDJCK-001_ND_003] +ڿ=D7203 +;=D7213 +Ƿ=D7223 +״̬=D7233 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 +[NDJCK-001_ND_004] +ڿ=D7204 +;=D7214 +Ƿ=D7224 +״̬=D7234 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 +[NDJCK-001_ND_005] +ڿ=D7205 +;=D7215 +Ƿ=D7225 +״̬=D7235 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ +=D7240 +[NDJCK-001_ND_006] +ڿ=D7206 +;=D7216 +Ƿ=D7226 +״̬=D7236 +ֿ״̬=D7300 #豸״̬,0δ״̬,1Զ,2ά޵״̬,ֹ =D7240 \ No newline at end of file diff --git a/Aucma.Scada.UI/obj/Debug/App.baml b/Aucma.Scada.UI/obj/Debug/App.baml new file mode 100644 index 0000000..ae6f5e1 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/App.baml 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 7890acf..bfac894 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_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache index a63923e..a8d1661 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache @@ -4,17 +4,17 @@ winexe C# .cs -E:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\obj\Debug\ +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\ Aucma.Scada.UI none false DEBUG;TRACE -E:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\App.xaml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml 14-1433675110 -35454352239 -136-584955020 +34-1467425882 +1361464425805 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; -True +False 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 869943b..7eb971a 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,17 +1,17 @@ -E:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\App.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\LogInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\MainWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\RecordControl.xaml;; -FE:\c#\AUCMA\aucma.scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; +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;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs index ffa4e1e..c65238f 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); - } - } -} + diff --git a/Aucma.Scada.UI/obj/Debug/LogInfoControl.baml b/Aucma.Scada.UI/obj/Debug/LogInfoControl.baml new file mode 100644 index 0000000..420fff0 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/LogInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.baml b/Aucma.Scada.UI/obj/Debug/MainWindow.baml new file mode 100644 index 0000000..87646e2 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/MainWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml new file mode 100644 index 0000000..d793506 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml new file mode 100644 index 0000000..034ceb4 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml new file mode 100644 index 0000000..794ea36 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml new file mode 100644 index 0000000..c4b7d77 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml new file mode 100644 index 0000000..c7b15cc Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml new file mode 100644 index 0000000..da8a170 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml new file mode 100644 index 0000000..a271955 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml new file mode 100644 index 0000000..0425cf2 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml new file mode 100644 index 0000000..17a6ce6 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml new file mode 100644 index 0000000..3a091c0 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/RecordControl.baml b/Aucma.Scada.UI/obj/Debug/RecordControl.baml new file mode 100644 index 0000000..215da90 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/RecordControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml b/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml new file mode 100644 index 0000000..c7e7067 Binary files /dev/null and b/Aucma.Scada.UI/obj/Debug/templates/style/resourceStyle.baml differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index f813a00..67dbcc5 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index f5dfd50..f029f8b 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index 2a370f1..8e73522 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index 6fff6ac..f23d94a 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index bf89d06..5477b10 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 10dea1f..e984433 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.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index a2e356c..0dcc149 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 0fa2bc7..65beccc 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index fc8b4df..3302a64 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ