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

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

@@ -11,7 +11,7 @@
     var flag = '1';
     var mark = '拣料';
     var Arguments = '';
-    $.ajaxSettings.async = false;//设置全局同步
+  //  $.ajaxSettings.async = false;//设置全局同步
     //var PickID = '';
     $(function () {
 
@@ -112,6 +112,9 @@
         //cols.push(collast);
         var collast = { label: '占料状态', name: 'IsOccupy', width: 80, align: 'left' };
         cols.push(collast);
+        var collast = { label: '单据状态', hidden: true, };
+        cols.push(collast);
+
         var cols1 = new Array();
         var collast1 = { label: "主键", name: "ID", hidden: true, key: true };
         cols1.push(collast1);
@@ -141,6 +144,7 @@
         cols1.push(collast1);
         var collast1 = { label: '占料数量', name: 'SendQTY', hidden: true };
         cols1.push(collast1);
+
         if (Type != 7) {
             var collast = { label: '销售凭证', name: 'ProjectCode', width: 100, align: 'left' };
             cols.push(collast);
@@ -607,6 +611,7 @@
     function btnMaterial() {
         debugger;
         //var ISFlag = false;
+        var Type = $("#selShow").val();
         $("#PickID").val('');
         var sign = '';
         var objCode = '';
@@ -628,6 +633,18 @@
                 $.modalAlertNew("WMS00091");
                 return;
             }
+            if (Type != "2") {
+                if (rowData.Status == "已过帐") {
+                    $.modalAlert("单据已过账，无法拣料！", "warning");
+                    return;
+                }
+            }
+            if (Type == "2") {
+                if (rowData.Status != "未配料") {
+                    $.modalAlert("该单据未配料，无法拣料！", "warning");
+                    return;
+                }
+            }
             PickIDs += "'" + rowId + "',";
             if (rowData.Code!=undefined) {
                 objCode += "'" + rowData.Code + "',";