添加x2server设备关联的字段

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs

@@ -217,5 +217,10 @@ public partial class EqpEquipment : BaseEntity<string>
     /// 入库库位id
     /// </summary>
     public string? as_location_id { get; set; }
+    
+    /// <summary>
+    /// 第三方平台设备编号
+    /// </summary>
+    public string? third_equip_code { get; set; }
 
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs

@@ -144,5 +144,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// 副单位数量（kg）
         /// </summary>
         public string? deputy_num { get; set; }
+        
+        /// <summary>
+        /// 第三方平台设备编号
+        /// </summary>
+        public string? third_equip_code { get; set; }
+        
+        /// <summary>
+        /// 称重点位名称
+        /// </summary>
+        public string? weight_name { get; set; }
     }
 }

ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs

@@ -401,13 +401,14 @@ namespace Tnb.ProductionMgr
                 .LeftJoin<BasStandardTime>((a,b,c,d,e,f,g,h,i)=>a.process_id==i.process_id && i.enabled==1)
                 .LeftJoin<PrdMo>((a,b,c,d,e,f,g,h,i,j)=>a.mo_id==j.id)
                 .LeftJoin<BasMaterialUnit>((a,b,c,d,e,f,g,h,i,j,k)=>a.material_id==k.material_id && k.auxiliary_unit_id=="kg")
+                .LeftJoin<EqpDaq>((a,b,c,d,e,f,g,h,i,j,k,l)=>a.eqp_id==l.equip_id && l.enabled==1 && l.label_point=="提报装箱称重点位")
                 .Where((a, b) => a.workstation_id == input.stationId && (a.mo_task_status == DictConst.ToBeStartedEnCode || a.mo_task_status == DictConst.MoStatusPauseCode || a.mo_task_status == DictConst.ComplatedEnCode || a.mo_task_status == DictConst.InProgressEnCode) )
                 .WhereIF(!string.IsNullOrEmpty(mo_task_code),a=>a.mo_task_code.Contains(mo_task_code))
                 //.WhereIF(!string.IsNullOrEmpty(mo_task_status),a=>a.mo_task_status==mo_task_status)
                 .WhereIF(statusList.Count>0,a=>statusList.Contains(a.mo_task_status))
                 .WhereIF(status=="3" && start_time!=null,a=>a.act_end_date>=start_time)
                 .WhereIF(status=="3" && end_time!=null,a=>a.act_end_date<=end_time)
-                .Select((a, b, c, d, e,f,g,h,i,j,k) => new PADPackageTaskPageOutput
+                .Select((a, b, c, d, e,f,g,h,i,j,k,l) => new PADPackageTaskPageOutput
                 {
                     id = a.id,
                     mo_task_code = a.mo_task_code,
@@ -448,6 +449,8 @@ namespace Tnb.ProductionMgr
                     minpacking = b.minpacking,
                     main_num = k.number_of_primary_unit,
                     deputy_num = k.number_of_auxiliary_unit,
+                    third_equip_code = f.third_equip_code,
+                    weight_name = l.label_name
                 })
                 .MergeTable()
                 .OrderBy($"{input.sidx} {input.sort}")