Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

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

@@ -1297,6 +1297,10 @@ where a.Status='1' and a.Type='1'";
                 {
                     sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' ";
                 }
+                if (!string.IsNullOrWhiteSpace(queryParam["WHCode"].ToString()))
+                {
+                    sql += " and a.WHCode like '%" + queryParam["WHCode"].ToString() + "%' ";
+                }
                 if (!string.IsNullOrWhiteSpace(queryParam["Container"].ToString()))
                 {
                     if (queryParam["Container"].ToString() == "1")

WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml

@@ -1932,6 +1932,7 @@
             InvCode: $("#txt_InvCode").val(),
             InvName: $("#txt_InvName").val(),
             BatchCode: $("#txt_BatchCode").val(),
+            WHCode: $("#txt_Location").val(),
             Container: $("#txt_Container :checked").val(),
         }
         $gridList.dataGrid({
@@ -2007,6 +2008,7 @@
                 InvCode: $("#txt_InvCode").val(),
                 InvName: $("#txt_InvName").val(),
                 BatchCode: $("#txt_BatchCode").val(),
+                WHCode: $("#txt_Location").val(),
                 Container: $("#txt_Container :checked").val(),
             }
             $gridList.jqGrid('setGridParam', {