diff --git a/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs b/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs index 0bf305a..e0d05d2 100644 --- a/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs +++ b/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs @@ -461,7 +461,7 @@ namespace NFine.Application.WMS string msg = ""; keyValue = keyValue.Substring(1, keyValue.Length - 2); - string sqlSeach = string.Format(@" select LotNo from dbo.ICSWareHouseLotInfoLog where TransType<>'1' and LotNo in({0}) and WorkPoint in ('{1}')", keyValue.TrimEnd(','), WorkPoint); + string sqlSeach = string.Format(@" select LotNo from dbo.ICSWareHouseLotInfoLog where BusinessCode<>'39' and LotNo in({0}) and WorkPoint in ('{1}')", keyValue.TrimEnd(','), WorkPoint); DataTable dtASN = SqlHelper.GetDataTableBySql(sqlSeach); if (dtASN != null && dtASN.Rows.Count > 0) { diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml index 2b1f006..6463d6e 100644 --- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml +++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml @@ -49,10 +49,10 @@ sortorder: "desc", viewrecords: true, multiselect: true, - beforeSelectRow: function (rowid, e) { - $("#gridList").jqGrid('resetSelection'); - return (true); - }, + //beforeSelectRow: function (rowid, e) { + // $("#gridList").jqGrid('resetSelection'); + // return (true); + //}, }); $("#warehouse a.btn-default").click(function () {