From cbd78ef6650440fcaa2f9eb8b47d16ad76cb4d77 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 23 五月 2024 10:26:07 +0800 Subject: [PATCH] 添加叠盘区超时未使用空托入库 --- 代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/dt_management_timeController.cs | 33 +++++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs | 8 代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/EmptyPalletTask.cs | 7 + 代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_management_timeService.cs | 41 ++++++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_management_timeService.cs | 27 ++++ 代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_management_timeMapConfig.cs | 16 ++ 代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_management_time.cs | 65 ++++++++++ 代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_management_time.cs | 21 +++ 代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/dt_management_timeController.cs | 21 +++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_management_timeRepository.cs | 18 +++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_management_timeRepository.cs | 24 ++++ 代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs | 2 代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_management_timeService.cs | 13 ++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_management_timeService.cs | 12 ++ 代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs | 7 代码管理/PCS/WCS_Client/src/views/widesea_wcs/wcs/dt_management_time.vue | 2 16 files changed, 307 insertions(+), 10 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/wcs/dt_management_time.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/wcs/dt_management_time.vue" index 4c453d0..51a6c3d 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/wcs/dt_management_time.vue" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/wcs/dt_management_time.vue" @@ -30,7 +30,7 @@ sortName: "management_id" }); const editFormFields = ref({"management_numericalvalue":""}); - const editFormOptions = ref([[{"title":"鏁板��","required":true,"field":"management_numericalvalue","type":"text"}]]); + const editFormOptions = ref([[{"title":"鏁板��","required":true,"field":"management_numericalvalue","type":"int"}]]); const searchFormFields = ref({"management_remark":""}); const searchFormOptions = ref([[{"title":"璇存槑","field":"management_remark","type":"like"}]]); const columns = ref([{field:'management_id',title:'涓婚敭',type:'int',width:80,hidden:true,readonly:true,require:true,align:'left'}, diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_management_time.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_management_time.cs" new file mode 100644 index 0000000..3178b23 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_management_time.cs" @@ -0,0 +1,65 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠g爜鐢熷櫒閲嶆柊鐢熸垚姝odel + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Entity.SystemModels; + +namespace WIDESEA_Entity.DomainModels +{ + [Entity(TableCnName = "鏃堕棿绠$悊",TableName = "dt_management_time")] + public partial class dt_management_time:BaseEntity + { + /// <summary> + ///涓婚敭 + /// </summary> + [Key] + [Display(Name ="涓婚敭")] + [Column(TypeName="int")] + [Required(AllowEmptyStrings=false)] + public int management_id { get; set; } + + /// <summary> + ///鍚嶇О + /// </summary> + [Display(Name ="鍚嶇О")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + //[Required(AllowEmptyStrings=false)] + public string management_name { get; set; } + + /// <summary> + ///鏁板�� + /// </summary> + [Display(Name ="鏁板��")] + [Column(TypeName="int")] + [Editable(true)] + [Required(AllowEmptyStrings=false)] + public int management_numericalvalue { get; set; } + + /// <summary> + ///鏃堕棿鍗曚綅 + /// </summary> + [Display(Name ="鏃堕棿鍗曚綅")] + [MaxLength(20)] + [Column(TypeName="nvarchar(20)")] + //[Required(AllowEmptyStrings=false)] + public string management_unitoftime { get; set; } + + /// <summary> + ///璇存槑 + /// </summary> + [Display(Name ="璇存槑")] + [MaxLength(100)] + [Column(TypeName="nvarchar(100)")] + public string management_remark { get; set; } + + + } +} \ No newline at end of file diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" index 8acfd0a..854dca4 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" @@ -78,7 +78,7 @@ [Display(Name = "鏈�鍚庣姸鎬佹敼鍙樻椂闂�")] [Column(TypeName = "datetime")] [Editable(true)] - public DateTime? lastUpdateTime { get; set; } + public DateTime lastUpdateTime { get; set; } /// <summary> ///杞﹁疆鏁伴噺 diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_management_time.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_management_time.cs" new file mode 100644 index 0000000..a10deff --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_management_time.cs" @@ -0,0 +1,21 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠g爜鐢熷櫒閲嶆柊鐢熸垚姝odel + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Entity.SystemModels; + +namespace WIDESEA_Entity.DomainModels +{ + + public partial class dt_management_time + { + //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯� + } +} \ No newline at end of file diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_management_timeMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_management_timeMapConfig.cs" new file mode 100644 index 0000000..2d8c8dc --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_management_timeMapConfig.cs" @@ -0,0 +1,16 @@ +using WIDESEA_Entity.MappingConfiguration; +using WIDESEA_Entity.DomainModels; +using Microsoft.EntityFrameworkCore.Metadata.Builders; + +namespace WIDESEA_Entity.MappingConfiguration +{ + public class dt_management_timeMapConfig : EntityMappingConfiguration<dt_management_time> + { + public override void Map(EntityTypeBuilder<dt_management_time> + builderTable) + { + //b.Property(x => x.StorageName).HasMaxLength(45); + } + } +} + diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/EmptyPalletTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/EmptyPalletTask.cs" index ea0743b..a485791 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/EmptyPalletTask.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/EmptyPalletTask.cs" @@ -8,7 +8,9 @@ using WIDESEA_Common; using WIDESEA_Core.EFDbContext; using WIDESEA_Entity.DomainModels; +using WIDESEA_WCS.IRepositories; using WIDESEA_WCS.JobsPart.Common; +using WIDESEA_WCS.Repositories; using WIDESEA_WMS.IRepositories; using WIDESEA_WMS.Repositories; using static System.Collections.Specialized.BitVector32; @@ -28,12 +30,15 @@ VOLContext Context = new VOLContext(); Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context); Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context); + Idt_management_timeRepository timeRepository = new dt_management_timeRepository(Context); #region 鍙犵洏鍖烘弧5涓叆搴� 闇�浼樺寲 var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.enable).ToList(); var EmptyD = EmptyStations.Where(x => x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 5).FirstOrDefault(); if (EmptyD != null) EmptyTray.CreateEmptyTrayIn(stationinfoRepository, EmptyD); - //EmptyD = EmptyStations.Where(x => x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0&&x.lastUpdateTime.).FirstOrDefault();//鏃堕棿瓒呰繃6灏忔椂鍏ュ簱 + var val = timeRepository.Find(x => x.management_name == "StackingArea").FirstOrDefault().management_numericalvalue; + EmptyD = EmptyStations.Where(x => x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity < 5 && x.lastUpdateTime.AddHours(val) < DateTime.Now).FirstOrDefault();//鏃堕棿瓒呰繃6灏忔椂鍏ュ簱 + if (EmptyD != null) EmptyTray.CreateEmptyTrayIn(stationinfoRepository, EmptyD); #endregion var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == AGVTaskStateEnum.Queue.ToString() && x.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString() && string.IsNullOrEmpty(x.agv_toaddress)).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList(); diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" index 9d475f9..24685db 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" @@ -167,7 +167,7 @@ if (task.agv_taskstate == AGVTaskStateEnum.Complete1.ToString()) { - var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress); + var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress); ////绌烘墭浠诲姟闇�淇敼閫昏緫 if (station2.stationCode.Contains("X")) station2.quantity = 0;// task.agv_tasktype.Contains("TaskType_EmptyPallet") ? 0 : task.agv_qty; //task.agv_qty; @@ -187,7 +187,7 @@ } else if (task.agv_taskstate == AGVTaskStateEnum.Complete.ToString()) { - var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress); + var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress); #region MyRegion //if (station1.stationCode.Contains("S")) // station1.quantity = 0; @@ -225,7 +225,8 @@ //if (!station1.stationCode.Contains("X") && !station1.stationCode.Contains("S") && !station1.stationCode.Contains("W01001004") && !station1.stationCode.Contains("W01001005")) // station1.tray_type = string.Empty; } - station1.lastUpdateTime = DateTime.Now; + if (!station1.stationCode.Contains("DD")) + station1.lastUpdateTime = DateTime.Now; stationinfoRepository.Update(station1, true); } } diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs" index 8c7b8b2..f7ddcc4 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs" @@ -38,7 +38,7 @@ /// <summary> /// 鑾峰彇鍙叆绌烘墭璐т綅 /// </summary> - public static dt_stationinfo GetEmptyTrayStation(Idt_stationinfoRepository stationinfoRepository,dt_agvtask agv_task) + public static dt_stationinfo GetEmptyTrayStation(Idt_stationinfoRepository stationinfoRepository, dt_agvtask agv_task) { dt_stationinfo EmptyStation = null; #region 妫�娴嬩笂鏂欑殑绌烘墭鍙犵洏 @@ -80,7 +80,7 @@ #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔� if (agvtaskRepository.Find(x => x.agv_fromaddress == toEmptyStation.stationCode || x.agv_toaddress == toEmptyStation.stationCode).Any()) return; #endregion - + var quantity = 5 - toEmptyStation.quantity; dt_agvtask agvtask = new dt_agvtask() { agv_fromaddress = EmptyStation.stationCode, @@ -89,8 +89,8 @@ agv_grade = 3, agv_createtime = DateTime.Now, agv_taskstate = "Create", - //agv_materielid = station.stationType, - agv_qty = EmptyStation.quantity - toEmptyStation.quantity, + agv_qty = EmptyStation.quantity <= quantity ? EmptyStation.quantity : quantity, + //agv_qty = EmptyStation.quantity - toEmptyStation.quantity, StarQuantity = toEmptyStation.quantity, EndQuantity = toEmptyStation.quantity, agv_tasktype = "TaskType_EmptyPallet", diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_management_timeRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_management_timeRepository.cs" new file mode 100644 index 0000000..6ef3c95 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_management_timeRepository.cs" @@ -0,0 +1,18 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_management_timeRepository缂栧啓鎺ュ彛 + */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core.BaseProvider; +using WIDESEA_Entity.DomainModels; +using WIDESEA_Core.Extensions.AutofacManager; +namespace WIDESEA_WCS.IRepositories +{ + public partial interface Idt_management_timeRepository : IDependency,IRepository<dt_management_time> + { + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_management_timeService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_management_timeService.cs" new file mode 100644 index 0000000..1937a7a --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_management_timeService.cs" @@ -0,0 +1,12 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + */ +using WIDESEA_Core.BaseProvider; +using WIDESEA_Entity.DomainModels; + +namespace WIDESEA_WCS.IServices +{ + public partial interface Idt_management_timeService : IService<dt_management_time> + { + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_management_timeService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_management_timeService.cs" new file mode 100644 index 0000000..85baa75 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_management_timeService.cs" @@ -0,0 +1,13 @@ +/* +*鎵�鏈夊叧浜巇t_management_time绫荤殑涓氬姟浠g爜鎺ュ彛搴斿湪姝ゅ缂栧啓 +*/ +using WIDESEA_Core.BaseProvider; +using WIDESEA_Entity.DomainModels; +using WIDESEA_Core.Utilities; +using System.Linq.Expressions; +namespace WIDESEA_WCS.IServices +{ + public partial interface Idt_management_timeService + { + } + } diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_management_timeRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_management_timeRepository.cs" new file mode 100644 index 0000000..7e49998 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_management_timeRepository.cs" @@ -0,0 +1,24 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_management_timeRepository缂栧啓浠g爜 + */ +using WIDESEA_WCS.IRepositories; +using WIDESEA_Core.BaseProvider; +using WIDESEA_Core.EFDbContext; +using WIDESEA_Core.Extensions.AutofacManager; +using WIDESEA_Entity.DomainModels; + +namespace WIDESEA_WCS.Repositories +{ + public partial class dt_management_timeRepository : RepositoryBase<dt_management_time> , Idt_management_timeRepository + { + public dt_management_timeRepository(VOLContext dbContext) + : base(dbContext) + { + + } + public static Idt_management_timeRepository Instance + { + get { return AutofacContainerModule.GetService<Idt_management_timeRepository>(); } } + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_management_timeService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_management_timeService.cs" new file mode 100644 index 0000000..1901271 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_management_timeService.cs" @@ -0,0 +1,41 @@ +/* + *鎵�鏈夊叧浜巇t_management_time绫荤殑涓氬姟浠g爜搴斿湪姝ゅ缂栧啓 +*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭� +*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction +*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭� +*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔 +*dt_management_timeService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter +*/ +using WIDESEA_Core.BaseProvider; +using WIDESEA_Core.Extensions.AutofacManager; +using WIDESEA_Entity.DomainModels; +using System.Linq; +using WIDESEA_Core.Utilities; +using System.Linq.Expressions; +using WIDESEA_Core.Extensions; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using WIDESEA_WCS.IRepositories; + +namespace WIDESEA_WCS.Services +{ + public partial class dt_management_timeService + { + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly Idt_management_timeRepository _repository;//璁块棶鏁版嵁搴� + + [ActivatorUtilitiesConstructor] + public dt_management_timeService( + Idt_management_timeRepository dbRepository, + IHttpContextAccessor httpContextAccessor + ) + : base(dbRepository) + { + _httpContextAccessor = httpContextAccessor; + _repository = dbRepository; + //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠g爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢� + //base.Init(dbRepository); + } + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_management_timeService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_management_timeService.cs" new file mode 100644 index 0000000..6621cb8 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_management_timeService.cs" @@ -0,0 +1,27 @@ +/* + *Author锛歫xx + *Contact锛�283591387@qq.com + *浠g爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *鎵�鏈変笟鍔$紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_management_timeService涓嶪dt_management_timeService涓紪鍐� + */ +using WIDESEA_WCS.IRepositories; +using WIDESEA_WCS.IServices; +using WIDESEA_Core.BaseProvider; +using WIDESEA_Core.Extensions.AutofacManager; +using WIDESEA_Entity.DomainModels; + +namespace WIDESEA_WCS.Services +{ + public partial class dt_management_timeService : ServiceBase<dt_management_time, Idt_management_timeRepository> + , Idt_management_timeService, IDependency + { + public dt_management_timeService(Idt_management_timeRepository repository) + : base(repository) + { + Init(repository); + } + public static Idt_management_timeService Instance + { + get { return AutofacContainerModule.GetService<Idt_management_timeService>(); } } + } + } diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/dt_management_timeController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/dt_management_timeController.cs" new file mode 100644 index 0000000..b8c6dee --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/dt_management_timeController.cs" @@ -0,0 +1,33 @@ +/* + *鎺ュ彛缂栧啓澶�... +*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬� +*濡�: [ApiActionPermission("dt_management_time",Enums.ActionPermissionOptions.Search)] + */ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using WIDESEA_Entity.DomainModels; +using WIDESEA_WCS.IServices; + +namespace WIDESEA_WCS.Controllers +{ + public partial class dt_management_timeController + { + private readonly Idt_management_timeService _service;//璁块棶涓氬姟浠g爜 + private readonly IHttpContextAccessor _httpContextAccessor; + + [ActivatorUtilitiesConstructor] + public dt_management_timeController( + Idt_management_timeService service, + IHttpContextAccessor httpContextAccessor + ) + : base(service) + { + _service = service; + _httpContextAccessor = httpContextAccessor; + } + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/dt_management_timeController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/dt_management_timeController.cs" new file mode 100644 index 0000000..db238d5 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/dt_management_timeController.cs" @@ -0,0 +1,21 @@ +/* + *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩� + *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_management_timeController缂栧啓 + */ +using Microsoft.AspNetCore.Mvc; +using WIDESEA_Core.Controllers.Basic; +using WIDESEA_Entity.AttributeManager; +using WIDESEA_WCS.IServices; +namespace WIDESEA_WCS.Controllers +{ + [Route("api/dt_management_time")] + [PermissionTable(Name = "dt_management_time")] + public partial class dt_management_timeController : ApiBaseController<Idt_management_timeService> + { + public dt_management_timeController(Idt_management_timeService service) + : base(service) + { + } + } +} + -- Gitblit v1.9.3