Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@@ -121,7 +121,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
 					                
                            a.ApplyCode as Code,CONVERT(varchar(100),a.CreateDateTime,23) as MTIME,a.createperson as MUSER,a.WHCode,detail.LocationCode AS Area,
                            a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
-                           a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
+                           a.ReceiverNumber,case when  a.MUSERName = 'JOB' then a.ReceiverName else n.F_RealName end  as ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
 					       case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan	,
                            g.Status, ISNULL(p.PrintCount, 0) as PrintCount,
                            case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,
@@ -135,6 +135,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
                       LEFT JOIN ICSPrintCount p ON	a.APPlyCode=p.TransCode
                       LEFT JOIN ICSInventoryDetail detail ON b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint 
 					  left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
+                      left join Sys_SRM_User n ON n.F_Account=a.MUSERName
 	                  left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint
 									  left join (SELECT ApplyCode,
 																 case when sum(Quantity) =sum(IssueQuantity)  and MUSERName != 'JOB' then '已过账' 
@@ -186,7 +187,7 @@ left join Sys_SRM_ItemsDetail j on  j.F_Define3='HGAreaConfig' AND j.F_Define1=a
                                f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,g.Status,
 															 
 															 a.WHCode,detail.LocationCode,a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
-                           a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,a.MUSERName,a.MUSER,p.PrintCount) as t where t.row=1");
+                           a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,a.MUSERName,a.MUSER,p.PrintCount,n.F_RealName) as t where t.row=1");
 
             if (!string.IsNullOrWhiteSpace(queryParam["Status"].ToString()))
             {