diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 13315a9..41c7e48 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -4245,6 +4245,7 @@ case when k.TransCode is null then '未占料' else '已占料' end as IsOccupy
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
 from ICSMO k 
 inner join ICSMOPick d on  d.MODetailID=k.MODetailID and d.WorkPoint=k.WorkPoint
 left join ICSMOPickMerge e on d.ID=e.SourceID and k.WorkPoint=e.WorkPoint
@@ -4266,6 +4267,7 @@ where  k.MOStatus<>'3' and k.MOCode='{0}' and a.WorkPoint='{1}'";
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
 from ICSMO k 
 inner join ICSMOPick d on  d.MODetailID=k.MODetailID and d.WorkPoint=k.WorkPoint
 left join ICSMOPickMerge e on d.ID=e.SourceID and k.WorkPoint=e.WorkPoint
@@ -4337,6 +4339,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
     from ICSMOApply k
 left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.ApplyCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4484,6 +4487,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
    	from ICSOOPick k 
 inner join ICSOutsourcingOrder d on k.OODetailID=d.OODetailID and k.WorkPoint=d.WorkPoint
 left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
@@ -4555,6 +4559,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
       from ICSOApply k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.ApplyCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4626,6 +4631,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
       from ICSOIssue k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.IssueCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4696,6 +4702,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
      from ICSSDN k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.SDNCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4765,6 +4772,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
       from ICSOtherOut k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint 
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.OutCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4835,6 +4843,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
         from ICSBrrow k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.BrrowCode and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4904,6 +4913,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
         from ICSTransfer k
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
 inner join ICSWareHouseLotInfoLog a on a.TransCode=k.TransferNO and k.Sequence=a.TransSequence and a.TransType='15' and a.WorkPoint=k.WorkPoint
@@ -4975,6 +4985,7 @@ where isnull(k.TransCode,'')<>'' and a.WorkPoint='{0}' and a.Status='2'";
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = @"select isnull(e.MergeID,'') as MergeID,a.TransCode as Code,a.TransSequence as Sequence,a.InvCode as InvCode, b.InvName as InvName,b.InvStd as InvStd,b.InvUnit as InvSInvUnittd,a.Quantity as iQuantity,
 a.FromWarehouseCode as WarehouseCode,a.FromLocationCode as LocationCode,a.LotNO,a.MTIME,c.Quantity as QTY
+,case when b.AmountEnable='1' then a.Quantity/isnull(b.EATTRIBUTE1,1) else a.Quantity end as YFNum
       FROM ICSOtherOut k
             INNER JOIN ICSTransfer tra ON k.TransferDetailID=tra.TransferDetailID AND k.WorkPoint=tra.WorkPoint
 							left join ICSMOPickMerge e on k.ID=e.SourceID and k.WorkPoint=e.WorkPoint
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMergeSeach.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMergeSeach.cshtml
index 53fda72..a5eb68a 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMergeSeach.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMergeSeach.cshtml
@@ -82,7 +82,9 @@
                 cols2.push(collast2);
                 var collast2 = { label: '料品单位', name: 'InvSInvUnittd', width: 150, align: 'left' };
                 cols2.push(collast2);
-                var collast2 = { label: '应发数量', name: 'iQuantity', width: 100, align: 'left' };
+                var collast2 = { label: '应发重量', name: 'iQuantity', width: 100, align: 'left' };
+                cols2.push(collast2);
+                var collast2 = { label: '应发数量', name: 'YFNum', width: 100, align: 'left' };
                 cols2.push(collast2);
                 //var collast2 = { label: '库存数量', name: 'QTY', width: 100, align: 'left' };
                 //cols2.push(collast2);