diff --git a/MESWebSite/HttpHandlers/ZP_MK_PlanHandler.ashx.cs b/MESWebSite/HttpHandlers/ZP_MK_PlanHandler.ashx.cs
index 2ddeb73..75d0df8 100644
--- a/MESWebSite/HttpHandlers/ZP_MK_PlanHandler.ashx.cs
+++ b/MESWebSite/HttpHandlers/ZP_MK_PlanHandler.ashx.cs
@@ -117,7 +117,7 @@ namespace MESWebSite.HttpHandlers
 
             tb_ZP_MK_Plan zpp = new tb_ZP_MK_Plan
             {
-               
+                ID = int.Parse(id),
                 PartNo = partNo,
                 OrderDate = orderDate,
                 OrderCount = orderCount,
diff --git a/MESWebSite/Manage/ZP_MK_Plan.aspx b/MESWebSite/Manage/ZP_MK_Plan.aspx
index 087cff8..2d34d91 100644
--- a/MESWebSite/Manage/ZP_MK_Plan.aspx
+++ b/MESWebSite/Manage/ZP_MK_Plan.aspx
@@ -61,7 +61,7 @@
                     <td style="width: 260px;"> 零件号：
                         <input type="text" id="part_no_s" style="width: 140px;"/>
                     </td>
-                    <td style="width: 380px;"> 装配日期：
+                    <td style="width: 380px;"> 装配时间：
                         <input id="start_time" class="easyui-datetimebox" style="width: 130px; height: 30px;" data-options="onShowPanel:function(){ $(this).datetimebox('spinner').timespinner('setValue','00:00:00');}" />
                         <input id="end_time" class="easyui-datetimebox" style="width: 130px; height: 30px;" data-options="onShowPanel:function(){ $(this).datetimebox('spinner').timespinner('setValue','23:59:59');}" />
                     </td>
@@ -108,7 +108,7 @@
                     </td>
                     <td colspan="2">
                         <select id="part_no" class="easyui-combobox" style="width: 200px; height: 30px;"
-                            data-options="valueField: 'PartNo',textField: 'ProductName'">
+                            data-options="valueField: 'PartNo',textField: 'PartName'">
                         </select>
                     </td>
                 </tr>
@@ -129,7 +129,9 @@
                          </p>
                      </td>
                      <td colspan="2">
-                         <input id="Line" type="text" class="text" style="width: 230px; height: 30px;" />
+                        <select id="line_id" class="easyui-combobox" style="width: 234px; height: 36px;"
+                            data-options="valueField: 'LineID',textField: 'LineName'">
+                        </select><span style="color: red; font-size: 18px; vertical-align: middle;">*</span>
                      </td>
                 </tr>
                  <tr>
@@ -139,7 +141,9 @@
                           </p>
                       </td>
                       <td colspan="2">
-                          <input id="Station" type="text" class="text" style="width: 230px; height: 30px;" />
+                         <select id="station_id" class="easyui-combobox" style="width: 234px; height: 36px;"
+                             data-options="valueField: 'StationID',textField: 'StationNo'">
+                         </select><span style="color: red; font-size: 18px; vertical-align: middle;">*</span>
                       </td>
                  </tr>
                 <tr>
@@ -155,7 +159,7 @@
                 <tr>
                     <td class="title" style="width: 110px;">
                         <p>
-                            装配日期：
+                            装配时间：
                         </p>
                     </td>
                     <td>
@@ -188,6 +192,7 @@
                 });
 
                 // 下拉框加载
+                reloadline_station();
                 //reload_station_no('#station_no');
                 reload_part_no('#part_no');
                 //新增按钮点击
@@ -308,14 +313,12 @@
             function SaveInfo(isEdit) {
 
                 var ID = isEdit == true ? PrimaryID : 0;
-                var PartNo = $('#part_no').combo('getValue');
-                //var StationID = $('#station_no').combo('getValue');
-                var OrderDate = $('#OrderDate').datebox('getValue');
-                //var IsOneMore = checkboxValue($('#IsOneMore'));
+                var PartNo = $('#part_no').combo('getValue');                
+                var OrderDate = $('#OrderDate').datebox('getValue');                
                 var OrderCount = $('#OrderCount').val();
                 var OrderName = $('#OrderName').val();
-                var Line = $('#Line').val();
-                var Station = $('#Station').val();
+                var Line = $('#line_id').combo('getText');
+                var Station = $('#station_id').combo('getText');
 
                 if (PartNo == "") {
                     $.messager.alert('提示', '零件不能为空，请重新输入', 'warning');
@@ -413,8 +416,8 @@
                 //toggleChecked('#IsOneMore', row.IsOneMore);
                 $('#OrderCount').val(row.OrderCount);
                 $('#OrderName').val(row.OrderName);
-                $('#Line').val(row.Line);
-                $('#Station').val(row.Station);
+                $('#line_id').combobox('select', row.Line);
+                $('#station_id').combobox('select', row.Station);
                 var pa = /.*\((.*)\)/;
                 var unixtime = row.OrderDate.match(pa)[1].substring(0, 10);
                 $('#OrderDate').datetimebox('setValue', getTime(unixtime).substring(0, 19));
@@ -467,8 +470,8 @@
                 $('#OrderDate').datebox('setValue', '');
                 $('#OrderCount').val('');
                 $('#OrderName').val('');
-                $('#Line').val('');
-                $('#Station').val('');
+                $('#line_id').combo('clear');
+                $('#station_id').combo('clear');   
             }
 
             function toggleChecked(id, checked) {
@@ -482,7 +485,7 @@
              * 加载产品下拉信息
              **/
             function reload_part_no(ctl) {
-                base_reload_combobox(ctl, '/HttpHandlers/ProductHandler.ashx?method=GetComboboxProduct4');
+                base_reload_combobox(ctl, '/HttpHandlers/ProductHandler.ashx?method=QueryForCombobox&ProductTypeNo=6000');
             }
 
             function reload_station_no(ctl) {
@@ -507,6 +510,27 @@
                 document.body.appendChild(temp_form);
                 temp_form.submit();
             }
+
+            function reloadline_station() {
+
+                $('#line_id').combobox({
+                    url: '/HttpHandlers/LineHandler.ashx?method=QueryForCombobox',
+                    onLoadSuccess: function () {
+                        var val = $(this).combobox('getData');
+                        $(this).combobox('select', val[0].LineID);
+                    },
+                    onSelect: function (row) {
+                        $('#station_id').combobox({
+                            url: '/HttpHandlers/StationHandler.ashx?method=QueryForComboboxByLineIDNew&&LineID=' + row.LineID + '',
+                            onLoadSuccess: function () {
+                                //var val = $(this).combobox('getData');
+                                //$(this).combobox('select', val[0].ID);
+                            },
+
+                        });
+                    }
+                });
+            }
         </script>
     </form>
 </body>