diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index 3903476..ae58dcd 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -1603,7 +1603,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; GROUP BY c.MOCode,a.InvCode,b.InvName,b.InvStd,b.InvUnit,a.WhCode,a.ExtensionID"; #endregion } - if (Type == "2") + if (Type == "2"||Type=="12") { sqls = @"select a.ApplyCode as Code, a.InvCode, b.InvName, b.InvStd, b.InvUnit, SUM(ISNULL(a.Quantity, 0)) AS iQuantity, a.WhCode,a.ExtensionID @@ -2374,7 +2374,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; GROUP BY c.MOCode,a.InvCode,b.InvName,b.InvStd,b.InvUnit,a.WhCode,x.MergeID,a.ExtensionID"; #endregion } - if (Type == "2") + if (Type == "2" || Type=="12") { #region 工单领料SQL sqls = @" select