Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

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;}
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs

@@ -169,4 +169,14 @@ public partial class PrdReport : BaseEntity<string>
     /// </summary>
     public string erp_pk_wr_product { get; set; }
 
+    /// <summary>
+    /// 合格数
+    /// </summary>
+    public decimal? pqty { get; set; }
+    /// <summary>
+    /// 不合格数
+    /// </summary>
+    public decimal? rqty { get; set; }
+    
+
 }

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<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
                                 {
                                     ["DevName"] = "外包装箱码垛线",
@@ -2092,22 +2092,12 @@ namespace Tnb.ProductionMgr
                     
                 }else if (mo.mo_type == DictConst.PrdMoTypeJC)
                 {
-                    if (changeBatchFlag)
-                    {
-                        EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
-                        ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
-                        batch = $"{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 2, 2)}{equipment.code.Substring(equipment.code.Length - 2, 2)}{prdMoTask.act_start_date.Value.ToString("yyMMdd")}";
-                        await db.Updateable<PrdMoTask>()
-                            .SetColumns(x => x.batch == batch)
-                            .SetColumns(x=>x.change_batch_count_by_day==changeCountNumByDay)
-                            .SetColumns(x=>x.change_batch_count_by_qty==changeCountNumByQty)
-                            .Where(x => x.id == prdMoTask.id)
-                            .ExecuteCommandAsync();
-                    }
-                    else
-                    {
-                        batch = prdMoTask.batch;
-                    }
+                    ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
+                    batch = $"6{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 4, 2)}{DateTime.Now.ToString("yyMMdd")}";
+                    await db.Updateable<PrdMoTask>()
+                        .SetColumns(x => x.batch == batch)
+                        .Where(x => x.id == prdMoTask.id)
+                        .ExecuteCommandAsync();
                 }else
                 {
                     // OrganizeEntity organizeEntity = await _db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == prdMoTask.workline_id);
@@ -2496,6 +2486,12 @@ namespace Tnb.ProductionMgr
                     throw Oops.Bah(result1.msg);
                 }
 
+                await _db.Updateable<PrdReport>()
+                    .SetColumns(x => x.pqty == input.pqty)
+                    .SetColumns(x => x.rqty == input.rqty)
+                    .Where(x => x.id == report.id)
+                    .ExecuteCommandAsync();
+
                 WmsPrdInstockInput wmsPrdInstockInput = new WmsPrdInstockInput();
                 wmsPrdInstockInput.prd_bill_code = prdMo.mo_code;
                 wmsPrdInstockInput.material_id = prdMoTask.material_id;
@@ -2627,8 +2623,8 @@ namespace Tnb.ProductionMgr
                         // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
                         ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "",
                         ["cbastunitid"] = erpExtendFields.Find(x =>x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "",
-                        ["nbplanwrnum"] = report.reported_qty,
-                        ["nbwrnum"] = report.reported_qty,
+                        ["nbplanwrnum"] = input.pqty,
+                        ["nbwrnum"] = input.pqty,
                         ["tbendtime"] = nowStr,
                         ["tbstarttime"] = prdMoTask.act_start_date != null ? prdMoTask.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                         ["vbinbatchcode"] = report.batch,
@@ -2751,6 +2747,29 @@ namespace Tnb.ProductionMgr
 
         }
 
+        [HttpPost]
+        public async Task<string> DelPrdReport(string id)
+        {
+            PrdReport prdReport = await _db.Queryable<PrdReport>().SingleAsync(x => x.id == id);
+            PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdReport.mo_task_id);
+            DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
+            {
+                await _db.Updateable<PrdMoTask>()
+                    .SetColumns(x => x.reported_work_qty == x.reported_work_qty - prdReport.reported_qty)
+                    .Where(x => x.id == prdMoTask.id)
+                    .ExecuteCommandAsync();
+                    
+                await _db.Updateable<PrdMo>()
+                    .SetColumns(x => x.reported_work_qty == x.reported_work_qty - prdReport.reported_qty)
+                    .Where(x => x.id == prdMoTask.mo_id)
+                    .ExecuteCommandAsync();
+
+                await _db.Deleteable<PrdReport>().Where(x => x.id == id).ExecuteCommandAsync();
+            });
+
+            return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "保存成功" : result.ErrorMessage);
+        }
+
         /// <summary>
         /// 自检报废提交
         /// </summary>
@@ -4102,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<PrdMoTask>().Where(x => x.id == id).SingleAsync();
+                if (prdMoTask.mo_task_status == DictConst.InProgressEnCode)
+                {
+                    BasMaterial basMaterial = await _db.Queryable<BasMaterial>().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<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
+                    {
+                        ["DevName"] = "外包装箱码垛线",
+                        ["token"] = _eleCtlCfg.token,
+                        ["TagName"] = "WBZX_tb_cs",
+                        ["Value"] = code1,
+                    };
+                    Dictionary<string, string> 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 ? "设置成功" : "设置失败";
         }
         

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
+{
+    /// <summary>
+    /// 人员产量统计表
+    /// </summary>
+    [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<PrdMo> _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<PrdMo> 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<dynamic> GetList(VisualDevModelListQueryInput input)
+        {
+            ISqlSugarClient db = _repository.AsSugarClient();
+            Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
+            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<long[]>().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<PrdReportUserListOutput> result = await db.Queryable<PrdReport>()
+                .LeftJoin<PrdMoTask>((a,b)=>a.mo_task_id==b.id)
+                .LeftJoin<BasMaterial>((a, b,c) => a.material_id == c.id)
+                .LeftJoin<UserEntity>((a, b,c,d) => a.create_id == d.Id)
+                .LeftJoin<EqpEquipment>((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<PrdReportUserListOutput>.SqlSugarPageResult(result);
+        }
+
+    }
+}
+

ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs

@@ -727,7 +727,7 @@ namespace Tnb.ProductionMgr
 
             if (records.IsEmpty()) return "";
             
-            await _thirdApiRecordService.Send(records, "自动");
+            await _thirdApiRecordService.Send(records, "自动",null,false);
             
             return "true";
         }