From 14aa0b2ff4d099914f7cd8348367a4a986c59069 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 8 Nov 2023 09:31:18 +0800 Subject: [PATCH 1/2] 1 --- EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs | 1 + EquipMgr/Tnb.EquipMgr/EqpDaqService.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs index 1f466b7d..bba88bd4 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs @@ -9,6 +9,7 @@ namespace Tnb.EquipMgr.Entities.Dto public string? data_type { get; set; } public string? enabled { get; set; } public string? equip_id { get; set; } + public string? equip_code { get; set; } public string? label_name { get; set; } public string? label_point { get; set; } public string? remark { get; set; } diff --git a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs index a2eb3303..5355f084 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs @@ -53,6 +53,7 @@ namespace Tnb.EquipMgr data_type = a.data_type, enabled = a.enabled == 1 ? "是" : "否", equip_id = a.equip_id, + equip_code = a.equip_code, label_name = a.label_name, label_point = a.label_point, remark = a.remark From 7f6bb604fd1d577658a82005ded0d03cd5455e88 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 8 Nov 2023 09:59:10 +0800 Subject: [PATCH 2/2] bug --- .../Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs | 2 +- ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs | 2 +- ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs index 787a4198..5d31f9a8 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs @@ -63,7 +63,7 @@ public partial class PrdOutstockH : BaseEntity /// /// 发料工位 /// - public string? workstation { get; set; } + public string? workstation_id { get; set; } /// /// 所属产线 diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 08625689..9a675eb6 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -544,7 +544,7 @@ namespace Tnb.ProductionMgr var queryable2 = db.Queryable() .LeftJoin((a, b) => a.create_id == b.Id) - .Where((a,b)=>a.workstation==input.stationId) + .Where((a,b)=>a.workstation_id==input.stationId) .Select((a, b) => new FeedingRecordListOutput() { id = a.id, diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs index 597ab613..afa9dd37 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs @@ -206,7 +206,7 @@ namespace Tnb.ProductionMgr org_id = _userManager.GetUserInfo().Result.organizeId, bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), create_time = DateTime.Now, - workstation = generalOutstockInput.workstation_id, + workstation_id = generalOutstockInput.workstation_id, workline = workline?.Id ?? "" }; @@ -325,7 +325,7 @@ namespace Tnb.ProductionMgr prdOutstockH.org_id = _userManager.GetUserInfo().Result.organizeId; prdOutstockH.bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); prdOutstockH.create_time = DateTime.Now; - prdOutstockH.workstation = materialOutstockInput.workstation_id; + prdOutstockH.workstation_id = materialOutstockInput.workstation_id; prdOutstockH.workline = workline?.Id ?? ""; List prdOutstockDs = new List();