Merge branch 'master' of http://119.3.29.177:3000/lixh/WMSBase

# Conflicts:
#	WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs

WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs

@@ -801,6 +801,23 @@ where  a.ID IN (" + keyValue.TrimEnd(',') + ") and a.WorkPoint in ('" + WorkPoin
             }
         }   
         
+        //领料申请退料
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetGridJsonLLSQTL(Pagination pagination, string queryJson)
+        {
+            DataTable ListData = App.GetGridJsonLLSQTL(queryJson, ref pagination);
+            var JsonData = new
+
+            {
+                total = pagination.total,
+                page = pagination.page,
+                records = pagination.records,
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
         /// <summary>
         /// 点击生成条码查询(审核到货单)
         /// </summary>

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

@@ -15,7 +15,7 @@
     var DNCode = $.request("DNCode");
     var ODNCode = $.request("ODNCode");
     var RCVCode = $.request("RCVCode");
-    
+    var LLApplyNegCode = $.request("LLApplyNegCode");
     debugger;
     var WorkPoints = '@NFine.Code.OperatorProvider.Provider.GetCurrent().Location'
     $(function () {