diff --git a/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx b/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx new file mode 100644 index 00000000..bc35f4fe Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/2f00ca66-dea5-4521-b0c0-348f2ccc66b3.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx b/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx new file mode 100644 index 00000000..677c4392 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/ef4ba1ec-bceb-470c-a08a-53f0923c8569.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx b/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx new file mode 100644 index 00000000..145358ad Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f13e2fb7-fab1-483d-afcf-831b985d12b8.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx b/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx new file mode 100644 index 00000000..a8d5ee1d Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f8b41b98-4cc9-4924-9b1e-eb7da89916e8.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index e1b0507e..845990e2 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 7a6898ff..da472f26 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -56,6 +56,8 @@ namespace Aucma.Scada.Business private IBaseSpaceDetailService _baseSpaceDetailService; private IBaseBomInfoService _baseBomInfoService; + + private IRecordInStoreService _recordInStoreService; #endregion #region 委托事件 @@ -91,6 +93,8 @@ namespace Aucma.Scada.Business _taskInfoService = registerServices.GetService(); _baseSpaceDetailService = registerServices.GetService(); _baseBomInfoService = registerServices.GetService(); + _recordInStoreService = registerServices.GetService(); + taskHandle.InStoreFinsihEvent += FoamTaskFeedback; grabImage.RefreshMaterialCodeStrEvent += InStore; grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; @@ -99,9 +103,10 @@ namespace Aucma.Scada.Business Task.Run(() => { Thread.Sleep(6000); - for (int i = 1; i < 9; i++) + for (int i = 1; i < 15; i++) { - InStore("F23406001225101901" + i); + InStore("F2340600122510190" + i.ToString().PadLeft(2,'0')); + Thread.Sleep(1000); } }); } @@ -320,6 +325,19 @@ namespace Aucma.Scada.Business _baseSpaceDetailService.InsertSpaceDetail(spaceDetail); #endregion + #region 添加入库任务 + RecordInstore recordInstore = new RecordInstore(); + recordInstore.storeCode = taskInfo.storeCode; + recordInstore.spaceCode = taskInfo.spaceCode; + recordInstore.materialCode = taskInfo.materialCode; + recordInstore.materialType = taskInfo.materialType; + recordInstore.materialName = GetMaterialName(taskInfo.materialType); + recordInstore.inStoreAmount = 1; + recordInstore.inStoreTime = DateTime.Now; + recordInstore.barcodeCode = taskInfo.materialCode; + _recordInStoreService.InsertRecordInStore(recordInstore); + #endregion + } //清除任务信息 _taskInfoService.DeleteTaskInfo(taskCode, appConfig.foamStoreCode); diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index c78cef1d..84ef79df 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -62,6 +62,8 @@ namespace Aucma.Scada.Business private IExecutePlanInfoService _executePlanInfoService; private IProductPlanInfoService _productPlanInfoService; + + private IRecordOutStoreService _recordOutStoreService; #endregion #region 委托事件 @@ -104,6 +106,7 @@ namespace Aucma.Scada.Business _spaceDetailService = registerServices.GetService(); _executePlanInfoService = registerServices.GetService(); _productPlanInfoService = registerServices.GetService(); + _recordOutStoreService = registerServices.GetService(); assemblyPlanBusiness.NextPassExecutePlanInfoEvent += PlanHandle; taskHandleBusiness.OutStoreFinsihEvent += TaskFeedback; StartPassDown(); @@ -449,6 +452,18 @@ namespace Aucma.Scada.Business _spaceInfoService.UpdateSpaceInfo(spaceInfo); //读取PLC获取物料类型进行绑定 + + #region 添加出库记录 + RecordOutstore recordOutstore = new RecordOutstore(); + recordOutstore.storeCode = taskInfo.storeCode; + recordOutstore.spaceCode = taskInfo.spaceCode; + recordOutstore.materialCode = taskInfo.materialCode; + recordOutstore.materialType = taskInfo.materialType; + recordOutstore.materialName = GetMaterialName(taskInfo.materialType); + recordOutstore.outStoreAmount = 1; + recordOutstore.outStoreTime = DateTime.Now; + _recordOutStoreService.InsertReocrdOutStoreService(recordOutstore); + #endregion } //清除任务信息 _taskInfoService.DeleteTaskInfo(taskCode, storeCode); @@ -616,5 +631,22 @@ namespace Aucma.Scada.Business GetAllRelese(sph); } } + + /// + /// 通过BOM获取物料名称 + /// + /// + /// + public string GetMaterialName(string materialType) + { + string materialName = string.Empty; + var info = _bomInfoService.GetBomInfoByMaterialCode(materialType); + if (info != null) + { + materialName = info.materialName; + } + + return materialName; + } } } diff --git a/Aucma.Scada.Business/RegisterServices.cs b/Aucma.Scada.Business/RegisterServices.cs index 386ee7ef..2319f54e 100644 --- a/Aucma.Scada.Business/RegisterServices.cs +++ b/Aucma.Scada.Business/RegisterServices.cs @@ -58,6 +58,8 @@ namespace Aucma.Scada.Business services.AddSingleton(); 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 c4f25a0e..de9363c7 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 449c52c8..ec309ef8 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 8a104271..d4687248 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 4323027a..b29a5591 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 f90a0807..85725ebf 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 d76c83a7..a1492e6a 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 79e9c9d6..3e64fad4 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 c4f25a0e..de9363c7 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 449c52c8..ec309ef8 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 a4cb5723..c8b2cfe4 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 1d223d34..73950617 100644 --- a/Aucma.Scada.Model/Aucma.Scada.Model.csproj +++ b/Aucma.Scada.Model/Aucma.Scada.Model.csproj @@ -50,6 +50,8 @@ + + diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll index 8a104271..d4687248 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 4323027a..b29a5591 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/RecordInstore.cs b/Aucma.Scada.Model/domain/RecordInstore.cs new file mode 100644 index 00000000..158bea6b --- /dev/null +++ b/Aucma.Scada.Model/domain/RecordInstore.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Aucma.Scada.Model.domain +{ + /// + /// 入库记录 + /// + [SugarTable("RECORD_INSTORE")] + public class RecordInstore + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName="OBJ_ID" ,IsPrimaryKey = true ,OracleSequenceName = "SEQ_RECORD_INSTORE")] + public decimal objId { get; set; } + /// + /// 仓库编号 + /// + [SugarColumn(ColumnName="STORE_CODE" )] + public string storeCode { get; set; } + /// + /// 仓库区域 + /// + [SugarColumn(ColumnName="STORE_AREA" )] + public string storeArea { get; set; } + /// + /// 货道编号 + /// + [SugarColumn(ColumnName="SPACE_CODE" )] + public string spaceCode { get; set; } + /// + /// 物料类型 + /// + [SugarColumn(ColumnName="MATERIAL_TYPE" )] + public string materialType { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName="MATERIAL_CODE" )] + public string materialCode { get; set; } + /// + /// 入库数量 + /// + [SugarColumn(ColumnName="IN_STORE_AMOUNT" )] + public decimal? inStoreAmount { get; set; } + /// + /// 入库时间 + /// + [SugarColumn(ColumnName="IN_STORE_TIME" )] + public DateTime? inStoreTime { get; set; } + /// + /// 物料条码编号 + /// + [SugarColumn(ColumnName="BARCODE_CODE" )] + public string barcodeCode { get; set; } + /// + /// 物料名称 + /// + [SugarColumn(ColumnName="MATERIAL_NAME" )] + public string materialName { get; set; } + /// + /// 入库方式(0-正常,1-异常) + /// + [SugarColumn(ColumnName="ENTRY_PATTERN" )] + public short? entryPattern { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName="IS_FLAG" )] + public short? isFlag { get; set; } + + } +} diff --git a/Aucma.Scada.Model/domain/RecordOutstore.cs b/Aucma.Scada.Model/domain/RecordOutstore.cs new file mode 100644 index 00000000..88ff0039 --- /dev/null +++ b/Aucma.Scada.Model/domain/RecordOutstore.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Aucma.Scada.Model.domain +{ + /// + /// 出库记录 + /// + [SugarTable("RECORD_OUTSTORE")] + public class RecordOutstore + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName="OBJ_ID" ,IsPrimaryKey = true ,OracleSequenceName = "SEQ_RECORD_OUTSTORE")] + public decimal objId { get; set; } + /// + /// 仓库编号 + /// + [SugarColumn(ColumnName="STORE_CODE" )] + public string storeCode { get; set; } + /// + /// 仓库区域 + /// + [SugarColumn(ColumnName="STORE_AREA" )] + public string storeArea { get; set; } + /// + /// 货道编号 + /// + [SugarColumn(ColumnName="SPACE_CODE" )] + public string spaceCode { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName="MATERIAL_CODE" )] + public string materialCode { get; set; } + /// + /// 物料名称 + /// + [SugarColumn(ColumnName="MATERIAL_NAME" )] + public string materialName { get; set; } + /// + /// 出库数量 + /// + [SugarColumn(ColumnName="OUT_STORE_AMOUNT" )] + public decimal? outStoreAmount { get; set; } + /// + /// 出库时间 + /// + [SugarColumn(ColumnName="OUT_STORE_TIME" )] + public DateTime? outStoreTime { get; set; } + /// + /// 物料条码编号 + /// + [SugarColumn(ColumnName="BARCODE_CODE" )] + public string barcodeCode { get; set; } + /// + /// 物料类型 + /// + [SugarColumn(ColumnName="MATERIAL_TYPE" )] + public string materialType { get; set; } + /// + /// 出库方式(0-正常,1-异常) + /// + [SugarColumn(ColumnName="EXIT_PATTERN" )] + public short? exitPattern { 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 746216cb..600d303d 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 @@ -39336b1f3475a4e8d9459ed0dd66be75ea5b0106 +473beecf09d8e61b9d3ea111c8c22f1208383589 diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll index 8a104271..d4687248 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 4323027a..b29a5591 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 c4f25a0e..de9363c7 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 449c52c8..ec309ef8 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 8a104271..d4687248 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 4323027a..b29a5591 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/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 9ee51f13..6c8cc0f0 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 2679a11d..d42ff39c 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/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index f90a0807..85725ebf 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 d76c83a7..a1492e6a 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 d71d142d..acd2639b 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 9ee51f13..6c8cc0f0 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 2679a11d..d42ff39c 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 f3caf620..46f22ffa 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); - } - } -} + diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 1b741484..848af8ef 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 4771839f..16761ce4 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.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 2c345945..b15f45ed 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 0a185fe1..7b9db316 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -71,8 +71,12 @@ + + + + diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll index 8a104271..d4687248 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 4323027a..b29a5591 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 f90a0807..85725ebf 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 d76c83a7..a1492e6a 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 8f6393db..65be7b3c 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 f1d7c6b1..0f381321 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -23cd80385b397fa6fe8fd3585bc10f301878a043 +8893118b84e2105a65c287bff95b4c1f41b6812c diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index f90a0807..85725ebf 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 d76c83a7..a1492e6a 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/IRecordInStoreService.cs b/HighWayIot.Repository/service/IRecordInStoreService.cs new file mode 100644 index 00000000..88afa5f0 --- /dev/null +++ b/HighWayIot.Repository/service/IRecordInStoreService.cs @@ -0,0 +1,19 @@ +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 IRecordInStoreService + { + /// + /// 添加入库记录 + /// + /// + /// + bool InsertRecordInStore(RecordInstore recordInstore); + } +} diff --git a/HighWayIot.Repository/service/IRecordOutStoreService.cs b/HighWayIot.Repository/service/IRecordOutStoreService.cs new file mode 100644 index 00000000..04abc8f6 --- /dev/null +++ b/HighWayIot.Repository/service/IRecordOutStoreService.cs @@ -0,0 +1,19 @@ +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 IRecordOutStoreService + { + /// + /// 添加出库记录 + /// + /// + /// + bool InsertReocrdOutStoreService(RecordOutstore recordOutstore); + } +} diff --git a/HighWayIot.Repository/service/Impl/RecordInStoreServiceImpl.cs b/HighWayIot.Repository/service/Impl/RecordInStoreServiceImpl.cs new file mode 100644 index 00000000..acf748bf --- /dev/null +++ b/HighWayIot.Repository/service/Impl/RecordInStoreServiceImpl.cs @@ -0,0 +1,31 @@ +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 RecordInStoreServiceImpl : IRecordInStoreService + { + Repository _repository => new Repository("mes"); + + private LogHelper logHelper = LogHelper.Instance; + + public bool InsertRecordInStore(RecordInstore recordInstore) + { + bool result = false; + try + { + result = _repository.Insert(recordInstore); + }catch (Exception ex) + { + logHelper.Error("入库记录添加异常", ex); + } + + return result; + } + } +} diff --git a/HighWayIot.Repository/service/Impl/RecordOutStoreServiceImpl.cs b/HighWayIot.Repository/service/Impl/RecordOutStoreServiceImpl.cs new file mode 100644 index 00000000..2a80cb59 --- /dev/null +++ b/HighWayIot.Repository/service/Impl/RecordOutStoreServiceImpl.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 RecordOutStoreServiceImpl : IRecordOutStoreService + { + Repository _repository => new Repository("mes"); + + private LogHelper logHelper = LogHelper.Instance; + + public bool InsertReocrdOutStoreService(RecordOutstore recordOutstore) + { + bool result = false; + try + { + result = _repository.Insert(recordOutstore); + } + 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 e634b1f2..69d3b625 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 8a104271..d4687248 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 4323027a..b29a5591 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 f90a0807..85725ebf 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 d76c83a7..a1492e6a 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 69ae1a06..8168eaf4 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ