From 2dac720187c6baf4df711c1c855accf59ebf853d Mon Sep 17 00:00:00 2001 From: lilili Date: Sun, 23 Apr 2023 10:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=A3=E6=96=99=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NFine.Application/WMS/PickMaterialApp.cs | 189 +++++++++++++++--- .../WMS/WMSCreateItemLotApp.cs | 44 +++- .../WMS/Controllers/PickMaterialController.cs | 12 +- .../Views/PickMaterial/ICSMOPickMerge.cshtml | 44 +++- .../WMSCreateItemLot/CreateItemLot.cshtml | 95 +++++++-- 5 files changed, 322 insertions(+), 62 deletions(-) diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index bce30d4..ef5e490 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -117,11 +117,12 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'"; sqlString.Append($@" SELECT * from (select row_number() over(partition by a.ApplyCode ORDER BY a.ApplyCode) as row, - a.ApplyCode as Code,a.CreateDateTime as MTIME,a.createperson as MUSER, + a.ApplyCode as Code,a.CreateDateTime as MTIME,a.createperson as MUSER,a.WHCode,b.EATTRIBUTE1 AS Area, case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan , f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 , f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 from ICSMOApply a + left JOIN ICSInventory b ON b.InvCode=a.InvCode left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint where a.WorkPoint='{WorkPoint}' "); @@ -135,10 +136,19 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'"; { sqlString.Append($@" and a.InvCode like '%{queryParam["InvCode"]}%' "); } + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sqlString.Append($@" and a.WHCode like '%{queryParam["WHCode"]}%' "); + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sqlString.Append($@" and b.EATTRIBUTE1 like '%{queryParam["Area"]}%' "); + } + } sqlString.Append(@" group by a.ApplyCode, a.WorkPoint,a.CreateDateTime,a.createperson, f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,f.cFree2, - f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10) as t where t.row=1"); + f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,a.WHCode,b.EATTRIBUTE1) as t where t.row=1"); #endregion @@ -146,22 +156,39 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'"; } //工单领料(发料申请)子表查询 - public DataTable GetSubGridJson2(string Code) + public DataTable GetSubGridJson2(string queryJson, string Code) { string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; DataTable dt = new DataTable(); - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); List parameter = new List(); - string sql = @"select a.ID,a.ApplyCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName ,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, + string sql = @"SELECT * FROM (select row_number() over(partition by a.ApplyCode,a.InvCode,a.Sequence ORDER BY a.ApplyCode) as row, + a.ID,a.ApplyCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName ,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit,d.EATTRIBUTE1 AS Area, case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity -,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 -,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.IssueQuantity as IssueQuantity + ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 + ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.IssueQuantity as IssueQuantity from ICSMOApply a left join ICSWarehouse b on a.WHCode=b.WarehouseCode and a.WorkPoint=b.WorkPoint left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint where a.ApplyCode='{0}' and a.WorkPoint='{1}'"; + if (!string.IsNullOrWhiteSpace(queryJson)) + { + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["WHCode"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and d.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) + { + sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; + } + } + sql += " ) c WHERE c.row=1 "; sql = string.Format(sql, Code, WorkPoint); return Repository().FindTableBySql(sql.ToString()); } @@ -329,6 +356,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; from ICSOApply a left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint left join ICSExtension f on a.ExtensionID = f.ID and a.WorkPoint = f.WorkPoint + left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint where a.WorkPoint = '{WorkPoint}'"); if (!string.IsNullOrWhiteSpace(queryJson)) { @@ -340,6 +368,15 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; { sqlString.Append($@" and a.InvCode like '%{queryParam["InvCode"]}%' "); } + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sqlString.Append($@" and a.WHCode like '%{queryParam["WHCode"]}%' "); + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sqlString.Append($@" and d.EATTRIBUTE1 like '%{queryParam["Area"]}%' "); + } + } sqlString.Append(@"group by a.ApplyCode,a.CreateDateTime,a.CreatePerson,f.Colspan,f.ProjectCode, f.BatchCode,f.Version,f.Brand,f.cFree1,f.cFree2,f.cFree3,f.cFree4,f.cFree5, @@ -350,22 +387,37 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; } //委外领料(委外发料申请)子表查询 - public DataTable GetSubGridJson5(string Code) + public DataTable GetSubGridJson5(string Code,string queryJson) { string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; DataTable dt = new DataTable(); - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); List parameter = new List(); string sql = @"select a.ID,a.ApplyCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, - case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity -,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 -,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.IssueQuantity as IssueQuantity + case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity,d.EATTRIBUTE1 AS Area, + f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 + ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.IssueQuantity as IssueQuantity from ICSOApply a left join ICSWarehouse b on a.WHCode=b.WarehouseCode and a.WorkPoint=b.WorkPoint left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint - left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint + left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint where a.ApplyCode='{0}' and a.WorkPoint='{1}'"; + if (!string.IsNullOrWhiteSpace(queryJson)) + { + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["WHCode"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and d.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) + { + sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; + } + } sql = string.Format(sql, Code, WorkPoint); return Repository().FindTableBySql(sql.ToString()); } @@ -477,6 +529,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; FROM ICSSDN a LEFT JOIN ICSMOPickMerge e ON a.ID = e.SourceID AND a.WorkPoint = e.WorkPoint LEFT JOIN ICSExtension f ON a.ExtensionID = f.ID AND a.WorkPoint = f.WorkPoint + LEFT JOIN ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint WHERE a.WorkPoint = '{WorkPoint}' "); if (!string.IsNullOrWhiteSpace(queryJson)) { @@ -488,6 +541,15 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; { sqlString.Append($" and a.InvCode like '%{queryParam["InvCode"]}%' "); } + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sqlString.Append($@" and a.WHCode like '%{queryParam["WHCode"]}%' "); + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sqlString.Append($@" and d.EATTRIBUTE1 like '%{queryParam["Area"]}%' "); + } + } sqlString.Append(@"GROUP BY a.SDNCode, a.CreateDateTime, a.CreatePerson, f.Colspan, f.ProjectCode, f.BatchCode, f.Version, f.Brand, f.cFree1, f.cFree2, f.cFree3, f.cFree4, f.cFree5, f.cFree6, f.cFree7, f.cFree8, f.cFree9, f.cFree10) t WHERE t.r=1"); @@ -496,22 +558,37 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; } //销售发货(销售发货)子表查询 - public DataTable GetSubGridJson7(string Code) + public DataTable GetSubGridJson7(string Code,string queryJson) { string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; DataTable dt = new DataTable(); - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); List parameter = new List(); string sql = @"select a.ID,a.SDNCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, - case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity -,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 -,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.SDNQuantity as IssueQuantity + case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity,d.EATTRIBUTE1 AS Area + ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 + ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.SDNQuantity as IssueQuantity from ICSSDN a left join ICSWarehouse b on a.WHCode=b.WarehouseCode and a.WorkPoint=b.WorkPoint left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint - left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint - where a.SDNCode='{0}' and a.WorkPoint='{1}'"; + left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint + where a.SDNCode='{0}' and a.WorkPoint='{1}'"; + if (!string.IsNullOrWhiteSpace(queryJson)) + { + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["WHCode"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and d.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) + { + sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; + } + } sql = string.Format(sql, Code, WorkPoint); return Repository().FindTableBySql(sql.ToString()); } @@ -545,6 +622,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; from ICSOtherOut a left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint left join ICSExtension f on a.ExtensionID = f.ID and a.WorkPoint = f.WorkPoint + left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint where a.WorkPoint = '{WorkPoint}'"); #endregion @@ -558,6 +636,15 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; { sqlString.Append($@" and a.InvCode like '%{queryParam["InvCode"]}%' "); } + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sqlString.Append($@" and a.WHCode like '%{queryParam["WHCode"]}%' "); + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sqlString.Append($@" and d.EATTRIBUTE1 like '%{queryParam["Area"]}%' "); + } + } sqlString.Append(@" group by a.OutCode,a.CreateDateTime,a.CreatePerson,f.Colspan,f.ProjectCode,f.BatchCode, f.Version,f.Brand,f.cFree1,f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6, @@ -567,14 +654,14 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; } //其它出库(其它出库)子表查询 - public DataTable GetSubGridJson8(string Code) + public DataTable GetSubGridJson8(string Code, string queryJson) { string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; DataTable dt = new DataTable(); - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); List parameter = new List(); string sql = @"select a.ID,a.OutCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, - case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity + case when e.SourceID is null then '未合并' else '已合并' end as IsNew,d.EATTRIBUTE1 AS Area,a.Quantity ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.OutQuantity as IssueQuantity from ICSOtherOut a @@ -583,6 +670,21 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint where a.OutCode='{0}' and a.WorkPoint='{1}'"; + if (!string.IsNullOrWhiteSpace(queryJson)) + { + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["WHCode"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and d.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) + { + sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; + } + } sql = string.Format(sql, Code, WorkPoint); return Repository().FindTableBySql(sql.ToString()); } @@ -688,17 +790,27 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; from ICSTransfer a left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint left join ICSExtension f on a.ExtensionID = f.ID and a.WorkPoint = f.WorkPoint + left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint where a.WorkPoint = '{WorkPoint}' and a.Status = '2'"); if (!string.IsNullOrWhiteSpace(queryJson)) { if (!string.IsNullOrWhiteSpace(queryParam["POCode"].ToString())) { - sqlString.Append($@" and a.BrrowCode like '%{queryParam["POCode"]}%' "); + sqlString.Append($@" and a.TransferNO like '%{queryParam["POCode"]}%' "); } if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) { sqlString.Append($@" and a.InvCode like '%{queryParam["InvCode"]}%' "); } + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sqlString.Append($@" and a.ToWarehouseCode like '%{queryParam["WHCode"]}%' "); + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sqlString.Append($@" and d.EATTRIBUTE1 like '%{queryParam["Area"]}%' "); + } + } sqlString.Append(@"group by a.TransferNO,a.CreateDateTime,a.CreatePerson,f.Colspan,f.ProjectCode, f.BatchCode,f.Version,f.Brand,f.cFree1,f.cFree2,f.cFree3,f.cFree4, @@ -708,22 +820,39 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; return Repository().FindTablePageBySql(sqlString.ToString(), parameter.ToArray(), ref jqgridparam); } //物料调拨子表查询 - public DataTable GetSubGridJson10(string Code) + public DataTable GetSubGridJson10(string Code, string queryJson) { string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; DataTable dt = new DataTable(); - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); List parameter = new List(); - string sql = @"select a.ID,a.TransferNO as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.FromWarehouseCode as WHCode,b.WarehouseName,a.InvCode,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, + string sql = @"SELECT * from (select row_number() over(partition by a.TransferNO,a.InvCode,a.Sequence ORDER BY a.TransferNO) as row, a.ID,a.TransferNO as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.FromWarehouseCode as WHCode,b.WarehouseName,d.EATTRIBUTE1 AS Area, + a.InvCode,a.ToWarehouseCode,a.EATTRIBUTE1 AS ReceiveWork,d.InvName,d.InvDesc,d.InvStd,d.InvUnit, case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity -,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 -,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.TransferQuantity as IssueQuantity + ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 + ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,a.TransferQuantity as IssueQuantity from ICSTransfer a left join ICSWarehouse b on a.FromWarehouseCode=b.WarehouseCode and a.WorkPoint=b.WorkPoint left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint where a.TransferNO='{0}' and b.WorkPoint='{1}'"; + if (!string.IsNullOrWhiteSpace(queryJson)) + { + if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString())) + { + sql += " and a.ToWarehouseCode like '%" + queryParam["WHCode"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and d.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["InvCode"].ToString())) + { + sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; + } + } + sql += " ) as t where t.row=1"; sql = string.Format(sql, Code, WorkPoint); return Repository().FindTableBySql(sql.ToString()); } @@ -1775,7 +1904,7 @@ a.ExtensionID GROUP BY a.TransferNO,a.InvCode,b.InvName,b.InvStd,b.InvUnit,a.FromWarehouseCode,a.ExtensionID,x.MergeID"; #endregion } - if (Type == "10") + if (Type == "11") { #region 两步调出 sqls = @"select diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs index 7098260..a7f2d4b 100644 --- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs +++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs @@ -570,7 +570,7 @@ CAST( (a.Quantity-ISNULL(c.LOTQTY,0)) as DECIMAL(18,{0})) as thisCreateQty,isnu object Figure = GetDecimalDigits(); #region [SQL] - string sql = @" select a.ID,a.SDNCode,a.Sequence,a.SOCode,a.SOSequence,a.CusCode,a.CusName,a.Type,a.ArriveDate,a.InvCode,b.InvName,b.InvDesc,b.InvStd,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity + string sql = @" select a.ID,a.SDNCode,a.Sequence,a.SOCode,a.SOSequence,a.CusCode,a.CusName,a.Type,a.ArriveDate,a.InvCode,a.WHCode,b.EATTRIBUTE1 AS Area,b.InvName,b.InvDesc,b.InvStd,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,cast(a.Amount as decimal(18,{0})) as Amount, CAST(a.SDNQuantity AS DECIMAL(18,{0})) as SDNQuantity ,a.Status,a.ExtensionID,a.CreatePerson,a.CreateDateTime ,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 @@ -606,6 +606,15 @@ where a.Type='2'"; { sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' "; } + if (!string.IsNullOrWhiteSpace(queryParam["Location"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["Location"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and b.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + } if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin") @@ -724,7 +733,7 @@ insert into ICSInventoryLot List parameter = new List(); object Figure = GetDecimalDigits(); #region [SQL] - string sql = @" select a.ID,a.InCode,a.Sequence,a.WHCode,a.InvCode, b.InvName,b.InvStd,b.InvDesc,b.InvUnit, + string sql = @" select a.ID,a.InCode,a.Sequence,a.WHCode,a.InvCode,b.EATTRIBUTE1 AS Area, b.InvName,b.InvStd,b.InvDesc,b.InvUnit, CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity,CAST(a.Amount AS DECIMAL(18,{0})) as Amount, CAST(a.InQuantity AS DECIMAL(18,{0})) as InQuantity,a.CreatePerson,a.CreateDateTime,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 @@ -760,6 +769,15 @@ where a.Status='1'"; { sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' "; } + if (!string.IsNullOrWhiteSpace(queryParam["Location"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["Location"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and b.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } + } if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin") { @@ -877,7 +895,7 @@ insert into ICSInventoryLot List parameter = new List(); object Figure = GetDecimalDigits(); #region [SQL] - string sql = @"select a.ID,a.ReturnCode,a.Sequence,a.WHCode,a.InvCode, b.InvName,b.InvStd,b.InvDesc,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount, CAST(a.ReturnQuantity AS DECIMAL(18,{0})) as ReturnQuantity,a.CreatePerson,a.CreateDateTime,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY + string sql = @"select a.ID,a.ReturnCode,a.Sequence,a.WHCode,a.InvCode,b.EATTRIBUTE1 AS Area, b.InvName,b.InvStd,b.InvDesc,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount, CAST(a.ReturnQuantity AS DECIMAL(18,{0})) as ReturnQuantity,a.CreatePerson,a.CreateDateTime,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 from ICSReturn a left join ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint @@ -906,6 +924,10 @@ where a.Status='2'"; { sql += " and b.InvName like '%" + queryParam["InvName"].ToString() + "%' "; } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and b.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } if (!string.IsNullOrWhiteSpace(queryParam["BatchCode"].ToString())) { sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' "; @@ -1008,7 +1030,7 @@ where a.DNType='1' and a.Status='2' and a.ASNCode is null List parameter = new List(); object Figure = GetDecimalDigits(); #region [SQL] - string sql = @"select a.ID, d.OOCode,d.Sequence as OOSequence,a.ODNCode,a.Sequence,a.VenCode,e.VenName,a.InvCode, b.InvName,b.InvStd,b.InvDesc,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.RCVQuantity AS DECIMAL(18,{0})) as RCVQuantity,CAST(a.UnitPrice AS DECIMAL(18,{0})) as UnitPrice,a.Currency,a.CreatePerson,a.CreateDateTime, + string sql = @"select a.ID, d.OOCode,d.Sequence as OOSequence,a.ODNCode,a.Sequence,a.VenCode,e.VenName,a.InvCode, b.InvName,b.InvStd,b.InvDesc,b.InvUnit,b.EATTRIBUTE1 AS Area,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.RCVQuantity AS DECIMAL(18,{0})) as RCVQuantity,CAST(a.UnitPrice AS DECIMAL(18,{0})) as UnitPrice,a.Currency,a.CreatePerson,a.CreateDateTime, CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 @@ -1045,6 +1067,10 @@ where a.ODNType='1' and a.Status='2' and a.OASNCode is null"; { sql += " and a.InvCode like '%" + queryParam["InvCode"].ToString() + "%' "; } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and b.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } if (!string.IsNullOrWhiteSpace(queryParam["InvName"].ToString())) { sql += " and b.InvName like '%" + queryParam["InvName"].ToString() + "%' "; @@ -1706,7 +1732,7 @@ where a.DNType='3' and a.Status='2' and a.EATTRIBUTE1 is NOT null string sql = @"select a.ID,a.ApplyNegCode,a.Sequence,a.SourceDetailID,a.InvCode,b.InvName,b.InvDesc,b.InvStd,b.InvUnit, CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.IssueNegQuantity AS DECIMAL(18,{0})) as IssueNegQuantity ,a.ExtensionID,a.MUSERName,a.MTIME ,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY - ,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 + ,a.WHCode,b.EATTRIBUTE1 AS Area,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10 from ICSMOApplyNegDetail a left join ICSMOApplyNeg d on a.ApplyNegCode=d.ApplyNegCode and a.WorkPoint=d.WorkPoint @@ -1741,6 +1767,14 @@ where a.DNType='3' and a.Status='2' and a.EATTRIBUTE1 is NOT null { sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' "; } + if (!string.IsNullOrWhiteSpace(queryParam["Location"].ToString())) + { + sql += " and a.WHCode like '%" + queryParam["Location"].ToString() + "%' "; + } + if (!string.IsNullOrWhiteSpace(queryParam["Area"].ToString())) + { + sql += " and b.EATTRIBUTE1 like '%" + queryParam["Area"].ToString() + "%' "; + } } if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin") { diff --git a/WMS-BS/NFine.Web/Areas/WMS/Controllers/PickMaterialController.cs b/WMS-BS/NFine.Web/Areas/WMS/Controllers/PickMaterialController.cs index d2fea56..05fc09a 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Controllers/PickMaterialController.cs +++ b/WMS-BS/NFine.Web/Areas/WMS/Controllers/PickMaterialController.cs @@ -87,19 +87,19 @@ namespace NFine.Web.Areas.WMS.Controllers //子表查询 [HttpGet] [HandlerAjaxOnly] - public ActionResult GetSubGridJson(string Code,string Type) + public ActionResult GetSubGridJson(string Code, string queryJson, string Type) { DataTable ListData = new DataTable(); if (Type=="1"){ListData = App.GetSubGridJson1(Code); }//工单 - if (Type=="2"){ListData = App.GetSubGridJson2(Code); }//工单发料 + if (Type=="2"){ListData = App.GetSubGridJson2(queryJson,Code); }//工单发料 if (Type == "3") { ListData = App.GetSubGridJson3(Code); }//材料出库 if (Type == "4") { ListData = App.GetSubGridJson4(Code); }//委外备料 - if (Type == "5") { ListData = App.GetSubGridJson5(Code); }//委外领料 + if (Type == "5") { ListData = App.GetSubGridJson5(Code, queryJson); }//委外领料 if (Type == "6") { ListData = App.GetSubGridJson6(Code); }//委外材料出库 - if (Type == "7") { ListData = App.GetSubGridJson7(Code); }//销售发货 - if (Type == "8") { ListData = App.GetSubGridJson8(Code); }//其它出库 + if (Type == "7") { ListData = App.GetSubGridJson7(Code, queryJson); }//销售发货 + if (Type == "8") { ListData = App.GetSubGridJson8(Code, queryJson); }//其它出库 if (Type == "9") { ListData = App.GetSubGridJson9(Code); }//借用单 - if (Type == "10") { ListData = App.GetSubGridJson10(Code); }//物料调拨 + if (Type == "10") { ListData = App.GetSubGridJson10(Code, queryJson); }//物料调拨 if (Type == "11") { ListData = App.GetSubGridJson11(Code); }//两步调出 var JsonData = new { diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml index 4704506..7d8702e 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml @@ -158,6 +158,8 @@ var queryJson = { POCode: $("#txt_POCode").val(), InvCode: $("#txt_InvCode").val(), + Area: $("#txt_Area").val(), + WHCode: $("#txt_WHCode").val(), } $gridList.dataGrid({ @@ -198,6 +200,13 @@ var subgrid_table_id; subgrid_table_id = subgrid_id + "_t"; // (3)根据subgrid_id定义对应的子表格的table的id + var queryJson = { + POCode: $("#txt_POCode").val(), + InvCode: $("#txt_InvCode").val(), + Area: $("#txt_Area").val(), + WHCode: $("#txt_WHCode").val(), + } + var subgrid_pager_id; subgrid_pager_id = subgrid_id + "_pgr" // (4)根据subgrid_id定义对应的子表格的pager的id @@ -214,6 +223,8 @@ { label: '辅助描述', name: 'InvDesc', width: 100, align: 'left' }, { label: '规格型号', name: 'InvStd', width: 100, align: 'left' }, { label: '批次', name: 'BatchCode', width: 100, align: 'left' }, + { label: '区域', name: 'Area', width: 50, align: 'left' }, + { label: '仓库', name: 'WHCode', width: 50, align: 'left' }, { label: '数量', name: 'Quantity', width: 100, align: 'left' }, { label: '已发数量', name: 'IssueQuantity', width: 100, align: 'left' }, { label: '单位', name: 'InvUnit', width: 100, align: 'left' }, @@ -231,6 +242,7 @@ cellEdit: true, url: "/WMS/PickMaterial/GetSubGridJson?Code=" + Code + "&Type=" + Type + "&" + Math.random(), // (7)子表格数据对应的url，注意传入的contact.id参数 colModel: cols, + postData: { queryJson: JSON.stringify(queryJson) }, //colModel: ColModelSub, shrinkToFit: true,//宽度自适应 //multiselect: true, @@ -253,6 +265,8 @@ var queryJson = { POCode: $("#txt_POCode").val(), InvCode: $("#txt_InvCode").val(), + Area: $("#txt_Area").val(), + WHCode: $("#txt_WHCode").val(), } $gridList.jqGrid('setGridParam', { postData: { queryJson: JSON.stringify(queryJson) }, @@ -481,7 +495,7 @@ -
+
拣料 @@ -501,17 +515,17 @@
@@ -521,6 +535,22 @@
+ + ： + +
+ +
+ + + + ： + +
+ +
+ + ：
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml index 86373dd..12a21d2 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml @@ -18,6 +18,7 @@ if (Type != '9') { $(".Workorder").css('display', 'none'); } + if (Type == '1') { gridList(); } @@ -78,7 +79,7 @@ } }) - + //显示的列内容 function SetCols() { $.ajax({ url: "/Print/SelectColumnName?" + Math.random(), @@ -96,6 +97,8 @@ cols.push(collast); var collast = { label: '工单子件', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '料品编码', name: 'InvName', width: 60, align: 'left', }; @@ -124,6 +127,8 @@ cols.push(collast); var collast = { label: '来源单据ID', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 60, align: 'left', }; @@ -156,6 +161,8 @@ cols.push(collast); var collast = { label: '已入库数量', name: 'RCVQuantity', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 60, align: 'left', }; @@ -201,6 +208,10 @@ cols.push(collast); var collast = { label: '销售订单行号', name: 'SOSequence', width: 50, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 50, align: 'left' }; + cols.push(collast); + var collast = { label: '仓库', name: 'WHCode', width: 50, align: 'left' }; + cols.push(collast); var collast = { label: '客户代码', name: 'CusCode', width: 120, align: 'left' }; cols.push(collast); var collast = { label: '客户名称', name: 'CusName', width: 50, align: 'left' }; @@ -250,6 +261,10 @@ cols.push(collast); var collast = { label: '仓库编码', name: 'WHCode', width: 120, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); + var collast = { label: '仓库', name: 'WHCode', width: 50, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 50, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 120, align: 'left' }; @@ -284,6 +299,8 @@ cols.push(collast); var collast = { label: '仓库编码', name: 'WHCode', width: 120, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 50, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 120, align: 'left' }; @@ -368,6 +385,8 @@ cols.push(collast); var collast = { label: '委外采购订单行号', name: 'OOSequence', width: 50, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '供应商代码', name: 'VenCode', width: 120, align: 'left' }; cols.push(collast); var collast = { label: '供应商名称', name: 'VenName', width: 120, align: 'left' }; @@ -450,6 +469,8 @@ cols.push(collast); var collast = { label: '供应商名称', name: 'VenName', width: 120, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 50, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 120, align: 'left' }; @@ -489,6 +510,8 @@ cols.push(collast); var collast = { label: '供应商名称', name: 'VenName', width: 120, align: 'left' }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 50, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 120, align: 'left' }; @@ -526,6 +549,10 @@ cols.push(collast); var collast = { label: 'ERP子ID', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 50, align: 'left' }; + cols.push(collast); + var collast = { label: '仓库', name: 'WHCode', width: 50, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '料品编码', name: 'InvName', width: 60, align: 'left', }; @@ -555,6 +582,8 @@ cols.push(collast); var collast = { label: 'ERP子ID', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '料品编码', name: 'InvName', width: 60, align: 'left', }; @@ -584,6 +613,8 @@ cols.push(collast); var collast = { label: '来源单据ID', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 60, align: 'left', }; @@ -615,6 +646,8 @@ cols.push(collast); var collast = { label: '来源单据ID', name: 'SourceDetailID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 60, align: 'left', }; @@ -646,6 +679,8 @@ cols.push(collast); var collast = { label: '备料表ID', name: 'PickID', hidden: true, }; cols.push(collast); + var collast = { label: '区域', name: 'Area', width: 120, align: 'left' }; + cols.push(collast); var collast = { label: '料品编码', name: 'InvCode', width: 100, align: 'left' }; cols.push(collast); var collast = { label: '物料描述', name: 'InvName', width: 60, align: 'left', }; @@ -705,7 +740,7 @@ } }); } - + //生产退料 function gridList() { var $gridList = $("#gridList"); @@ -937,6 +972,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonChengPing" + "?" + Math.random(), @@ -1008,6 +1044,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -1062,6 +1099,9 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), + } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonXiaoShou" + "?" + Math.random(), @@ -1137,6 +1177,9 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), + } $gridList.jqGrid('setGridParam', { page: 1, @@ -1192,6 +1235,8 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), } $gridList.dataGrid({ @@ -1252,6 +1297,8 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), } $gridList.jqGrid('setGridParam', { @@ -1308,6 +1355,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonGuiHuan" + "?" + Math.random(), @@ -1367,6 +1415,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -1550,6 +1599,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonWWSHDH" + "?" + Math.random(), @@ -1615,6 +1665,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -1667,7 +1718,7 @@ var queryJson = { POCode: $("#txt_POCode").val(), OrderNumber: $("#txt_OrderNumber").val(), - Area: $("#txt_Area9").val(), + Area: $("#txt_Area").val(), InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), @@ -1728,7 +1779,7 @@ var queryJson = { POCode: $("#txt_POCode").val(), OrderNumber: $("#txt_OrderNumber").val(), - Area: $("#txt_Area9").val(), + Area: $("#txt_Area").val(), InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), @@ -1789,6 +1840,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonJSD" + "?" + Math.random(), @@ -1852,6 +1904,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -1909,6 +1962,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonWWJSD" + "?" + Math.random(), @@ -1972,6 +2026,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -2026,6 +2081,8 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonLLSQTL" + "?" + Math.random(), @@ -2082,6 +2139,8 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), + Location: $("#txt_Location").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -2136,6 +2195,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonCLCK" + "?" + Math.random(), @@ -2192,6 +2252,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -2246,6 +2307,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonWWLLTL" + "?" + Math.random(), @@ -2304,6 +2366,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -2358,6 +2421,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonWWCLCK" + "?" + Math.random(), @@ -2416,6 +2480,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -2473,6 +2538,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.dataGrid({ url: "/WMS/WMSCreateItemLot/GetGridJsonFGGD" + "?" + Math.random(), @@ -2531,6 +2597,7 @@ InvCode: $("#txt_InvCode").val(), InvName: $("#txt_InvName").val(), BatchCode: $("#txt_BatchCode").val(), + Area: $("#txt_Area").val(), } $gridList.jqGrid('setGridParam', { page: 1, @@ -3040,10 +3107,10 @@
- ： - -
- + ： + +
+
@@ -3054,20 +3121,20 @@
- ： + @*：
- + *@ - ： - -
- + ： + +
+