diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
index fd424e4..d923b81 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
@@ -12,10 +12,10 @@
         if (Type == '1' || Type == '2' || Type == '3' || Type == '4' || Type == '5' || Type == '6' || Type == '9') {
             $(".HideItems").css('display', 'none');
         }
-        if (Type=='1') {
+        if (Type == '1') {
             gridList();
         }
-        if (Type=='2') {
+        if (Type == '2') {
             gridList2();
         }
         if (Type == '3') {
@@ -83,7 +83,7 @@
             height: $(window).height() - 200,
             width: $(window).width() - 300,
             colModel: [
-                { label: "主键", name: "ID", hidden: true, key: true }, 
+                { label: "主键", name: "ID", hidden: true, key: true },
                 { label: '退料单号', name: 'ApplyNegCode', width: 120, align: 'left' },
                 { label: '退料单行号', name: 'Sequence', width: 50, align: 'left' },
                 { label: '工单子件', name: 'SourceDetailID', hidden: true, },
@@ -96,7 +96,7 @@
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-              
+
             ],
             //colModel: ColModelMain,
             width: "100%",
@@ -162,7 +162,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                   { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -204,7 +204,7 @@
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
+                { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
 
             ],
             //colModel: ColModelMain,
@@ -271,7 +271,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                  { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -305,29 +305,29 @@
                 { label: '工单行号', name: 'Sequence', width: 50, align: 'left' },
                 { label: '已入库数量', name: 'RCVQuantity', hidden: true, },
                 { label: '料品编码', name: 'InvCode', width: 100, align: 'left' },
-                  { label: '料品名称', name: 'InvName', width: 60, align: 'left', },
+                { label: '料品名称', name: 'InvName', width: 60, align: 'left', },
                 { label: '数量', name: 'Quantity', width: 100, align: 'left' },
                 { label: '辅计量数量', name: 'Amount', width: 150, align: 'left' },
-                 {
-                     label: "状态", name: "MOStatus", width: 60, align: "left",
-                     formatter: function (cellvalue) {
-                         if (cellvalue == "1") {
-                             return "初始";
-                         } else if (cellvalue == "2") {
-                             return "下发";
-                         }
-                         else if (cellvalue == "3") {
-                             return "关单";
-                         }
-                         else { return ""; }
-                     }
-                 },
-              
+                {
+                    label: "状态", name: "MOStatus", width: 60, align: "left",
+                    formatter: function (cellvalue) {
+                        if (cellvalue == "1") {
+                            return "初始";
+                        } else if (cellvalue == "2") {
+                            return "下发";
+                        }
+                        else if (cellvalue == "3") {
+                            return "关单";
+                        }
+                        else { return ""; }
+                    }
+                },
+
                 { label: '规格型号', name: 'InvStd', width: 60, align: 'left', },
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-                  { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
+                { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
             ],
             //colModel: ColModelMain,
             width: "100%",
@@ -435,25 +435,25 @@
                 { label: '料品名称', name: 'InvName', width: 60, align: 'left', },
                 { label: '数量', name: 'Quantity', width: 100, align: 'left' },
                 { label: '辅计量数量', name: 'Amount', width: 150, align: 'left' },
-                 {
-                     label: "状态", name: "Status", width: 60, align: "left",
-                     formatter: function (cellvalue) {
-                         if (cellvalue == "1") {
-                             return "开立";
-                         } else if (cellvalue == "2") {
-                             return "审核";
-                         }
-                         else if (cellvalue == "3") {
-                             return "关闭";
-                         }
-                         else { return ""; }
-                     }
-                 },
+                {
+                    label: "状态", name: "Status", width: 60, align: "left",
+                    formatter: function (cellvalue) {
+                        if (cellvalue == "1") {
+                            return "开立";
+                        } else if (cellvalue == "2") {
+                            return "审核";
+                        }
+                        else if (cellvalue == "3") {
+                            return "关闭";
+                        }
+                        else { return ""; }
+                    }
+                },
                 { label: '规格型号', name: 'InvStd', width: 60, align: 'left', },
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-                
+
             ],
             //colModel: ColModelMain,
             width: "100%",
@@ -632,7 +632,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                     { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -862,7 +862,7 @@
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
                 { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
-            ], 
+            ],
             //colModel: ColModelSub,
             shrinkToFit: true,//宽度自适应
             multiselect: true,
@@ -1018,7 +1018,7 @@
                 { label: '料品型号', name: 'InvStd', width: 150, align: 'left' },
                 { label: '料品单位', name: 'InvStd', width: 50, align: 'left' },
                 { label: '数量', name: 'Quantity', width: 100, align: 'left' },
-                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
+                { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 100, align: 'left' },
                 { label: '辅计量数量', name: 'Amount', width: 150, align: 'left' },
                 { label: '入库数量', name: 'RCVQuantity', width: 60, align: 'left', },
@@ -1088,7 +1088,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                  { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -1429,7 +1429,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                   { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -1536,7 +1536,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                   { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -1579,7 +1579,7 @@
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
+                { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
 
             ],
             //colModel: ColModelMain,
@@ -1646,7 +1646,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                  { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -1688,7 +1688,7 @@
                 { label: '单位', name: 'InvUnit', width: 100, align: 'left' },
                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
                 { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', },
-                 { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
+                { label: '批次', name: 'BatchCode', width: 100, align: 'left' },
 
             ],
             //colModel: ColModelMain,
@@ -1755,7 +1755,7 @@
                 { label: '来源单据行', name: 'TransSequence', width: 200, align: 'left' },
                 { label: '条码', name: 'LotNo', width: 200, align: 'left' },
                 { label: '条码数量', name: 'Quantity', width: 200, align: 'left' },
-                  { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSERName', width: 200, align: 'left' },
                 { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
             ],
             //colModel: ColModelSub,
@@ -1807,7 +1807,7 @@
         }
         var POCode = "";
         var PORow = "";
-        if (Type=='1') {
+        if (Type == '1') {
             for (var i in ids) {
                 ApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).ApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1822,8 +1822,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '2') {
+        } else if (Type == '2') {
             for (var i in ids) {
                 OApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).OApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1838,8 +1837,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '3') {
+        } else if (Type == '3') {
             for (var i in ids) {
                 MOCode = $("#gridList").jqGrid('getRowData', ids[i]).MOCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1854,8 +1852,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '4') {
+        } else if (Type == '4') {
             for (var i in ids) {
                 SDNCode = $("#gridList").jqGrid('getRowData', ids[i]).SDNCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1870,8 +1867,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '5') {
+        } else if (Type == '5') {
             for (var i in ids) {
                 InCode = $("#gridList").jqGrid('getRowData', ids[i]).InCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1886,8 +1882,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '6') {
+        } else if (Type == '6') {
             for (var i in ids) {
                 ReturnCode = $("#gridList").jqGrid('getRowData', ids[i]).ReturnCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1902,8 +1897,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '7') {
+        } else if (Type == '7') {
             for (var i in ids) {
                 DNCode = $("#gridList").jqGrid('getRowData', ids[i]).DNCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1918,8 +1912,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '8') {
+        } else if (Type == '8') {
             for (var i in ids) {
                 ODNCode = $("#gridList").jqGrid('getRowData', ids[i]).ODNCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1934,8 +1927,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '9') {
+        } else if (Type == '9') {
             for (var i in ids) {
                 RCVCode = $("#gridList").jqGrid('getRowData', ids[i]).RCVCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1950,9 +1942,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-
-        if (Type == '10') {
+        } else if (Type == '10') {
             for (var i in ids) {
                 DNCode = $("#gridList").jqGrid('getRowData', ids[i]).DNCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -1967,13 +1957,10 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-
-
-        if (Type == '11') {
+        } else if (Type == '11') {
             for (var i in ids) {
-                ODNCode = $("#gridList").jqGrid('getRowData', ids[i]).ODNCode;
-                Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
+                ODNCode = $("#gridList").jqGrid('getRowData', ids[i]).OOCode;
+                Sequence = $("#gridList").jqGrid('getRowData', ids[i]).OOSequence;
             }
             $.modalOpen({
                 id: "FormAddItemLot",
@@ -1985,9 +1972,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-
-        if (Type == '12') {
+        } else if (Type == '12') {
             for (var i in ids) {
                 LLApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).ApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -2002,8 +1987,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '13') {
+        } else if (Type == '13') {
             for (var i in ids) {
                 CLApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).ApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -2018,9 +2002,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-
-        if (Type == '14') {
+        } else if (Type == '14') {
             for (var i in ids) {
                 WWLLOApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).OApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -2035,8 +2017,7 @@
                     top.frames[iframeId].submitForm();
                 }
             });
-        }
-        if (Type == '15') {
+        } else if (Type == '15') {
             for (var i in ids) {
                 WWCLOApplyNegCode = $("#gridList").jqGrid('getRowData', ids[i]).OApplyNegCode;
                 Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
@@ -2094,23 +2075,23 @@
         if (Type == '15') { mold = '00015'; }//委外材料出库退料
         var objArr = '';
         var arr = [];
-            var obj = $("#gridList").jqGrid("getRowData");
-            for (var i = 0; i < obj.length; i++) {
-                var $SubGird = $("#gridList_" + obj[i].ID + "_t");
-                var rowData = $SubGird.jqGrid('getGridParam', 'selarrrow');
-                if (rowData != "undefined" && rowData != null) {
-                    for (var j = 0; j < rowData.length; j++) {
-                        objArr += "'" + rowData[j] + "',"; 
-                    }
-                    objArr = objArr.slice(0, objArr.length - 1);
-                    objArr = ""+objArr+"|";
-                    arr.push(objArr);
+        var obj = $("#gridList").jqGrid("getRowData");
+        for (var i = 0; i < obj.length; i++) {
+            var $SubGird = $("#gridList_" + obj[i].ID + "_t");
+            var rowData = $SubGird.jqGrid('getGridParam', 'selarrrow');
+            if (rowData != "undefined" && rowData != null) {
+                for (var j = 0; j < rowData.length; j++) {
+                    objArr += "'" + rowData[j] + "',";
                 }
+                objArr = objArr.slice(0, objArr.length - 1);
+                objArr = "" + objArr + "|";
+                arr.push(objArr);
             }
-            if (objArr == "") {
-                        $.modalAlert("请选择子表数据打印!");
-                        return;
-                    }
+        }
+        if (objArr == "") {
+            $.modalAlert("请选择子表数据打印!");
+            return;
+        }
         $.modalOpen({
             id: "PrintLot",
             title: "打印",
@@ -2215,21 +2196,21 @@
                         <input id="txt_POCode" type="text" class="form-control" style="width: 100px;">
                     </div>
                 </td>
-        
+
                 <td class="HideItems" style="text-align:right;"><label class="lglabel  HideItems" for="txt_VenCode">&nbsp;&nbsp;&nbsp;&nbsp;供应商代码</label>：</td>
                 <td class="HideItems">
                     <div class="input-group  HideItems">
                         <input id="txt_VenCode" type="text" class="form-control  HideItems" style="width: 100px;">
                     </div>
                 </td>
-         
-                <td class="HideItems" style="text-align:right;" ><label  class="lglabel  HideItems"  for="txt_VenName">&nbsp;&nbsp;&nbsp;&nbsp;供应商名称</label>：</td>
+
+                <td class="HideItems" style="text-align:right;"><label class="lglabel  HideItems" for="txt_VenName">&nbsp;&nbsp;&nbsp;&nbsp;供应商名称</label>：</td>
                 <td class="HideItems">
                     <div class="input-group  HideItems">
                         <input id="txt_VenName" type="text" class="form-control   HideItems" style="width: 100px;">
                     </div>
                 </td>
-               
+
             </tr>
             <tr>
                 <td style="text-align:right;"><label class="lglabel" for="txt_InvCode">&nbsp;&nbsp;&nbsp;&nbsp;料品编码</label>：</td>
@@ -2238,7 +2219,7 @@
                         <input id="txt_InvCode" type="text" class="form-control" style="width: 100px;">
                     </div>
                 </td>
-              
+
                 <td style="text-align:right;"><label class="lglabel" for="txt_InvName">&nbsp;&nbsp;&nbsp;&nbsp;料品名称</label>：</td>
                 <td>
                     <div class="input-group">