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

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

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

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs

@@ -63,7 +63,7 @@ public partial class PrdOutstockH : BaseEntity<string>
     /// <summary>
     /// 发料工位
     /// </summary>
-    public string? workstation { get; set; }
+    public string? workstation_id { get; set; }
 
     /// <summary>
     /// 所属产线

ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs

@@ -544,7 +544,7 @@ namespace Tnb.ProductionMgr
             
             var queryable2 = db.Queryable<PrdOutstockH>()
                 .LeftJoin<UserEntity>((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,

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<PrdOutstockD> prdOutstockDs = new List<PrdOutstockD>();