diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
index f102eeb..b37212e 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -22,7 +22,7 @@
         document.getElementById("gridPanel").innerHTML = ' <span><strong>详细信息</strong></span>  <table id="gridList"></table>   ';//重置grid
         SetCols();
             gridList();
-
+           
     }
 
 
@@ -46,7 +46,7 @@
         var ct11 = document.getElementById("date4");
 
         var cols = new Array();
-        var collast = { label: "主键", name: "ID", hidden: true, key: true };
+        var collast = { label: "主键", name: "ID", hidden: true , key: true };
         cols.push(collast);
         var collast = { label: '单据号', name: 'Code', width: 120, align: 'left' };
         cols.push(collast);
@@ -56,8 +56,8 @@
         //cols.push(collast);
         //var collast = { label: '维护人名称', name: 'MUSERName', width: 80, align: 'left' };
         //cols.push(collast);
-        var collast = { label: '是否合并拣料', name: 'IsNew', width: 80, align: 'left' };
-        cols.push(collast);
+        //var collast = { label: '是否合并拣料', name: 'IsNew', width: 80, align: 'left' };
+        //cols.push(collast);
         var collast = { label: '占料状态', name: 'IsOccupy', width: 80, align: 'left' };
         cols.push(collast);
         var cols1 = new Array();
@@ -231,17 +231,30 @@
             shrinkToFit: false,//宽度自适应
             autowidth: true,
             gridComplete: function () {
-               // debugger;
-               //var PickID = $("#PickID").val();
-               // if (PickID!='') {
-               //     var PickID = PickID.split(',');
-               //     for (var i = 0; i < PickID.length; i++) {
-               //         //$("#gridList").jqGrid('setSelection', PickID[i]);
-               //         $("#gridList").jqGrid('setSelection', PickID[i]);
-                       
-               //     }
-               // }
+
+                var strIds = $("#gridList").jqGrid("getDataIDs");
+
+                for (var i = 0; i < strIds.length; i++) {
+                    var strValue = $("#gridList").jqGrid("getCell", strIds[i], "IsOccupy");//得到单元格数据
+                    if (strValue == "已占料") {
+                        $("#" + strIds[i]).find("td").css("background-color", "yellow");
+                    }
+                }
             },
+            //onLoadComplete: function(data) {
+            //    // 设置行选中
+            //    var PickID = $("#PickID").val();
+            //    if (PickID != '') {
+            //        var PickID = PickID.split(',');
+            //        for (var i = 0; i < PickID.length; i++) {
+            //            //$("#gridList").jqGrid('setSelection', PickID[i]);
+            //            // $("#gridList").jqGrid('setSelection', PickID[i]);
+            //             $('#gridList').jqGrid('setSelectionState', PickID[i], true);
+            //           // $('#gridList').jqGrid('setSelectionState', '17140e8d-5c4d-4f29-9913-5efc256f6e7f', true);
+
+            //        }
+            //    }
+            //},
             rowNum: 10000,
             autoScroll: true,
             sortname: 'Code',
@@ -580,13 +593,19 @@
     function btnMaterial() {
         debugger;
         //var ISFlag = false;
+        $("#PickID").val('');
         var sign = '';
         var objCode = '';
         var PickIDs = '';
         var arr = [];
         mark = '拣料';
         flag = '1';
+
         var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
+        if (objList.length<=0) {
+            $.modalAlert("请先选择单据！", "warning");
+            return;
+        }
         for (var i = 0; i < objList.length; i++) {
             var objArr = '';
             var rowId = objList[i];
@@ -596,8 +615,11 @@
                 return;
             }
             PickIDs += "'" + rowId + "',";
-            objCode += "'" + rowData.Code + "',";
-            objArr += "'" + rowData.Code + "',";
+            if (rowData.Code!=undefined) {
+                objCode += "'" + rowData.Code + "',";
+                objArr += "'" + rowData.Code + "',";
+            }
+          
             objArr = objArr.slice(0, objArr.length - 1);
             objArr = "" + objArr + "|";
             arr.push(objArr);
@@ -613,7 +635,7 @@
         });
         if (sign == '0') {
             //  PickID = PickIDs;
-            //$("#PickID").val(PickIDs);
+            $("#PickID").val(PickIDs);
             gridList2(flag);
         }
         if (sign == '1') {
@@ -621,7 +643,10 @@
             return;
         }
         if (sign == '2') {
-            //$("#PickID").val(PickIDs);
+            $("#PickID").val(PickIDs);
+           // $.modalAlert("所选单据已占料,可直接打印！", "warning");
+            $.modalMsg("所选单据已占料,可直接打印！", "warning");
+            
             gridList3();
         }
 
@@ -804,7 +829,10 @@
             var rowId = objList[i];
             var rowData = $("#gridList").jqGrid('getRowData', rowId);
             //if (rowData.IsOccupy == "已占料") {
+            if (rowData.Code!=undefined) {
                 objCode += "'" + rowData.Code + "',";
+            }
+                
             //    ISFlag = ISFlag + 1;
             //}
         }
@@ -831,7 +859,7 @@
                 url: "/WMS/PickMaterial/DelPickLog?" + Math.random(),
                 param: { objCode: JSON.stringify(objCode) },
                 success: function () {
-                    $.currentWindow().$("#gridList").trigger("reloadGrid");
+                        $.currentWindow().$("#gridList").trigger("reloadGrid");
                 }
             })
         }