diff --git a/.vs/HighWayIot/FileContentIndex/02444f37-f25d-40c9-bc01-4cc80de8b0b3.vsidx b/.vs/HighWayIot/FileContentIndex/02444f37-f25d-40c9-bc01-4cc80de8b0b3.vsidx new file mode 100644 index 00000000..7adfc29c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/02444f37-f25d-40c9-bc01-4cc80de8b0b3.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx b/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx deleted file mode 100644 index 30d4e531..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/193638bb-296a-436c-b03b-0ca68672dae6.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/39b0f75e-2405-45fb-80fb-dc2421428ab1.vsidx b/.vs/HighWayIot/FileContentIndex/39b0f75e-2405-45fb-80fb-dc2421428ab1.vsidx new file mode 100644 index 00000000..38ab9555 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/39b0f75e-2405-45fb-80fb-dc2421428ab1.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx b/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx deleted file mode 100644 index 7f34b1c8..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/5f1618df-c7dc-476f-86d6-e21f5596f72c.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx b/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx new file mode 100644 index 00000000..950c378a Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/68e09bbf-6b6a-40c7-81ef-218998a538bc.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx b/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx new file mode 100644 index 00000000..77f88cc7 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/93fb58c6-5917-4e41-876d-81c14551332a.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx b/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx deleted file mode 100644 index ef836187..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/9a1310db-970f-44b0-92bf-47696c2f01b4.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx b/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx deleted file mode 100644 index 79f0dd80..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/b61e6108-ab9f-47fb-92fa-2fc9d55cd505.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 243ec9eb..6653ac7d 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 ad2c1b27..0108380d 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -5,6 +5,7 @@ using HighWayIot.Log4net; using HighWayIot.Repository.service; using System; using System.Collections.Generic; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using static Aucma.Scada.Business.InStoreTaskHandle; @@ -53,6 +54,8 @@ namespace Aucma.Scada.Business private IBaseSpaceDetailService _baseSpaceDetailService; private IBaseBomInfoService _baseBomInfoService; + + private IRecordInStoreService _recordInStore; #endregion #region 委托事件 @@ -88,6 +91,7 @@ namespace Aucma.Scada.Business _taskInfoService = registerServices.GetService(); _baseSpaceDetailService = registerServices.GetService(); _baseBomInfoService = registerServices.GetService(); + _recordInStore = registerServices.GetService(); taskHandle.InStoreFinsihEvent += TaskFeedback; grabImage.RefreshMaterialCodeStrEvent += InStore; grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; @@ -96,10 +100,12 @@ namespace Aucma.Scada.Business //Task.Run(() => //{ // Thread.Sleep(6000); - // for (int i = 1; i < 7; i++) + // for (int i = 1; i < 15; i++) // { - // //InStore(appConfig.shellStoreCode, "B23600000781102300" + i); - // InStore(appConfig.linerStoreCode, "L23600000788102300" + i); + // InStore(appConfig.shellStoreCode, "B2360000078110230" + i.ToString().PadLeft(2, '0')); + // Thread.Sleep(1000); + // InStore(appConfig.linerStoreCode, "L2360000078810230" + i.ToString().PadLeft(2, '0')); + // Thread.Sleep(1000); // } //}); @@ -402,6 +408,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; + _recordInStore.InsertRecordInStore(recordInstore); + #endregion + } //清除任务信息 _taskInfoService.DeleteTaskInfo(taskCode, storeCode); diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index d603f0c8..105ddbae 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -1,6 +1,7 @@ using Aucma.Scada.Model.domain; using HighWayIot.Config; using HighWayIot.Log4net; +using HighWayIot.Repository; using HighWayIot.Repository.service; using System; using System.Collections.Generic; @@ -62,6 +63,8 @@ namespace Aucma.Scada.Business private IExecutePlanInfoService _executePlanInfoService; private IProductPlanInfoService _productPlanInfoService; + + private IRecordOutStoreService _recordOutStoreService; #endregion #region 委托事件 @@ -104,6 +107,8 @@ namespace Aucma.Scada.Business _spaceDetailService = registerServices.GetService(); _executePlanInfoService = registerServices.GetService(); _productPlanInfoService = registerServices.GetService(); + _recordOutStoreService = registerServices.GetService(); + assemblyPlanBusiness.NextPassExecutePlanInfoEvent += PlanHandle; taskHandleBusiness.OutStoreFinsihEvent += TaskFeedback; StartPassDown(); @@ -517,6 +522,17 @@ namespace Aucma.Scada.Business } _spaceInfoService.UpdateSpaceInfo(spaceInfo); + #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); @@ -684,5 +700,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..a7a14680 100644 --- a/Aucma.Scada.Business/RegisterServices.cs +++ b/Aucma.Scada.Business/RegisterServices.cs @@ -1,4 +1,5 @@ -using HighWayIot.Repository.service; +using HighWayIot.Repository; +using HighWayIot.Repository.service; using HighWayIot.Repository.service.Impl; using Microsoft.Extensions.DependencyInjection; using System; @@ -58,6 +59,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 4dc4358c..81a50498 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 8a0a00d5..ea6a2bd9 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 ac2c9356..7b87b966 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 965e7e48..8a11f24e 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 91c68326..74d0bce9 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 c533335f..ca26c689 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 61296cd8..0f8bc501 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 4dc4358c..81a50498 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 8a0a00d5..ea6a2bd9 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 b8d41713..a134d98a 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 7a76b95a..3a3fe1b0 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 ac2c9356..7b87b966 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 965e7e48..8a11f24e 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..cf066bb7 --- /dev/null +++ b/Aucma.Scada.Model/domain/RecordInstore.cs @@ -0,0 +1,94 @@ +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; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string createdBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? createdTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string updatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? updatedTime { get; set; } + } +} diff --git a/Aucma.Scada.Model/domain/RecordOutstore.cs b/Aucma.Scada.Model/domain/RecordOutstore.cs new file mode 100644 index 00000000..6346effe --- /dev/null +++ b/Aucma.Scada.Model/domain/RecordOutstore.cs @@ -0,0 +1,94 @@ +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; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="CREATED_BY" )] + public string createdBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CREATED_TIME" )] + public DateTime? createdTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName="UPDATED_BY" )] + public string updatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName="UPDATED_TIME" )] + public DateTime? updatedTime { get; set; } + } +} diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache index 230a44d3..75f86db8 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ 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 06657274..37a05d64 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 @@ -f21fa175ee2704029739090502d89e171b1728e9 +88285eb5de22a36a49c734ce03d953412e564964 diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll index ac2c9356..7b87b966 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 965e7e48..8a11f24e 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 4dc4358c..81a50498 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 8a0a00d5..ea6a2bd9 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 ac2c9356..7b87b966 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 965e7e48..8a11f24e 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 91c68326..74d0bce9 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 c533335f..ca26c689 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 bfc469f6..562a95e4 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 903ebcfc..de9a7da4 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 4f11b673..7f0bf72a 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 0a1fca45..f75e67d7 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..062e6c74 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -59,6 +59,7 @@ + @@ -71,8 +72,11 @@ + + + diff --git a/HighWayIot.Repository/IRecordOutStoreService.cs b/HighWayIot.Repository/IRecordOutStoreService.cs new file mode 100644 index 00000000..953d25bb --- /dev/null +++ b/HighWayIot.Repository/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 +{ + public interface IRecordOutStoreService + { + /// + /// 添加出库记录 + /// + /// + /// + bool InsertReocrdOutStoreService(RecordOutstore recordOutstore); + } +} diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll index ac2c9356..7b87b966 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 965e7e48..8a11f24e 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 91c68326..74d0bce9 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 c533335f..ca26c689 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 304136c0..3ee8c04b 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..c4d93f5f 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -23cd80385b397fa6fe8fd3585bc10f301878a043 +7df15e9e31ac50a6a452f6ee0d9264aa210c2058 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index 91c68326..74d0bce9 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 c533335f..ca26c689 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/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 fc3b222a..4248b14b 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 ac2c9356..7b87b966 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 965e7e48..8a11f24e 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 91c68326..74d0bce9 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 c533335f..ca26c689 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 28498f93..6155694f 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ