Ver Fonte

更新称重结果管理功能及相关界面

在项目中添加了与称重结果相关的 JavaScript 和 CSS 文件,移除旧文件,确保项目结构更新。新增 `WeighingResultQueryDto` 查询参数类和 `BaseWeighingResult` 模型类,支持称重结果的数据库映射。实现了 `WeighingResultService` 类以提供分页查询功能,并在控制器中新增多个操作方法。更新多个视图文件以支持新的管理界面,并在相关 JavaScript 文件中添加数据表格的初始化和查询功能。最后,添加了启用和禁用巷道的操作逻辑,增强了用户管理体验。
林豪 左 há 6 meses atrás
pai
commit
083ed99377

+ 16 - 0
WMS.BZModels/Dto/CP/WeighingResult/WeighingResultQueryDto.cs

@@ -0,0 +1,16 @@
+using SqlSugar;
+
+namespace WMS.BZModels.Dto.CP.WeighingResult
+{
+    /// <summary>
+    /// 校称记录查询参数类
+    /// </summary>
+    public class WeighingResultQueryDto : PagerInfo
+    {
+        /// <summary>
+        /// 是否超限 0全部 1超限 2未超限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否超限")]
+        public int IsOutOfTolerance { get; set; }
+    }
+}

+ 42 - 0
WMS.BZModels/Models/CP/BaseWeighingResult.cs

@@ -0,0 +1,42 @@
+using SqlSugar;
+
+namespace WMS.BZModels.Models.CP
+{
+    /// <summary>
+    /// 称重结果
+    /// </summary>
+    [Tenant("cp")]
+    [SugarTable("Base_WeighingResult")]
+    public partial class BaseWeighingResult : BaseModel
+    {
+        /// <summary>
+        /// 标准重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "标准重量")]
+        public decimal StandardWeight { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "称重重量")]
+        public decimal MeasuredWeight { get; set; }
+
+        /// <summary>
+        /// 偏差上限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "偏差上限")]
+        public decimal UpperDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 偏差下限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "偏差下限")]
+        public decimal LowerDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 是否超限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否超限")]
+        public bool IsOutOfTolerance { get; set; }
+    }
+}

+ 34 - 0
WMS.BZServices/CP/WeighingResultService.cs

@@ -0,0 +1,34 @@
+using SqlSugar;
+using WMS.BZModels;
+using WMS.BZModels.Dto.CP.WeighingResult;
+using WMS.BZModels.Models.CP;
+using WMS.BZSqlSugar;
+using WMS.Info;
+
+namespace WMS.BZServices.CP
+{
+    public class WeighingResultService
+    {
+        private readonly Repository<BaseWeighingResult> _sysconrepository;
+
+        public WeighingResultService(Repository<BaseWeighingResult> sysconrepository)
+        {
+            _sysconrepository = sysconrepository;
+        }
+
+        public PagedInfo<BaseWeighingResult> GetPageList(Pagination pagination, WeighingResultQueryDto sysconQueryDto)
+        {
+            var predicate = Expressionable.Create<BaseWeighingResult>();
+            //predicate = predicate.AndIF(!string.IsNullOrEmpty(sysconQueryDto?.KeyWord), m => m.Code.Contains(sysconQueryDto.KeyWord) || m.Name.Contains(sysconQueryDto.KeyWord) || m.SContent.Contains(sysconQueryDto.KeyWord)
+            //|| m.SType.Contains(sysconQueryDto.KeyWord));
+            predicate = predicate.AndIF(sysconQueryDto.IsOutOfTolerance == 1, m => m.IsOutOfTolerance);
+            predicate = predicate.AndIF(sysconQueryDto.IsOutOfTolerance == 2, m => !m.IsOutOfTolerance);
+            //predicate = predicate.AndIF(!string.IsNullOrEmpty(sysconQueryDto?.Name), m => m.Name.Contains(sysconQueryDto.Name));
+            //predicate = predicate.And(m => m.SType != "PalletizingType");
+            var list = _sysconrepository.Queryable().Where(predicate.ToExpression())
+                 .ToPage<BaseWeighingResult, BaseWeighingResult>(pagination);
+
+            return list;
+        }
+    }
+}

+ 89 - 0
WMS.BZWeb/Areas/CPManager/Controllers/WeighingResultController.cs

@@ -0,0 +1,89 @@
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using WMS.BZModels;
+using WMS.BZModels.Dto.CP.WeighingResult;
+using WMS.BZServices.CP;
+using WMS.Info;
+using WMS.Util;
+
+namespace WMS.BZWeb.Areas.CPManager.Controllers
+{
+    [Area("CPManager")]
+    public class WeighingResultController : MvcControllerBase
+    {
+        private readonly WeighingResultService _syscon;
+
+        public WeighingResultController(WeighingResultService syscon)
+        {
+            _syscon = syscon;
+        }
+
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult TunnelIndex()
+        {
+            //ViewBag.HJWCSWebAPIUrl = ConfigHelper.GetConfig().HJWCSWebAPIUrl;
+            return View();
+        }
+
+        public IActionResult OutInPationIndex()
+        {
+            return View();
+        }
+
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        public IActionResult StartIndex()
+        {
+            return View();
+        }
+
+        public IActionResult StopIndex()
+        {
+            return View();
+        }
+
+        public IActionResult BoxBingIndex()
+        {
+            ViewBag.CPWMSWebAPIUrl = ConfigHelper.GetConfig().CPWMSWebAPIUrl;
+            return View();
+        }
+
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = InitPagination(pagination);
+            var query = new WeighingResultQueryDto();
+            if (!string.IsNullOrEmpty(queryJson))
+            {
+                query = JsonConvert.DeserializeObject<WeighingResultQueryDto>(queryJson);
+            }
+
+            var lists = _syscon.GetPageList(paginationobj, query ?? new WeighingResultQueryDto());
+
+            var jsonData = new
+            {
+                rows = lists.Result,
+                total = lists.TotalPage,
+                page = lists.PageIndex,
+                records = lists.TotalNum
+            };
+            return Success(jsonData);
+        }
+
+        public ActionResult GetIsOutOfTolerance(string pagination, string queryJson)
+        {
+            var jsonData = new List<EnumEntity>()
+            {
+               new EnumEntity(){ id=1,text="超限" },
+               new EnumEntity(){ id=2,text="未超限" }
+            };
+            return Success(jsonData);
+        }
+    }
+}

+ 25 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/BoxBingIndex.cshtml

@@ -0,0 +1,25 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "新增配置";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">箱号<font face="宋体">*</font></div>
+        <input id="boxCode" type="text" class="form-control" placeholder="请输入箱号" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">托盘码<font face="宋体">*</font></div>
+        <input id="contGrpBarCode" type="text" class="form-control" placeholder="请输入托盘码" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="btn-group btn-group-sm">
+            <a id="lr_done" class="btn btn-warning"><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>*@
+        </div>
+    </div>
+</div>
+<script>
+    var weburl = '@ViewBag.CPWMSWebAPIUrl';
+</script>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/BoxBingIndex.js")

+ 65 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/BoxBingIndex.js

@@ -0,0 +1,65 @@
+/*
+ * 描 述:功能模块	
+ */
+var acceptClick;
+var keyValue = '';
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow || {};
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        /*绑定事件和初始化控件*/
+        bind: function () {
+            // 上级
+            //强制取消任务按钮
+            $('#lr_done').on('click', function () {
+                var boxCode = $('#boxCode').val().replace(/^[' ' || ' ']*/, '').replace(/[' ' | ' ']*$/, '');
+                if (boxCode.length == 0) {
+                    learun.alert.error('箱号不能为空!');
+                    return false;
+                }
+                var contGrpBarCode = $('#contGrpBarCode').val().replace(/^[' ' || ' ']*/, '').replace(/[' ' | ' ']*$/, '');
+                if (contGrpBarCode.length == 0) {
+                    learun.alert.error('托盘码不能为空!');
+                    return false;
+                }
+                var url = weburl + "api/Cp/PdaCpGroupStock";
+                learun.layerConfirm('是否箱号托盘码绑定!', function (res) {
+                    if (res) {
+                        
+                        $.ajax({
+                            type: 'post',
+                            //data: { location: postData.map((item) => item.Id) },
+                            data: JSON.stringify({
+                                "boxCode": boxCode,
+                                "contGrpBarCode": contGrpBarCode,
+                            }),
+                            dataType: 'json',
+                            contentType: "application/json;charset=utf-8",
+                            url: url,
+                            success: function (response) {
+                                //resCode 200  resMsg "成功"                                    
+                                //refreshGirdData();
+                                top.layer.close(top.layer.index);
+                                learun.alert.info(response.resMsg);
+                            }
+                        });
+                    }
+                });
+
+            });
+        },
+        /*初始化数据*/
+        initData: function () {
+            
+        }
+    };
+    acceptClick = function (callBack) {
+       
+    };
+    page.init();
+}

+ 40 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Form.cshtml

@@ -0,0 +1,40 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "新增配置";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">编码<font face="宋体">*</font></div>
+        <input id="Code" type="text" class="form-control" placeholder="请输入编码" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">名称</div>
+        <input id="Name" type="text" class="form-control" placeholder="请输入名称" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">内容 </div>
+        <input id="SContent" type="text" class="form-control" placeholder="请输入内容"  />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <input id="SType" type="text" class="form-control" placeholder="请输入类型" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备用字段1 </div>
+        <input id="Default1" type="text" class="form-control" placeholder="请输入备用1"   />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备用字段2 </div>
+        <input id="Default2" type="text" class="form-control" placeholder="请输入备用2"  />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备用字段3 </div>
+        <input id="Default3" type="text" class="form-control" placeholder="请输入备用3"   />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备注 </div>
+        <input id="Memo" type="text" class="form-control" placeholder="请输入备注"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/Form.js")

+ 41 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Form.js

@@ -0,0 +1,41 @@
+/*
+ * 描 述:功能模块	
+ */
+var acceptClick;
+var keyValue = '';
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow || {};
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        /*绑定事件和初始化控件*/
+        bind: function () {
+            // 上级
+
+        },
+        /*初始化数据*/
+        initData: function () {
+            if (!!selectedRow) {
+                keyValue = selectedRow.Code;
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData(keyValue);
+        $.lrSaveForm(top.$.rootUrl + '/CPManager/SysCon/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

+ 57 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Index.cshtml

@@ -0,0 +1,57 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "校秤记录";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-scroll-horizontal {
+        height: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .lr-scroll-vertical {
+        width: 12px;
+        display: block;
+        z-index: 100;
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                   @*  <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div> *@
+
+                    <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="IsOutOfTolerance"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;<span class="lrlg">新增</span></a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlg">编辑</span></a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlg">删除</span></a>
+                    </div> *@
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/WeighingResult/Index.js")

+ 80 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Index.js

@@ -0,0 +1,80 @@
+var refreshGirdData;
+var logbegin = '';
+var logend = '';
+var StartTimeBegin = '';
+var StartTimeend = '';
+var EndTimeBegin = '';
+var EndTimeend = '';
+var selectedRow;
+var refreshGirdData; // 更新数据
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                // 调用后台查询
+                // queryJson 查询条件
+
+                queryJson["IsOutOfTolerance"] = $("#IsOutOfTolerance").lrselectGet();
+                page.search({ queryJson: JSON.stringify(queryJson) });
+            }, 250);
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            $('#IsOutOfTolerance').lrselect({
+                url: top.$.rootUrl + '/CPManager/WeighingResult/GetIsOutOfTolerance',
+                maxHeight: 180,
+                allowSearch: false
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CPManager/WeighingResult/GetPageList',
+                headData: [
+                    { label: "标准重量", name: "StandardWeight", width: 170, align: "left" },
+                    { label: "称重重量", name: "MeasuredWeight", width: 200, align: "left", sortname: "TypeCode" },
+                    //{ label: "是否超限", name: "IsOutOfTolerance", width: 90, align: "left" },
+                    {
+                        label: "是否超限", name: "IsOutOfTolerance", width: 70, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue == true) {
+                                return '<span class=\"label label-danger\"  >异常</span>';
+                            } else {
+                                return '<span class=\"label  label-success\" >正常</span>';
+                            }
+                        }
+                    },
+                    { label: "偏差上限", name: "UpperDeviationLimit", width: 90, align: "left" },
+                    { label: "偏差下限", name: "LowerDeviationLimit", width: 90, align: "left" },
+                    { label: "创建时间", name: "AddTime", width: 130, align: "left" },
+                    { label: "备注", name: "Memo", width: 200, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                reloadSelected: true,
+                sidx: 'AddTime',
+                sord: 'DESC',
+            });
+            page.search({ queryJson: JSON.stringify({ IsOutOfTolerance: 0 }) });
+        },
+        search: function (param) {
+            $('#gridtable').jfGridSet('reload', param);
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

+ 61 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/OutInPationIndex.cshtml

@@ -0,0 +1,61 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "出入站台管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-scroll-horizontal {
+        height: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .lr-scroll-vertical {
+        width: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .jfgrid-sub .jfgrid-body {
+        overflow-y: scroll
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div>
+
+                    <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>
+                                    <input id="Pation" type="text" class="form-control" placeholder="请输入站台" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_start" class="btn btn-default"><i class="fa fa-pencil-square-o "></i>&nbsp;启用</a>
+                        <a id="lr_notstart" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;禁用</a>
+
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/OutInPationIndex.js")

+ 102 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/OutInPationIndex.js

@@ -0,0 +1,102 @@
+var refreshGirdData;
+var OneInTimebegin = '';
+var OneInTimeend = '';
+var ProductTimebegin = '';
+var ProductTimeend = '';
+var logbegin = '';
+var logend = '';
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                // 调用后台查询
+                // queryJson 查询条件
+                queryJson["Pation"] = $("#Pation").val();
+                page.search({ queryJson: JSON.stringify(queryJson) });
+
+            }, 250);
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+            });
+            // 刷新 
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 启用
+            $('#lr_start').on('click', function () {
+                var postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行!');
+                    return false;
+                }
+                learun.layerConfirm('是否确认启用该站台!', function (res) {
+                    if (res) {
+
+                        learun.postForm(top.$.rootUrl + '/CPManager/SysCon/EnablePation', { ids: JSON.stringify(postData.map((item) => item.Id)) }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 禁用
+            $('#lr_notstart').on('click', function () {
+                var postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行!');
+                    return false;
+                }
+                learun.layerConfirm('是否确认禁用该站台!', function (res) {
+                    if (res) {
+
+                        learun.postForm(top.$.rootUrl + '/CPManager/SysCon/DisablePation', { ids: JSON.stringify(postData.map((item) => item.Id)) }, function () {
+                            refreshGirdData();
+                        });
+
+                    }
+                });
+            });
+        },
+        // 初始化列表 
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CPManager/SysCon/GetOutInPationList',
+                headData: [
+                    { label: "仓库", name: "WareHouseName", width: 80, align: "left" },
+                    { label: "站台", name: "Code", width: 50, align: "left" },
+                    { label: "名称", name: "Name", width: 150, align: "left" },
+                    { label: "状态", name: "StatuName", width: 50, align: "left" },
+                    { label: "备注", name: "Memo", width: 80, align: "left" },
+                    { label: "创建时间", name: "AddTime", width: 130, align: "left" },
+                    { label: "更新时间", name: "EditTime", width: 130, align: "left" },
+
+                ],
+                mainId: 'Id',
+                isPage: true,
+                reloadSelected: true,
+                autowWidth: true,
+                sidx: 'AddTime',
+                sord: 'DESC',
+                isMultiselect: true,
+            });
+            page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+        },
+        search: function (param) {
+            param = param || { queryJson: JSON.stringify({ InvStateCode: 3 }) };
+            $('#gridtable').jfGridSet('reload', param);
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

+ 12 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/StartIndex.cshtml

@@ -0,0 +1,12 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "新增配置";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-form-wrap" id="form1">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
+        <input id="Memo" type="text" class="form-control" placeholder="请输入备注" required="required" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/StartIndex.js")

+ 49 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/StartIndex.js

@@ -0,0 +1,49 @@
+var acceptClick;
+var account = request('lraccount');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectRowsDatas = learun.frameTab.currentIframe().postData;
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+
+            $('#User').val(top.$.lcoreUser.account);
+        },
+        initData: function () {
+            if (selectRowsDatas.length <= 0) {
+            }
+
+        }
+
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form1').lrValidform()) {
+            return false;
+        }
+        var remak = $('#Memo').val();
+        if (remak == null || remak.length <= 0) {
+            learun.alert.error('备注必须填写!');
+            return false;
+        }
+        learun.layerConfirm('是否确认启用该巷道!', function (res) {
+        if (res) {
+
+            learun.postForm(top.$.rootUrl + '/CPManager/SysCon/EnableTunnel', { ids: JSON.stringify(selectRowsDatas.map((item) => item.Id)), remark: $('#Memo').val() }, function () {
+                if (!!callBack) {
+                    callBack();
+                }
+                top.learun.layerClose(window.name);
+            });
+            }
+        });
+
+    };
+    page.init();
+}
+
+
+

+ 12 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/StopIndex.cshtml

@@ -0,0 +1,12 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "新增配置";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-form-wrap" id="form2">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
+        <input id="Memo" type="text" class="form-control" placeholder="请输入备注" required="required" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/StopIndex.js")

+ 49 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/StopIndex.js

@@ -0,0 +1,49 @@
+var acceptClick;
+var account = request('lraccount');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectRowsDatas = learun.frameTab.currentIframe().postData;
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+
+            $('#User').val(top.$.lcoreUser.account);
+        },
+        initData: function () {
+            if (selectRowsDatas.length <= 0) {
+            }
+
+        }
+
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form2').lrValidform()) {
+            return false;
+        }
+        var remak = $('#Memo').val();
+        if (remak == null || remak.length <= 0) {
+            learun.alert.error('备注必须填写!');
+            return false;
+        }
+        learun.layerConfirm('是否确认禁用该巷道!', function (res) {
+        if (res) {
+
+            learun.postForm(top.$.rootUrl + '/CPManager/SysCon/DisableTunnel', { ids: JSON.stringify(selectRowsDatas.map((item) => item.Id)), remark: $('#Memo').val() }, function () {
+                if (!!callBack) {
+                    callBack();
+                }
+                top.learun.layerClose(window.name);
+            });
+            }
+        });
+
+    };
+    page.init();
+}
+
+
+

+ 61 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/TunnelIndex.cshtml

@@ -0,0 +1,61 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "巷道管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-scroll-horizontal {
+        height: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .lr-scroll-vertical {
+        width: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .jfgrid-sub .jfgrid-body {
+        overflow-y: scroll
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div>
+
+                    <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>
+                                    <input id="Tunnel" type="text" class="form-control" placeholder="请输入巷道" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_enable" class="btn btn-default"><i class="fa fa-pencil-square-o "></i>&nbsp;启用</a>
+                        <a id="lr_disable" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;禁用</a>
+
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/SysCon/TunnelIndex.js")

+ 106 - 0
WMS.BZWeb/Areas/CPManager/Views/WeighingResult/TunnelIndex.js

@@ -0,0 +1,106 @@
+var refreshGirdData;
+var OneInTimebegin = '';
+var OneInTimeend = '';
+var ProductTimebegin = '';
+var ProductTimeend = '';
+var logbegin = '';
+var logend = '';
+var postData;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                // 调用后台查询
+                // queryJson 查询条件
+                queryJson["Tunnel"] = $("#Tunnel").val();
+                page.search({ queryJson: JSON.stringify(queryJson) });
+
+            }, 250);
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+            });
+            // 刷新 
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行!');
+                    return false;
+                }
+                learun.layerForm({
+                    id: 'form1',
+                    title: '启用巷道备注框',
+                    url: top.$.rootUrl + '/CPManager/SysCon/StartIndex',
+                    width: 700,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 禁用
+            $('#lr_disable').on('click', function () {
+                postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行!');
+                    return false;
+                }
+                learun.layerForm({
+                    id: 'form2',
+                    title: '禁用填写备注框',
+                    url: top.$.rootUrl + '/CPManager/SysCon/StopIndex',
+                    width: 700,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+        },
+        // 初始化列表 
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CPManager/SysCon/GetTunnelList',
+                headData: [
+                    { label: "仓库", name: "WareHouseName", width: 80, align: "left" },
+                    { label: "巷道", name: "Tunnel", width: 50, align: "left" },
+                    { label: "名称", name: "Name", width: 100, align: "left" },
+                    { label: "状态", name: "StatuName", width: 50, align: "left" },
+                    { label: "备注", name: "Memo", width: 80, align: "left" },
+                    { label: "创建时间", name: "AddTime", width: 130, align: "left" },
+                    { label: "更新时间", name: "EditTime", width: 130, align: "left" },
+
+                ],
+                mainId: 'Id',
+                isPage: true,
+                reloadSelected: true,
+                autowWidth: true,
+                sidx: 'AddTime',
+                sord: 'DESC',
+                isMultiselect: true,
+            });
+            page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+        },
+        search: function (param) {
+            param = param || { queryJson: JSON.stringify({ InvStateCode: 3 }) };
+            $('#gridtable').jfGridSet('reload', param);
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

+ 63 - 0
WMS.BZWeb/WMS.BZWeb.csproj

@@ -86,6 +86,13 @@
     <None Remove="Areas\CPManager\Views\DeviceEffectives\IndexList.js" />
     <None Remove="Areas\CPManager\Views\DeviceEffectives\QIndex.css" />
     <None Remove="Areas\CPManager\Views\Inventorys\FailForm.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\BoxBingIndex.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\Form.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\Index.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\OutInPationIndex.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\StartIndex.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\StopIndex.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\TunnelIndex.js" />
     <None Remove="Areas\FJManager\Views\BillBomSet\DFMAll.js" />
     <None Remove="Areas\FJManager\Views\DeviceEffectives\IndexList.js" />
     <None Remove="Areas\FJManager\Views\DeviceEffectives\QIndex.css" />
@@ -118,6 +125,34 @@
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
     <Content Include="Areas\CPManager\Views\Inventorys\FailForm.js" />
+    <Content Include="Areas\CPManager\Views\WeighingResult\BoxBingIndex.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\Form.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\Index.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\OutInPationIndex.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\StartIndex.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\StopIndex.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Areas\CPManager\Views\WeighingResult\TunnelIndex.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Include="Areas\FJManager\Views\BillBomSet\DFMAll.js" />
     <Content Include="Areas\FJManager\Views\BillBomSet\Form.js" />
     <Content Include="Areas\FJManager\Views\BillBomSet\PaiKu.js">
@@ -201,6 +236,34 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\BoxBingIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\Form.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\Index.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\OutInPationIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\StartIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\StopIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\TunnelIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Update="Areas\FJManager\Views\BillBomSet\PaiKu.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>