浏览代码

更新 API URL 和表单字段

在 `TasksController.cs` 中,将 `ViewBag` 的 `FJWCSWebAPIUrl` 更新为 `KLHCWCSWebAPIUrl`。
在 `CurrentTaskIndex.cshtml` 中,移除多个注释的 HTML 代码块,并添加新的输入字段,如“任务号”、“任务类型”、“任务状态”、“设备”、“开始时间”和“结束时间”,以简化表单并满足业务需求。同时,更新按钮组中的按钮,添加了“重下AGV任务”、“重下RGV任务”和“优先级”按钮的注释,表明这些功能可能会在未来实现。
林豪 左 2 月之前
父节点
当前提交
b07ceed8a9

+ 2 - 3
WMS.BZWeb/Areas/KLHCManager/Controllers/TasksController.cs

@@ -3,7 +3,6 @@ using Newtonsoft.Json;
 using System.Data;
 using System.Web;
 using WMS.BZModels.Dto.KLHC.TaskDtos;
-using WMS.BZModels.Models.KLHC;
 using WMS.BZServices.KLHC;
 using WMS.Info;
 using WMS.Util;
@@ -33,14 +32,14 @@ namespace WMS.BZWeb.Areas.KLHCManager.Controllers
 
         public IActionResult Form()
         {
-            ViewBag.FJWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
+            ViewBag.KLHCWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
 
             return View();
         }
 
         public IActionResult CurrentTaskIndex()
         {
-            ViewBag.FJWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
+            ViewBag.KLHCWCSWebAPIUrl = ConfigHelper.GetConfig().KLHCWCSWebAPIUrl;
             return View();
         }
 

+ 7 - 65
WMS.BZWeb/Areas/KLHCManager/Views/Tasks/CurrentTaskIndex.cshtml

@@ -35,18 +35,12 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                              @*   <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">仓库</div>
-                                    <div id="WarehouseId"></div>
-                                </div> *@
+                           
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">任务号</div>
                                     <input id="ID" type="text" class="form-control" placeholder="请输入任务号" />
                                 </div>
-                          @*       <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">托盘/工字轮</div>
-                                    <input id="BarCode" type="text" class="form-control" placeholder="请输入工字轮编码" />
-                                </div> *@
+                       
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">任务类型</div>
                                     <div id="Type"></div>
@@ -55,22 +49,7 @@
                                     <div class="lr-form-item-title">任务状态</div>
                                     <div id="Status"></div>
                                 </div>
-                              @*   <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">等级</div>
-                                    <input id="Grade" type="text" class="form-control" placeholder="请输入等级" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">业务类型</div>
-                                    <div id="BusType"></div>
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">巷道</div>
-                                    <input id="Tunnel" type="text" class="form-control" placeholder="请输入巷道" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">楼层</div>
-                                    <input id="Floor" type="text" class="form-control" placeholder="请输入楼层" />
-                                </div> *@
+                             
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">设备</div>
                                     <input id="Device" type="text" class="form-control" placeholder="请输入设备" />
@@ -88,38 +67,13 @@
                                     <div class="lr-form-item-title">下一个地址</div>
                                     <input id="AddrNext" type="text" class="form-control" placeholder="请输入下一个地址" />
                                 </div>
-
-                                @* <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">创建时间</div>
-                                <div id="datesearch" class="datetime"></div>
-                                </div> *@
-
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">创建时间</div>
-                                    @*  <div id="datesearch" class="datetime"></div> *@
                                     <input id="AddTimeFrom" placeholder="请输入创建时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                     <input id="AddTimeTo" placeholder="请输入创建时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                 </div>
 
-                               @*  <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">产品编码</div>
-                                    <input id="MaterialCode" type="text" class="form-control" placeholder="请输入产品编码" />
-                                </div>
-
-
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">WMS任务</div>
-                                    <input id="WmsTask" type="text" class="form-control" placeholder="请输入WMS任务号" />
-                                </div> *@
-
-                                @* <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">开始时间</div>
-                                <div id="StartTime" class="datetime"></div>
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">结束时间</div>
-                                <div id="EndTime" class="datetime"></div>
-                                </div> *@
+                              
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">开始时间</div>
 
@@ -129,23 +83,11 @@
                                 </div>
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">结束时间</div>
-                                    @*    <div id="EndTime" class="datetime"></div> *@
                                     <input id="EndTimeBegin" placeholder="请输入结束时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                     <input id="EndTimeEnd" placeholder="请输入结束时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
 
                                 </div>
-                                @* <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">AGV任务</div>
-                                    <input id="AgvTaskID" type="text" class="form-control" placeholder="请输入AGV任务号" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">机台号</div>
-                                    <input id="WorkBench" type="text" class="form-control" placeholder="请输入机台号" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">物料编码</div>
-                                    <input id="MatCode" type="text" class="form-control" placeholder="请输入物料编码" />
-                                </div> *@
+                             
                             </div>
                         </div>
                     </div>
@@ -155,8 +97,8 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlg">刷新</span></a>
                     </div>
                     <div class=" btn-group btn-group-sm" wms-authorize="yes">
-                        @* <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消</a>
-                        <a id="lr_done" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;完成</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消</a>
+                        @* <a id="lr_done" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;完成</a>
                         <a id="lr_reagvtask" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;重下AGV任务</a>
                         <a id="lr_rergvtask" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;重下RGV任务</a>
                         <a id="lr_Priority" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;优先级</a> *@