新增客户名称、分页显示

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

@@ -298,7 +298,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,
-					       case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan	,
+					       case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan,a.CustomerName,a.Pagination,
                        g.Status,ISNULL(p.PrintCount, 0) as PrintCount,
       case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,
                            f.ProjectCode	,f.BatchCode	,f.Version	,f.Brand	,f.cFree1	,f.cFree2	,f.cFree3	,
@@ -361,7 +361,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
                                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,a.CustomerName,a.Pagination) as t where t.row=1");
 
             if (!string.IsNullOrWhiteSpace(queryParam["Status"].ToString()))
             {

WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@@ -154,7 +154,12 @@
         cols1.push(collast1);
         var collast1 = { label: '占料数量', name: 'SendQTY', hidden: true };
         cols1.push(collast1);
-
+        if (Type == 12) {
+            var collast = { label: '客户名称', name: 'CustomerName', width: 100, align: 'left' };
+            cols.push(collast);
+            var collast = { label: '分页', name: 'Pagination', width: 100, align: 'left' };
+            cols.push(collast);
+        }
         if (Type != 7) {
             var collast = { label: '销售凭证', name: 'ProjectCode', width: 100, align: 'left' };
             cols.push(collast);