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

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

@@ -1133,7 +1133,7 @@ f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,
                             end as IsNew,
   case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,
                             case when sum(a.Quantity)=sum(a.TransferQuantity) then '已过帐'
-							when sum(a.Quantity)!=sum(a.TransferQuantity) and a.TransferQuantity>0 then '已配料'
+							when sum(a.Quantity)!=sum(a.TransferQuantity) and sum(a.TransferQuantity)>0 then '已配料'
 							else '未配料' END AS Status,
 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

WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@@ -11,6 +11,7 @@
     var flag = '1';
     var mark = '拣料';
     var Arguments = '';
+    $.ajaxSettings.async = false;//设置全局同步
     //var PickID = '';
     $(function () {
 
@@ -199,7 +200,6 @@
     }
 
     function gridList() {
-      
         var Type = $("#selShow").val();
     
         var $gridList = $("#gridList");