From 95ecfd18149a9875b1f30e18a2ec83004b22a01f Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Thu, 2 Nov 2023 11:45:44 +0800
Subject: [PATCH] 1

---
 .../Entity/EqpEquipment.cs                     |  5 +++++
 .../Dto/PrdManage/PADPackageTaskPageOutput.cs  | 18 ++++++++++++++++++
 .../Dto/PrdManage/PrdReportCrInput.cs          |  5 +++++
 .../Entity/PrdReport.cs                        |  5 +++++
 .../Tnb.ProductionMgr/PrdPackReportService.cs  |  7 ++++++-
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
index aeb2e3b9..c94ec696 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
@@ -207,5 +207,10 @@ public partial class EqpEquipment : BaseEntity<string>
     /// 二维码
     /// </summary>
     public string? qrcode { get; set; }
+    
+    /// <summary>
+    /// 挤出件类型
+    /// </summary>
+    public string? tube { get; set; }
 
 }
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs
index 0c618be8..a0365f28 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs
@@ -126,5 +126,23 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// 实际完工日期
         /// </summary>
         public string? act_end_date { get; set; }
+        /// <summary>
+        /// 挤出件类型
+        /// </summary>
+        public string? tube { get; set; }
+        /// <summary>
+        /// 最小包装
+        /// </summary>
+        public decimal? minpacking { get; set; }
+        
+        /// <summary>
+        /// 主单位数量
+        /// </summary>
+        public string? main_num { get; set; }
+        
+        /// <summary>
+        /// 副单位数量（kg）
+        /// </summary>
+        public string? deputy_num { get; set; }
     }
 }
\ No newline at end of file
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs
index cfc83410..1009a132 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs
@@ -103,6 +103,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// 工位
         /// </summary>
         public string? station { get; set; }
+        
+        /// <summary>
+        /// 料箱二维码
+        /// </summary>
+        public string material_box_qrcode { get; set; }
 
     }
 }
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs
index f6a573a3..d1980bec 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs
@@ -124,5 +124,10 @@ public partial class PrdReport : BaseEntity<string>
     /// 工序id
     /// </summary>
     public string? process_id { get; set; }
+    
+    /// <summary>
+    /// 料箱二维码
+    /// </summary>
+    public string material_box_qrcode { get; set; }
 
 }
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
index 1bc6d536..d975fe21 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
@@ -400,13 +400,14 @@ namespace Tnb.ProductionMgr
                 .LeftJoin<PerProcessStandardsH>((a,b,c,d,e,f,g,h)=>a.material_id==h.output_material_id && a.eqp_id==h.equip_id && a.mold_id==h.molds_id && h.enabled==1)
                 .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")
                 .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) => new PADPackageTaskPageOutput
+                .Select((a, b, c, d, e,f,g,h,i,j,k) => new PADPackageTaskPageOutput
                 {
                     id = a.id,
                     mo_task_code = a.mo_task_code,
@@ -443,6 +444,10 @@ namespace Tnb.ProductionMgr
                     act_start_date = a.act_start_date==null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
                     act_end_date = a.act_end_date==null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
                     plan_end_date = a.plan_end_date==null ? "" : a.plan_end_date.Value.ToString(DbTimeFormat.SS),
+                    tube = f.tube,
+                    minpacking = b.minpacking,
+                    main_num = k.number_of_primary_unit,
+                    deputy_num = k.number_of_auxiliary_unit,
                 })
                 .MergeTable()
                 .OrderBy($"{input.sidx} {input.sort}")