From 755fd97ef06ffab3d0c1570282e72656dff9b242 Mon Sep 17 00:00:00 2001
From: chenwenkai <1084072318@qq.com>
Date: Thu, 7 Nov 2024 17:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/PrdManage/PrdInstockRecordUpListOutPut.cs    |  2 ++
 .../Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs | 12 ++++++++----
 .../Tnb.WarehouseMgr/WmsPDACarryBindService.cs       |  2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs
index 41e92b1a..ed30be2b 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs
@@ -10,6 +10,8 @@ namespace Tnb.ProductionMgr.Entities.Dto
         public string workstation_id { get; set; }
         public string workline_id { get; set; }
         public string act_start_date { get; set; }
+
+        public string eqp_code { get; set; }
         /// <summary>
         /// 创建时间（入库时间）
         /// </summary>
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs
index 8a4e066e..77524018 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs
@@ -82,13 +82,14 @@ namespace Tnb.ProductionMgr
                 .LeftJoin<PrdMo>((a, b, c, d) => a.mo_id == d.id)
                 .LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => e.DictionaryTypeId == DictConst.PrdTaskStatusTypeId && a.mo_task_status == e.EnCode)
                 .LeftJoin<OrganizeEntity>((a, b, c, d, e, f) => a.workline_id == f.Id)
+                .LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>a.eqp_id==g.id)
                 .WhereIF(!string.IsNullOrEmpty(mo_task_code), a => a.mo_task_code.Contains(mo_task_code))
                 .WhereIF(!string.IsNullOrEmpty(mo_code), (a, b, c, d, e) => d.mo_code.Contains(mo_code))
                 .WhereIF(!string.IsNullOrEmpty(mo_type),(a,b,c,d,e)=>d.mo_type==mo_type)
                 .WhereIF(!string.IsNullOrEmpty(name),(a,b,c,d,e)=>b.name.Contains(name))
                 .Where(a => a.act_start_date != null)
                 .OrderBy($"{input.sidx} {input.sort}")
-                .Select((a, b, c, d, e, f) => new PrdInstockRecordUpListOutPut()
+                .Select((a, b, c, d, e, f,g) => new PrdInstockRecordUpListOutPut()
                 {
                     id = a.id,
                     mo_task_code = a.mo_task_code,
@@ -97,18 +98,21 @@ namespace Tnb.ProductionMgr
                     workstation_id = c.FullName,
                     mo_task_status = e.FullName,
                     workline_id = f.FullName,
+                    eqp_code=g.code,
                     act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
                     create_time = a.create_time.HasValue ? a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                     tablefield102 = SqlFunc.Subqueryable<PrdInstockH>()
                         .LeftJoin<UserEntity>((x, y) => x.create_id == y.Id)
                         .LeftJoin<DictionaryDataEntity>((x, y, z) => x.bill_type == z.Id)
-                        .Where(x => x.mo_task_id == a.id).ToList((x, y, z) => new PrdInstockRecordUpListChildOutPut()
+                        .LeftJoin<WmsCarryH>((x,y,z,j)=>x.carry_code==j.id)
+                        .LeftJoin<BasLocation>((x,y,z,j,k)=>x.location_code==k.id)
+                        .Where(x => x.mo_task_id == a.id).ToList((x, y, z,j,k) => new PrdInstockRecordUpListChildOutPut()
                         {
                             id = x.id,
                             code = x.code,
                             bill_type = z.FullName,
-                            carry_code = x.carry_code,
-                            location_code = x.location_code,
+                            carry_code = j.carry_code,
+                            location_code = k.location_code,
                             create_id = y.RealName,
                             bill_date = x.bill_date == null ? "" : x.bill_date.ToString(DbTimeFormat.SS),
                         }),
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs
index 23e4931d..0474c8f2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs
@@ -340,6 +340,8 @@ namespace Tnb.WarehouseMgr
                                 bindCarryCodeInput.location_code = endLocations[0].location_code;
                                 bindCarryCodeInput.code_batch = wmsTransferInstockD.pi_code;
                                 bindCarryCodeInput.unit_id = basMaterial.unit_id;
+                                bindCarryCodeInput.material_specification = wmsTransferInstockD.material_desc;
+                                bindCarryCodeInput.container_no=basMaterial.container_no;
 
                                 await _wmsCarryService.BindCarryMaterial(bindCarryCodeInput);
                             }