diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportUserListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportUserListOutput.cs new file mode 100644 index 00000000..d684b3d2 --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportUserListOutput.cs @@ -0,0 +1,15 @@ +namespace Tnb.ProductionMgr.Entities.Dto.PrdManage +{ + public class PrdReportUserListOutput + { + public string id {get;set;} + public string mo_task_id {get;set;} + public string equip_id {get;set;} + public string material_id {get;set;} + public string batch {get;set;} + public decimal? reported_qty {get;set;} + public decimal? rqty {get;set;} + public string create_id {get;set;} + public string create_time {get;set;} + } +} \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index ded5e525..21235658 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1607,7 +1607,7 @@ namespace Tnb.ProductionMgr //string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; string code1 = $"(01){basMaterial.di ?? ""}*(11){item.act_start_date.Value.ToString("yyMMdd")}*(17){item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}"; - string code2 = $"{basMaterial.material_specification}*{batch}*{item.act_start_date.Value.ToString("yyyyMMdd")}*{item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; + string code2 = $"{basMaterial.material_specification}*{batch}*{item.act_start_date.Value.ToString("yyyyMMdd")}*{item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}"; Dictionary dicCommand1 = new(StringComparer.OrdinalIgnoreCase) { ["DevName"] = "外包装箱码垛线", @@ -4121,6 +4121,40 @@ namespace Tnb.ProductionMgr .SetColumns(x => x.batch == batch) .Where(x => idList.Contains(x.id)) .ExecuteCommandAsync(); + foreach (var id in idList) + { + PrdMoTask prdMoTask = await _db.Queryable().Where(x => x.id == id).SingleAsync(); + if (prdMoTask.mo_task_status == DictConst.InProgressEnCode) + { + BasMaterial basMaterial = await _db.Queryable().Where(x=>x.id==prdMoTask.material_id).SingleAsync(); + string code1 = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}"; + string code2 = $"{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}"; + Dictionary dicCommand1 = new(StringComparer.OrdinalIgnoreCase) + { + ["DevName"] = "外包装箱码垛线", + ["token"] = _eleCtlCfg.token, + ["TagName"] = "WBZX_tb_cs", + ["Value"] = code1, + }; + Dictionary dicCommand2 = new(StringComparer.OrdinalIgnoreCase) + { + ["DevName"] = "外包装箱码垛线", + ["token"] = _eleCtlCfg.token, + ["TagName"] = "WBZX_pm_cs", + ["Value"] = code2, + }; + + Log.Information($"贴标写入参数:{JsonConvert.SerializeObject(dicCommand1)}"); + string result1 = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand1, false); + Log.Information($"贴标写入返回结果:{JsonConvert.SerializeObject(result1)}"); + Log.Information($"喷码写入参数:{JsonConvert.SerializeObject(dicCommand2)}"); + string result2 = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand2, false); + Log.Information($"喷码写入返回结果:{JsonConvert.SerializeObject(result2)}"); + } + + } + + return row>0 ? "设置成功" : "设置失败"; } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdReportUserListService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdReportUserListService.cs new file mode 100644 index 00000000..a18cfed3 --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr/PrdReportUserListService.cs @@ -0,0 +1,119 @@ +using JNPF; +using JNPF.Common.Core.Manager; +using JNPF.Common.Extension; +using JNPF.Common.Filter; +using JNPF.Common.Security; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.Extras.CollectiveOAuth.Utils; +using JNPF.FriendlyException; +using JNPF.Logging; +using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Entitys.System; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; +using JNPF.VisualDev.Interfaces; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.BasicData; +using Tnb.BasicData.Entities; +using Tnb.EquipMgr.Entities; +using Tnb.ProductionMgr.Entities; +using Tnb.ProductionMgr.Entities.Dto; +using Tnb.ProductionMgr.Entities.Dto.PrdManage; +using Tnb.ProductionMgr.Entities.Enums; +using Tnb.ProductionMgr.Interfaces; +using AuthResponse = JNPF.Extras.CollectiveOAuth.Models.AuthResponse; +using StringExtensions = JNPF.Common.Extension.StringExtensions; + +namespace Tnb.ProductionMgr +{ + /// + /// 人员产量统计表 + /// + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleId)] + public class PrdReportUserListService : IOverideVisualDevService, IDynamicApiController, ITransient + { + private const string ModuleId = "37231170320661"; + private readonly ISqlSugarRepository _repository; + private readonly IDataBaseManager _dataBaseManager; + private readonly IUserManager _userManager; + private readonly IDictionaryDataService _dictionaryDataService; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly ISqlSugarClient _db; + + public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); + + public PrdReportUserListService( + ISqlSugarRepository repository, + IDataBaseManager dataBaseManager, + IUserManager userManager, + IDictionaryDataService dictionaryDataService, + IRunService runService, + IVisualDevService visualDevService + ) + { + _repository = repository; + _dataBaseManager = dataBaseManager; + _userManager = userManager; + _dictionaryDataService = dictionaryDataService; + _runService = runService; + _visualDevService = visualDevService; + _db = _repository.AsSugarClient(); + OverideFuncs.GetListAsync = GetList; + } + + + private async Task GetList(VisualDevModelListQueryInput input) + { + ISqlSugarClient db = _repository.AsSugarClient(); + Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); + string moTaskCode = queryJson.ContainsKey("mo_task_id") ? queryJson["mo_task_id"].ToString() : ""; + string equipInfo = queryJson.ContainsKey("equip_id") ? queryJson["equip_id"].ToString() : ""; + string materialInfo = queryJson.ContainsKey("material_id") ? queryJson["material_id"].ToString() : ""; + string createInfo = queryJson.ContainsKey("create_id") ? queryJson["create_id"].ToString() : ""; + DateTime[] createTime = queryJson.ContainsKey("create_time") ? queryJson["create_time"].ToObject().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray() : null; + DateTime? sDate = null; + DateTime? eDate = null; + + if (createTime != null && createTime.Length == 2) + { + sDate = createTime[0]; + eDate = createTime[1]; + } + + SqlSugarPagedList result = await db.Queryable() + .LeftJoin((a,b)=>a.mo_task_id==b.id) + .LeftJoin((a, b,c) => a.material_id == c.id) + .LeftJoin((a, b,c,d) => a.create_id == d.Id) + .LeftJoin((a, b,c,d,e) => a.equip_id == e.id) + .WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => b.mo_task_code.Contains(moTaskCode)) + .WhereIF(!string.IsNullOrEmpty(equipInfo), (a, b, c, d,e) => e.code.Contains(equipInfo) || e.name.Contains(equipInfo)) + .WhereIF(!string.IsNullOrEmpty(materialInfo), (a, b, c, d,e) => c.code.Contains(materialInfo) || c.name.Contains(materialInfo)) + .WhereIF(!string.IsNullOrEmpty(createInfo), (a, b, c, d,e) => d.Account.Contains(createInfo) || d.RealName.Contains(createInfo)) + .WhereIF(createTime!=null && createTime.Length==2,a=>a.create_time>=sDate && a.create_time<=eDate) + .OrderByDescending(a => a.create_time) + .Select((a, b, c, d, e) => new PrdReportUserListOutput + { + id = a.id, + mo_task_id = b.mo_task_code, + equip_id = e.name, + material_id = c.code+"/"+c.name, + batch = a.batch, + reported_qty = a.reported_qty, + rqty = a.rqty, + create_id = d.RealName, + create_time = a.create_time.ToString(DbTimeFormat.SS) + }).ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(result); + } + + } +} + diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 3cbb2f10..bb7b9085 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -378,6 +378,7 @@ namespace Tnb.WarehouseMgr Dictionary erpRequestData = new Dictionary(); erpRequestData.Add("approver", erpCreateId); erpRequestData.Add("billmaker", erpCreateId); + erpRequestData.Add("cbiztype", wmsPurchaseH?.transaction_type ?? ""); erpRequestData.Add("bitinbill", false); erpRequestData.Add("cgeneralhid", null); erpRequestData.Add("corpoid", erpOrg.corpoid); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index e1774ab4..34e16224 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -159,6 +159,7 @@ namespace Tnb.WarehouseMgr Dictionary erpRequestData = new Dictionary(); erpRequestData.Add("approver", erpCreateId); erpRequestData.Add("billmaker", erpCreateId); + erpRequestData.Add("cbiztype", wmsPurchaseH?.transaction_type ?? ""); erpRequestData.Add("bitinbill", false); erpRequestData.Add("cgeneralhid", null); erpRequestData.Add("corpoid", erpOrg.corpoid);