diff --git a/.vs/HighWayIot/FileContentIndex/00ba28f4-060c-4d2c-ad86-680a5612fc6b.vsidx b/.vs/HighWayIot/FileContentIndex/00ba28f4-060c-4d2c-ad86-680a5612fc6b.vsidx deleted file mode 100644 index 14e0793f..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/00ba28f4-060c-4d2c-ad86-680a5612fc6b.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/08781094-6e96-46ad-933e-c3eeb3b79474.vsidx b/.vs/HighWayIot/FileContentIndex/08781094-6e96-46ad-933e-c3eeb3b79474.vsidx new file mode 100644 index 00000000..466ce866 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/08781094-6e96-46ad-933e-c3eeb3b79474.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/0af06a3b-64c0-4cdf-b680-2cc6c2b2a6fe.vsidx b/.vs/HighWayIot/FileContentIndex/0af06a3b-64c0-4cdf-b680-2cc6c2b2a6fe.vsidx deleted file mode 100644 index 496fb3d3..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/0af06a3b-64c0-4cdf-b680-2cc6c2b2a6fe.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/0c32902f-5d72-477a-aede-76894295010e.vsidx b/.vs/HighWayIot/FileContentIndex/0c32902f-5d72-477a-aede-76894295010e.vsidx deleted file mode 100644 index ddcd490a..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/0c32902f-5d72-477a-aede-76894295010e.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/0ccc40ad-de7e-4e09-b582-2575bcf8fe4a.vsidx b/.vs/HighWayIot/FileContentIndex/0ccc40ad-de7e-4e09-b582-2575bcf8fe4a.vsidx deleted file mode 100644 index 4ea97956..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/0ccc40ad-de7e-4e09-b582-2575bcf8fe4a.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/0e6c0eb2-6b7d-40ca-abdd-19569e2de17c.vsidx b/.vs/HighWayIot/FileContentIndex/0e6c0eb2-6b7d-40ca-abdd-19569e2de17c.vsidx deleted file mode 100644 index 19e94bbd..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/0e6c0eb2-6b7d-40ca-abdd-19569e2de17c.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx b/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx deleted file mode 100644 index 56e8662e..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/1c58bf60-4e6a-4112-8008-51d0dd0c0f0c.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx b/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx deleted file mode 100644 index bf8aa8b7..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx b/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx deleted file mode 100644 index 45a0ebd8..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx b/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx deleted file mode 100644 index bc35f4fe..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/3254da02-b2ed-44a4-bbf1-778a534daeb9.vsidx b/.vs/HighWayIot/FileContentIndex/3254da02-b2ed-44a4-bbf1-778a534daeb9.vsidx deleted file mode 100644 index 1d810c54..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/3254da02-b2ed-44a4-bbf1-778a534daeb9.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/39edaf52-553a-42de-b8ef-71b26cc84b76.vsidx b/.vs/HighWayIot/FileContentIndex/39edaf52-553a-42de-b8ef-71b26cc84b76.vsidx deleted file mode 100644 index 48bf851f..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/39edaf52-553a-42de-b8ef-71b26cc84b76.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/4ba0f9b2-c387-436f-a630-f8fe95a2001a.vsidx b/.vs/HighWayIot/FileContentIndex/4ba0f9b2-c387-436f-a630-f8fe95a2001a.vsidx deleted file mode 100644 index 8885e4d4..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/4ba0f9b2-c387-436f-a630-f8fe95a2001a.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/4d84cf78-e1ce-4830-b094-fe44208d0e8d.vsidx b/.vs/HighWayIot/FileContentIndex/4d84cf78-e1ce-4830-b094-fe44208d0e8d.vsidx new file mode 100644 index 00000000..88275a52 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/4d84cf78-e1ce-4830-b094-fe44208d0e8d.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/5833bad1-3968-47b1-b70c-c3e5362ec87b.vsidx b/.vs/HighWayIot/FileContentIndex/5833bad1-3968-47b1-b70c-c3e5362ec87b.vsidx deleted file mode 100644 index bf763f79..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/5833bad1-3968-47b1-b70c-c3e5362ec87b.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/5badf449-bcd1-4b36-b36c-37c92eaf0191.vsidx b/.vs/HighWayIot/FileContentIndex/5badf449-bcd1-4b36-b36c-37c92eaf0191.vsidx new file mode 100644 index 00000000..f37747ae Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/5badf449-bcd1-4b36-b36c-37c92eaf0191.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx b/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx deleted file mode 100644 index ce6f6511..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/6a3b5064-0734-4c97-b0b5-f3e90ab318f0.vsidx b/.vs/HighWayIot/FileContentIndex/6a3b5064-0734-4c97-b0b5-f3e90ab318f0.vsidx deleted file mode 100644 index 5736776d..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/6a3b5064-0734-4c97-b0b5-f3e90ab318f0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/6d727bf7-847a-4930-be8f-7615b4819e63.vsidx b/.vs/HighWayIot/FileContentIndex/6d727bf7-847a-4930-be8f-7615b4819e63.vsidx deleted file mode 100644 index 69b5a8cc..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/6d727bf7-847a-4930-be8f-7615b4819e63.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx b/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx deleted file mode 100644 index 99ca9b54..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/72031803-4045-4e53-800e-9cce8493b203.vsidx b/.vs/HighWayIot/FileContentIndex/72031803-4045-4e53-800e-9cce8493b203.vsidx deleted file mode 100644 index 28549ffa..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/72031803-4045-4e53-800e-9cce8493b203.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/828773a2-1cd6-4504-a75a-8a52f0a8212b.vsidx b/.vs/HighWayIot/FileContentIndex/828773a2-1cd6-4504-a75a-8a52f0a8212b.vsidx new file mode 100644 index 00000000..627b0f55 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/828773a2-1cd6-4504-a75a-8a52f0a8212b.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/9674c747-7cb8-48ce-8c45-3ca01afc0c98.vsidx b/.vs/HighWayIot/FileContentIndex/9674c747-7cb8-48ce-8c45-3ca01afc0c98.vsidx deleted file mode 100644 index 7f85e61a..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/9674c747-7cb8-48ce-8c45-3ca01afc0c98.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx b/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx deleted file mode 100644 index 6865bdaf..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a1604837-5c72-4c9a-8795-008c7d12e49b.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx b/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx deleted file mode 100644 index e549c115..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/b044382f-9cea-4892-aa8b-63ca02264797.vsidx b/.vs/HighWayIot/FileContentIndex/b044382f-9cea-4892-aa8b-63ca02264797.vsidx deleted file mode 100644 index 185cbd9e..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/b044382f-9cea-4892-aa8b-63ca02264797.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx b/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx deleted file mode 100644 index 4be41662..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/c821ff03-0f8a-4879-b795-257253d2ccb0.vsidx b/.vs/HighWayIot/FileContentIndex/c821ff03-0f8a-4879-b795-257253d2ccb0.vsidx deleted file mode 100644 index 4983bbbc..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/c821ff03-0f8a-4879-b795-257253d2ccb0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx b/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx deleted file mode 100644 index cc2ca840..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/cb56b686-fc29-499f-a0c7-b9a8fe957327.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/ccec7898-66f2-4d9e-a085-7d312212593f.vsidx b/.vs/HighWayIot/FileContentIndex/ccec7898-66f2-4d9e-a085-7d312212593f.vsidx deleted file mode 100644 index 9dc1ed91..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/ccec7898-66f2-4d9e-a085-7d312212593f.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx b/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx deleted file mode 100644 index 4be628d2..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/cf9b03ef-3e0a-42b9-bfc8-400ea8cecab1.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/d7fb0995-8339-44dd-be6c-65dbb2c7d6bc.vsidx b/.vs/HighWayIot/FileContentIndex/d7fb0995-8339-44dd-be6c-65dbb2c7d6bc.vsidx deleted file mode 100644 index 5d463977..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/d7fb0995-8339-44dd-be6c-65dbb2c7d6bc.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/d8b01845-25f2-405f-b417-b03189cc045b.vsidx b/.vs/HighWayIot/FileContentIndex/d8b01845-25f2-405f-b417-b03189cc045b.vsidx deleted file mode 100644 index d07e4658..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/d8b01845-25f2-405f-b417-b03189cc045b.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx b/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx deleted file mode 100644 index 677c4392..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx b/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx deleted file mode 100644 index 7732abe4..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx b/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx deleted file mode 100644 index 145358ad..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f226cbf8-7058-4bff-98ff-fd1336a5f93f.vsidx b/.vs/HighWayIot/FileContentIndex/f226cbf8-7058-4bff-98ff-fd1336a5f93f.vsidx deleted file mode 100644 index 22a36618..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f226cbf8-7058-4bff-98ff-fd1336a5f93f.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx b/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx deleted file mode 100644 index a8d5ee1d..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx b/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx deleted file mode 100644 index ef9674f1..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f914577e-1104-43e3-a000-05331d0d25fa.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 845990e2..45bf92c4 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 da472f26..f31c09b4 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -100,15 +100,15 @@ namespace Aucma.Scada.Business grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; StartPassDown(); - Task.Run(() => - { - Thread.Sleep(6000); - for (int i = 1; i < 15; i++) - { - InStore("F2340600122510190" + i.ToString().PadLeft(2,'0')); - Thread.Sleep(1000); - } - }); + //Task.Run(() => + //{ + // Thread.Sleep(6000); + // for (int i = 1; i < 15; i++) + // { + // InStore("F2340600122510190" + i.ToString().PadLeft(2,'0')); + // Thread.Sleep(1000); + // } + //}); } /// diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 84ef79df..768307b1 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -64,6 +64,8 @@ namespace Aucma.Scada.Business private IProductPlanInfoService _productPlanInfoService; private IRecordOutStoreService _recordOutStoreService; + + private IRecordProductfinishService _recordProductfinishService; #endregion #region 委托事件 @@ -107,6 +109,7 @@ namespace Aucma.Scada.Business _executePlanInfoService = registerServices.GetService(); _productPlanInfoService = registerServices.GetService(); _recordOutStoreService = registerServices.GetService(); + _recordProductfinishService = registerServices.GetService(); assemblyPlanBusiness.NextPassExecutePlanInfoEvent += PlanHandle; taskHandleBusiness.OutStoreFinsihEvent += TaskFeedback; StartPassDown(); @@ -512,6 +515,17 @@ namespace Aucma.Scada.Business _productPlanInfoService.UpdateProductPlanInfo(productInfo); } + + #region 添加完成记录 + RecordProductfinish productfinish = new RecordProductfinish(); + productfinish.planCode = executeInfo.executePlanCode; + productfinish.productlineCode = appConfig.stationCode; + productfinish.materialCode = executeInfo.materialCode; + productfinish.completeAmount = 1; //目前一个箱体一个任务下发给plc + productfinish.recordTime = DateTime.Now; + _recordProductfinishService.InsertRecordProductfinish(productfinish); + #endregion + } RefreshAssemblyPlanInitEvent?.Invoke(); diff --git a/Aucma.Scada.Business/RegisterServices.cs b/Aucma.Scada.Business/RegisterServices.cs index 2319f54e..ce199a2c 100644 --- a/Aucma.Scada.Business/RegisterServices.cs +++ b/Aucma.Scada.Business/RegisterServices.cs @@ -60,6 +60,7 @@ namespace Aucma.Scada.Business services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); } public T GetService() diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index de9363c7..9c781f68 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 ec309ef8..9fe1496b 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 d4687248..4f693d27 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 b29a5591..e09621d8 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/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index 85725ebf..f050229b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index a1492e6a..b871ae06 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.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 3e64fad4..2ccd34ac 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 de9363c7..9c781f68 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 ec309ef8..9fe1496b 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 c8b2cfe4..3972387f 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/Aucma.Scada.Model.csproj b/Aucma.Scada.Model/Aucma.Scada.Model.csproj index 73950617..d14d28ac 100644 --- a/Aucma.Scada.Model/Aucma.Scada.Model.csproj +++ b/Aucma.Scada.Model/Aucma.Scada.Model.csproj @@ -52,6 +52,7 @@ + diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll index d4687248..4f693d27 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 b29a5591..e09621d8 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.Model/domain/RecordProductfinish.cs b/Aucma.Scada.Model/domain/RecordProductfinish.cs new file mode 100644 index 00000000..6145a99c --- /dev/null +++ b/Aucma.Scada.Model/domain/RecordProductfinish.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Aucma.Scada.Model.domain +{ + /// + /// 完成记录 + /// + [SugarTable("RECORD_PRODUCTFINISH")] + public class RecordProductfinish + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName="OBJ_ID" ,IsPrimaryKey = true ,OracleSequenceName = "SEQ_RECORD_PRODUCTFINISH")] + public decimal objId { get; set; } + /// + /// 计划编号 + /// + [SugarColumn(ColumnName="PLAN_CODE" )] + public string planCode { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName="MATERIAL_CODE" )] + public string materialCode { get; set; } + /// + /// 计划工位 + /// + [SugarColumn(ColumnName="PRODUCTLINE_CODE" )] + public string productlineCode { get; set; } + /// + /// 完成数量 + /// + [SugarColumn(ColumnName="COMPLETE_AMOUNT" )] + public decimal? completeAmount { get; set; } + /// + /// 记录时间 + /// + [SugarColumn(ColumnName="RECORD_TIME" )] + public DateTime? recordTime { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName="IS_FLAG" )] + public decimal? isFlag { get; set; } + } +} diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache index 600d303d..6575aa04 100644 --- a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache +++ b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -473beecf09d8e61b9d3ea111c8c22f1208383589 +f38bcd2f54993094da876b27284336475995c9e4 diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll index d4687248..4f693d27 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb index b29a5591..e09621d8 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/obj/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 de9363c7..9c781f68 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 ec309ef8..9fe1496b 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.Model.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll index d4687248..4f693d27 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb index b29a5591..e09621d8 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index 85725ebf..f050229b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index a1492e6a..b871ae06 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.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 acd2639b..d990fc4b 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/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 848af8ef..701a7c9e 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 16761ce4..69a95248 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 8e73522c..ebb1331d 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.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index b15f45ed..693e787e 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/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj index 7b9db316..e1a9dbaa 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -73,10 +73,12 @@ + + diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll index d4687248..4f693d27 100644 Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb index b29a5591..e09621d8 100644 Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index 85725ebf..f050229b 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index a1492e6a..b871ae06 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 65be7b3c..2142fbde 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.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache index 0f381321..09cd155f 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8893118b84e2105a65c287bff95b4c1f41b6812c +660c3d0a3acf862b36a99801d5441c99d107c271 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index 85725ebf..f050229b 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index a1492e6a..b871ae06 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/IRecordProductfinishService.cs b/HighWayIot.Repository/service/IRecordProductfinishService.cs new file mode 100644 index 00000000..265015fd --- /dev/null +++ b/HighWayIot.Repository/service/IRecordProductfinishService.cs @@ -0,0 +1,14 @@ +using Aucma.Scada.Model.domain; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public interface IRecordProductfinishService + { + bool InsertRecordProductfinish(RecordProductfinish productfinish); + } +} diff --git a/HighWayIot.Repository/service/Impl/RecordProductfinishServiceImpl.cs b/HighWayIot.Repository/service/Impl/RecordProductfinishServiceImpl.cs new file mode 100644 index 00000000..2db80fc2 --- /dev/null +++ b/HighWayIot.Repository/service/Impl/RecordProductfinishServiceImpl.cs @@ -0,0 +1,32 @@ +using Aucma.Scada.Model.domain; +using HighWayIot.Log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service.Impl +{ + public class RecordProductfinishServiceImpl : IRecordProductfinishService + { + Repository _repository => new Repository("mes"); + + private LogHelper logHelper = LogHelper.Instance; + + public bool InsertRecordProductfinish(RecordProductfinish productfinish) + { + bool result = false; + try + { + result = _repository.Insert(productfinish); + } + catch (Exception ex) + { + logHelper.Error("完成记录添加异常", ex); + } + + return result; + } + } +} diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index 69d3b625..5baebbf5 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/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll index d4687248..4f693d27 100644 Binary files a/HighWayIot/bin/Debug/Aucma.Scada.Model.dll and b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb index b29a5591..e09621d8 100644 Binary files a/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb and b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index 85725ebf..f050229b 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb index a1492e6a..b871ae06 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 8168eaf4..33eaf772 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ