Merge branch 'master' of http://120.77.11.229:3000/ZTGT/WEBUI

WMS.BZModels/Dto/FJ/BillBom/BillBomsetgrpDto.cs

@@ -237,4 +237,50 @@ namespace WMS.BZModels.Dto.FJ.BillBom
         /// </summary> 
         public string StampType { get; set; }
     }
+
+    /// <summary>
+    ///  排库
+    /// </summary>
+    public class BillPaiKuDto : PagerInfo
+    {
+        /// <summary> 
+        /// IsStop
+        /// </summary> 
+        public string IsStop { get; set; }
+
+        /// <summary> 
+        /// IsDelete
+        /// </summary> 
+        public string IsDelete { get; set; }
+        /// <summary> 
+        /// Code
+        /// </summary> 
+        public string Code { get; set; }
+
+        /// <summary> 
+        /// Name
+        /// </summary> 
+        public string Name { get; set; }
+
+        /// <summary> 
+        /// 帘线物料编码
+        /// </summary> 
+        public string ProMaterCode { get; set; }
+
+        public string ShortCode { get; set; }
+
+
+        /// <summary> 
+        /// 投料物流编码
+        /// </summary> 
+        public string ProCode { get; set; }
+
+        public string BomCode { get; set; }
+
+        public string BomName { get; set; }
+        /// <summary> 
+        /// 跺型类型（区分表单）
+        /// </summary> 
+        public string StampType { get; set; }
+    }
 }

WMS.BZServices/FJ/BillBomSetService.cs

@@ -30,7 +30,6 @@ namespace WMS.BZServices.FJ
             _matinforepository = matinforepository;
         }
 
-
         public PagedInfo<BillBomsetgrpDto> GetPageList(Pagination pagination, BillBomsetgrpQueryDto billBomsetgrpQueryDto)
         {
             var list = GetQueryable(billBomsetgrpQueryDto)
@@ -39,6 +38,14 @@ namespace WMS.BZServices.FJ
             return list;
         }
 
+        public PagedInfo<BillBomsetgrpDto> GetPaiKuList(Pagination pagination, BillBomsetgrpQueryDto billBomsetgrpQueryDto)
+        {
+            var list = GetQueryable(billBomsetgrpQueryDto)
+                 .ToPage<BillBomsetgrp, BillBomsetgrpDto>(pagination);
+
+            return list;
+        }
+
         private ISugarQueryable<BillBomsetgrp> GetQueryable(BillBomsetgrpQueryDto billBomsetgrpQueryDto)
         {
             var predicate = Expressionable.Create<BillBomsetgrp>();
@@ -56,7 +63,6 @@ namespace WMS.BZServices.FJ
             predicate = predicate.AndIF(!string.IsNullOrEmpty(billBomsetgrpQueryDto?.IsStop), m => m.IsStop.Equals(billBomsetgrpQueryDto.IsStop));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(billBomsetgrpQueryDto?.IsDelete), m => m.IsDelete.Equals(billBomsetgrpQueryDto.IsDelete));
 
-
             var sugarQueryable = _billBomsetgrpRepository.Queryable().Where(predicate.ToExpression());
             return sugarQueryable;
         }
@@ -71,7 +77,7 @@ namespace WMS.BZServices.FJ
         {
             var predicate = Expressionable.Create<BillBomsetinfo>();
             predicate = predicate.AndIF(bomSetHdrId > 0, m => m.BomSetHdrId.Equals(bomSetHdrId));
-            var list = _billBomsetinfoRepository.Queryable().Where(predicate.ToExpression()).ToList().OrderBy(o =>Convert.ToInt32( o.XYNo)).Adapt<List<BillBomsetinfoDto>>();
+            var list = _billBomsetinfoRepository.Queryable().Where(predicate.ToExpression()).ToList().OrderBy(o => Convert.ToInt32(o.XYNo)).Adapt<List<BillBomsetinfoDto>>();
             return list;
         }
 
@@ -82,7 +88,7 @@ namespace WMS.BZServices.FJ
             {
                 throw BZSysExCore.ThrowFailException("不存在的跺型!");
             }
-            var bomsetinfos = _billBomsetinfoRepository.Queryable().Where(o => o.BomSetHdrId == bomset.Id && o.IsEmpty==0).ToList();
+            var bomsetinfos = _billBomsetinfoRepository.Queryable().Where(o => o.BomSetHdrId == bomset.Id && o.IsEmpty == 0).ToList();
             var dto = bomset.Adapt<BillBomsetDto>();
             dto.Bomsetinfos = bomsetinfos.Adapt<List<BillBomsetinfoDto>>();
             return dto;
@@ -171,7 +177,7 @@ namespace WMS.BZServices.FJ
             //{
             //    throw BZSysExCore.ThrowFailException("产出物料编码不存在!");
             //}
-             var baseMatinfos = _billBominfoRepository.Queryable().Where(o => o.IsDelete == 0 && o.IsStop == 0 && infoMatCodes.Contains(o.MatCode)).ToList();
+            var baseMatinfos = _billBominfoRepository.Queryable().Where(o => o.IsDelete == 0 && o.IsStop == 0 && infoMatCodes.Contains(o.MatCode)).ToList();
             //foreach (var item in infoMatCodes)
             //{
             //    if (baseMatinfos.Where(o => o.MatCode == item).Select(o => o.ProCode).Distinct().Count() > 1)
@@ -198,7 +204,6 @@ namespace WMS.BZServices.FJ
                 //    throw BZSysExCore.ThrowFailException("投料信息已存在于其他跺型!");
                 //}
 
-
                 //billBomsetgrpEntity.ShortCode = GetShoreCodes();
                 //if (billBomsetgrpEntity.ShortCode <= 0)
                 //{
@@ -233,7 +238,6 @@ namespace WMS.BZServices.FJ
                     billBomsetgrpEntity.EditTime = DateTime.Now;
                     billBomsetgrpEntity.BomCode = String.Join("|", billBomsetinfos.Where(o => !string.IsNullOrEmpty(o.MatCode)).Select(o => o.MatCode).Distinct().ToArray());
 
-
                     billBomsetgrpEntity.IsStop = 1;
                     _billBomsetgrpRepository.Insert(billBomsetgrpEntity);
                     billBomsetinfos.ToList().ForEach(o =>
@@ -293,7 +297,6 @@ namespace WMS.BZServices.FJ
                 {
                     billBomsetgrpEntity.Id = bomsetgrpId;
 
-
                     //if (_billBomsetgrpRepository.Queryable().Any(x => x.Id != bomsetgrpId && (x.Code == billBomsetgrpEntity.Code || x.Name == billBomsetgrpEntity.Name) && x.IsStop == 0))
                     //{
                     //    throw BZSysExCore.ThrowFailException("跺型已存在!");
@@ -302,15 +305,11 @@ namespace WMS.BZServices.FJ
                     billBomsetgrpEntity.HWCountQty = billBomsetinfos.Count(o => o.IsEmpty == 0);
                     billBomsetgrpEntity.BomCode = String.Join("|", billBomsetinfos.Where(o => !string.IsNullOrEmpty(o.MatCode)).Select(o => o.MatCode).Distinct().ToArray());
 
-
                     billBomsetgrpEntity.EditWho = loginUser.UserNo;
                     billBomsetgrpEntity.EditTime = DateTime.Now;
                     billBomsetgrpEntity.IsStop = 1;
                     _billBomsetgrpRepository.UpdateEntity(billBomsetgrpEntity);
 
-
-
-
                     _billBomsetinfoRepository.Deleteable().Where(it => it.BomSetHdrId == billBomsetgrpEntity.Id).ExecuteCommand();
                     billBomsetinfos.ToList().ForEach(o =>
                     {
@@ -357,7 +356,6 @@ namespace WMS.BZServices.FJ
                 throw BZSysExCore.ThrowFailException("跺型短编码不正确!");
             }
 
-
             var infoMatCodes = billBomsetinfos.Select(o => o.MatCode).Distinct().ToList();
             // var duplicates = infoMatCodes.GroupBy(x => x).Where(g => g.Count() > 1).ToDictionary(x => x.Key, x => x.Count());
             //var hasDuplicates = infoMatCodes.GroupBy(x => x).Any(g => g.Count() > 1);
@@ -371,8 +369,8 @@ namespace WMS.BZServices.FJ
             {
                 throw BZSysExCore.ThrowFailException("投料信息不存在!");
             }
-            //在Bill_BomInfo 中MatCode不存在2个ProCode中 
-             var baseMatinfos = _billBominfoRepository.Queryable().Where(o => o.IsDelete == 0 && o.IsStop == 0 && infoMatCodes.Contains(o.MatCode)).ToList();
+            //在Bill_BomInfo 中MatCode不存在2个ProCode中
+            var baseMatinfos = _billBominfoRepository.Queryable().Where(o => o.IsDelete == 0 && o.IsStop == 0 && infoMatCodes.Contains(o.MatCode)).ToList();
             //foreach (var item in infoMatCodes)
             //{
             //    if (baseMatinfos.Where(o => o.MatCode == item).Select(o => o.ProCode).Distinct().Count() > 1)
@@ -452,7 +450,6 @@ namespace WMS.BZServices.FJ
                     billBomsetgrpEntity.IsStop = 1;
                     billBomsetgrpEntity.BomCode = String.Join("|", billBomsetinfos.Where(o => !string.IsNullOrEmpty(o.MatCode)).Select(o => o.MatCode).Distinct().ToArray());
 
-
                     _billBomsetgrpRepository.Insert(billBomsetgrpEntity);
                     //_billBomsetinfoRepository.Deleteable().Where(it => it.BomSetHdrId == billBomsetgrpEntity.Id).ExecuteCommand();
                     billBomsetinfos.ToList().ForEach(o =>
@@ -477,7 +474,6 @@ namespace WMS.BZServices.FJ
                         o.IsStop = 1;
                     });
                     _billBomsetinfoRepository.Insert(billBomsetinfos.ToList());
-
                 });
             }
             else
@@ -517,7 +513,7 @@ namespace WMS.BZServices.FJ
                     billBomsetgrpEntity.EditWho = loginUser.UserNo;
                     billBomsetgrpEntity.EditTime = DateTime.Now;
                     billBomsetgrpEntity.IsStop = 1;
-                    billBomsetgrpEntity.BomCode = String.Join("|", billBomsetinfos.Where(o=>!string.IsNullOrEmpty(o.MatCode)).Select(o => o.MatCode).Distinct().ToArray());
+                    billBomsetgrpEntity.BomCode = String.Join("|", billBomsetinfos.Where(o => !string.IsNullOrEmpty(o.MatCode)).Select(o => o.MatCode).Distinct().ToArray());
 
                     _billBomsetgrpRepository.UpdateEntity(billBomsetgrpEntity);
 
@@ -742,19 +738,16 @@ namespace WMS.BZServices.FJ
         // Function to return the missing element
         public static int findMissing(int[] arr, int n)
         {
-
             int l = 0, h = n - 1;
             int mid;
 
             while (h > l)
             {
-
                 mid = l + (h - l) / 2;
 
                 // Check if middle element is consistent
                 if (arr[mid] - mid == arr[0])
                 {
-
                     // No inconsistency till middle elements
                     // When missing element is just after
                     // the middle element
@@ -762,14 +755,12 @@ namespace WMS.BZServices.FJ
                         return arr[mid] + 1;
                     else
                     {
-
                         // Move right
                         l = mid + 1;
                     }
                 }
                 else
                 {
-
                     // Inconsistency found
                     // When missing element is just before
                     // the middle element
@@ -777,7 +768,6 @@ namespace WMS.BZServices.FJ
                         return arr[mid] - 1;
                     else
                     {
-
                         // Move left
                         h = mid - 1;
                     }
@@ -797,7 +787,6 @@ namespace WMS.BZServices.FJ
             }
             _billBomsetgrpRepository.Deleteable().Where(it => it.Id == entity.Id).ExecuteCommand();
             _billBomsetinfoRepository.Deleteable().Where(it => it.BomSetHdrId == entity.Id).ExecuteCommand();
-
         }
 
         public void Deletes(string[] ids, string userId)
@@ -828,7 +817,6 @@ namespace WMS.BZServices.FJ
             //    o.EditTime = DateTime.Now;
             //});
             //var result = _billBomsetgrpRepository.UpdateRange(list.ToArray());
-
         }
 
         public void DeleteByCode(string code)
@@ -840,11 +828,10 @@ namespace WMS.BZServices.FJ
             }
             _billBomsetgrpRepository.Deleteable().Where(it => it.Id == entity.Id).ExecuteCommand();
             _billBomsetinfoRepository.Deleteable().Where(it => it.BomSetHdrId == entity.Id).ExecuteCommand();
-
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="Ids">跺型编号</param>
         /// <param name="locationStop">是否</param>
@@ -874,13 +861,12 @@ namespace WMS.BZServices.FJ
             {
                 throw new ArgumentException("没有选择跺型数据！");
             }
-            //启用 
+            //启用
             if (locationStop == LocationStop.LocationInvoke)
             {
                 var infoMatCodes = infos.Select(o => o.MatCode).Distinct().ToList();
                 foreach (var item in billBomsetgrplist)
                 {
-
                     if (_billBomsetgrpRepository.Queryable().Any(o => o.Id != item.Id && o.IsDelete == 0 && o.IsStop == 0 && o.BomCode == item.BomCode))
                     {
                         throw BZSysExCore.ThrowFailException("投料信息已存在于其他跺型!");
@@ -912,7 +898,7 @@ namespace WMS.BZServices.FJ
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="typenum">1为09的跺型。</param>
         /// <returns></returns>
@@ -921,8 +907,6 @@ namespace WMS.BZServices.FJ
             return typenum == "1"
                 ? _billBomsetgrpRepository.Queryable().Where(o => o.IsStop == 0 && o.StampType == 1).ToList().Select(o => new { id = o.Code.ToString(), text = o.Name })
                 : _billBomsetgrpRepository.Queryable().Where(o => o.IsStop == 0 && o.StampType != 1).ToList().Select(o => new { id = o.Code.ToString(), text = o.Name });
-
         }
-
     }
-}
+}

WMS.BZWeb/Areas/FJManager/Controllers/BillBomSetController.cs

@@ -54,6 +54,11 @@ namespace WMS.BZWeb.Areas.FJManager.Controllers
         {
             return View();
         }
+
+        public IActionResult PaiKu()
+        {
+            return View();
+        }
         #endregion
 
         public ActionResult GetPageList(string pagination, string queryJson)
@@ -77,6 +82,27 @@ namespace WMS.BZWeb.Areas.FJManager.Controllers
             return Success(jsonData);
         }
 
+        public ActionResult GetPaiKuList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = InitPagination(pagination);
+            var query = new BillPaiKuDto();
+            if (!string.IsNullOrEmpty(queryJson))
+            {
+                query = JsonConvert.DeserializeObject<BillPaiKuDto>(queryJson);
+            }
+
+            var lists = _billBomSetService.GetPageList(paginationobj, query ?? new BillPaiKuDto());
+
+            var jsonData = new
+            {
+                rows = lists.Result,
+                total = lists.TotalPage,
+                page = lists.PageIndex,
+                records = lists.TotalNum
+            };
+            return Success(jsonData);
+        }
+
         public ActionResult GetBillBomSetInfoItem(string bomSetHdrId)
         {
             if (string.IsNullOrWhiteSpace(bomSetHdrId))

WMS.BZWeb/Areas/FJManager/Views/BillBomSet/PaiKu.cshtml

@@ -0,0 +1,77 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "跺型管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<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="Code" type="text" class="form-control" placeholder="请输入查询编号" />
+                                </div>
+                                <div class="col-xs-4 lr-form-item">
+                                    <div class="lr-form-item-title">名称</div>
+                                    <input id="Name" type="text" class="form-control" placeholder="请输入查询名称" />
+                                </div>
+                                <div class="col-xs-4 lr-form-item">
+                                    <div class="lr-form-item-title">短编号</div>
+                                    <input id="ShortCode" type="text" class="form-control" placeholder="请输入查询短编号" />
+                                </div>
+
+                                <div class="col-xs-4 lr-form-item">
+                                    <div class="lr-form-item-title">帘线物料</div>
+                                    <input id="ProMaterCode" type="text" class="form-control" placeholder="请输入查询帘线物料编码" />
+                                </div>
+                                <div class="col-xs-4 lr-form-item">
+                                    <div class="lr-form-item-title">投料物料</div>
+                                    <input id="BomCode" type="text" class="form-control" placeholder="请输入查询投料物料编码" />
+                                </div>                             
+                                <div class="col-xs-2 lr-form-item">
+                                    <div class="lr-form-item-title">是否禁用</div>
+                                    <div class="checkbox">
+                                        <label>
+                                            <input id="IsStop" type="checkbox" />
+                                            是
+                                        </label>
+                                    </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;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_search" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                        <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>
+                        @*<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>*@
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/FJManager/Views/BillBomSet/PaiKu.js") 

WMS.BZWeb/Areas/FJManager/Views/BillBomSet/PaiKu.js

@@ -0,0 +1,430 @@
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectRowsData;
+    var psuid = "";
+    var urls = [{ "url": "/FJManager/BillBomSet/DFM1509", "name": "DFM1509", "width": 744, "height": 690 },
+    { "url": "/FJManager/BillBomSet/DOF2", "name": "DOF2", "width": 920, "height": 676 },
+    { "url": "/FJManager/BillBomSet/DOF4", "name": "DOF4", "width": 920, "height": 676 },
+    { "url": "/FJManager/BillBomSet/DFM6", "name": "DFM6", "width": 920, "height": 676 },
+    { "url": "/FJManager/BillBomSet/DFM09", "name": "DFM9", "width": 940, "height": 676 },
+    { "url": "/FJManager/BillBomSet/Exception", "name": "Exception", "width": 920, "height": 676 },
+    { "url": "/FJManager/BillBomSet/DFMAll", "name": "DFMAll", "width": 920, "height": 676 },];
+    var page = {
+        init: function () {
+            page.bind();
+            page.initGird();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                // 调用后台查询
+                // queryJson 查询条件
+                console.log(queryJson);
+
+                queryJson["Code"] = $("#Code").val();
+                queryJson["Name"] = $("#Name").val();
+                queryJson["ShortCode"] = $("#ShortCode").val();
+                queryJson["ProMaterCode"] = $("#ProMaterCode").val();
+                queryJson["BomCode"] = $("#BomCode").val();
+
+                if ($("#IsStop").is(":checked")) {
+                    queryJson["IsStop"] = '1';
+                } else {
+                    queryJson["IsStop"] = '';
+                }
+
+                queryJson["StampType"] = stampType;
+                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(), StampType: stampType }) });
+            });
+
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增' + urls[parseInt(stampType) - 1].name,
+                    url: top.$.rootUrl + urls[parseInt(stampType) - 1].url,
+                    width: urls[parseInt(stampType) - 1].width,
+                    height: urls[parseInt(stampType) - 1].height,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                let editSelRows = $('#gridtable').jfGridGet("rowdata");
+                if (editSelRows.length == 0) {
+                    learun.alert.error('未选择行！');
+                    return false;
+                }
+                if (editSelRows.length > 1) {
+                    learun.alert.error('选择了多行！');
+                    return false;
+                }
+
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑' + urls[parseInt(stampType) - 1].name,
+                        url: top.$.rootUrl + urls[parseInt(stampType) - 1].url + '?keyValue=' + keyValue,
+                        width: urls[parseInt(stampType) - 1].width,
+                        height: urls[parseInt(stampType) - 1].height,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+            $("#lr_search").on('click', function () {
+                let editSelRows = $('#gridtable').jfGridGet("rowdata");
+                if (editSelRows.length == 0) {
+                    learun.alert.error('未选择行！');
+                    return false;
+                }
+                if (editSelRows.length > 1) {
+                    learun.alert.error('选择了多行！');
+                    return false;
+                }
+
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看' + urls[parseInt(stampType) - 1].name,
+                        btn: ['关闭'],
+                        url: top.$.rootUrl + urls[parseInt(stampType) - 1].url + '?keyValue=' + keyValue,
+                        width: urls[parseInt(stampType) - 1].width,
+                        height: urls[parseInt(stampType) - 1].height,
+                        callBack: function (id) {
+                            return true;
+                            //return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                selectRowsData = $('#gridtable').jfGridGet("rowdata");
+
+                if (selectRowsData.length == 0) {
+                    learun.alert.error('未选择行！');
+                    return false;
+                }
+                var keyValue = selectRowsData.map((item) => item.Id);
+
+                //var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/FJManager/BillBomSet/Deletes', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行！');
+                    return false;
+                }
+                if (postData.length > 1) {
+                    learun.alert.error('启用只能选择一条数据！');
+                    return false;
+                }
+                learun.layerConfirm('是否确认启用该跺型！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/FJManager/BillBomSet/Enables', { ids: JSON.stringify(postData.map((item) => item.Id)) }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 禁用
+            $('#lr_disable').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 + '/FJManager/BillBomSet/Disables', { ids: JSON.stringify(postData.map((item) => item.Id)) }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/FJManager/BillBomSet/GetPaiKuList',
+                headData: [
+                    { label: '垛型编码', name: 'Code', width: 160, align: 'left' },
+                    { label: '垛型名称', name: 'Name', width: 160, align: 'left' },
+                    { label: '短编号', name: 'ShortCode', width: 50, align: 'left' },
+                    { label: '帘线物料编码', name: 'ProMaterCode', width: 100, align: 'left' },
+                    { label: '投料物料编码', name: 'ProCode', width: 180, align: 'left' },
+                    { label: '实际物料编码', name: 'BomCode', width: 180, align: 'left' },
+                    //{
+                    //    label: '投料物料名称', name: 'BomCode', width: 180, align: 'left', formatterAsync: function (callback, value, row) {
+                    //        learun.httpAsync('GET', top.$.rootUrl + '/FJManager/BillBomInfo/GetList', { queryJson: JSON.stringify({ Code: value }) }, function (res) {
+                    //            if (res.code > 0 && res.data.length > 0) {
+                    //                callback(res.data[0].Name);
+                    //            }
+                    //        });
+                    //    },
+                    //},
+                    { label: '工字轮个数', name: 'HWCountQty', width: 70, align: 'left' },
+                    {
+                        label: '托盘类型', name: 'TpTypeCode', width: 60, align: 'left', formatter: function (cellvalue) {
+                            if (cellvalue == '1') {
+                                return '<span class=\"label label-success\"  >09</span>';
+                            } else if (cellvalue == '2') {
+                                return '<span class=\"label  label-default\" >非09</span>';
+                            } else {
+                                return '<span class=\"label  label-default\" >未知</span>';
+                            }
+                        }
+                    },
+                    { label: '层数', name: 'LayerCountQty', width: 40, align: 'left' },
+                    learun.jfFormatter.col_ISSTOP(),
+                    //{
+                    //    label: '是否删除', name: 'IsDelete', width: 60, align: "center"
+                    //    , formatter: function (cellvalue) {
+                    //        if (cellvalue == 0) {
+                    //            return '<span class=\"label label-success\"  >正常</span>';
+                    //        } else if (cellvalue == 1) {
+                    //            return '<span class=\"label  label-default\" >删除</span>';
+                    //        } else {
+                    //            return '<span class=\"label  label-default\" >未知</span>';
+                    //        }
+                    //    }
+                    //},
+                    {
+                        label: '子类型', name: 'StampChildType', width: 120, align: 'left', formatter: function (cellvalue, item) {
+                            if (item.StampType == '2') {
+                                if (cellvalue == '1') {
+                                    return '<span class=\"label label-default\"  >DOF2-01</span>';
+                                } else if (cellvalue == '2') {
+                                    return '<span class=\"label  label-default\" >DOF2-02</span>';
+                                } else if (cellvalue == '3') {
+                                    return '<span class=\"label  label-default\" >DOF2-03</span>';
+                                } else if (cellvalue == '4') {
+                                    return '<span class=\"label  label-default\" >DOF2-04</span>';
+                                } else if (cellvalue == '5') {
+                                    return '<span class=\"label  label-default\" >DOF2-05</span>';
+                                }
+                            }
+                            if (item.StampType == '3') {
+                                if (cellvalue == '1') {
+                                    return '<span class=\"label label-default\"  >DOF4-01</span>';
+                                } else if (cellvalue == '2') {
+                                    return '<span class=\"label  label-default\" >DOF4-02</span>';
+                                } else if (cellvalue == '3') {
+                                    return '<span class=\"label  label-default\" >DOF4-03</span>';
+                                } else if (cellvalue == '4') {
+                                    return '<span class=\"label  label-default\" >DOF4-04</span>';
+                                } else if (cellvalue == '5') {
+                                    return '<span class=\"label  label-default\" >DOF4-05</span>';
+                                } else if (cellvalue == '6') {
+                                    return '<span class=\"label  label-default\" >DOF4-06</span>';
+                                } else if (cellvalue == '7') {
+                                    return '<span class=\"label  label-default\" >DOF4-07</span>';
+                                }
+                            }
+                            else if (item.StampType == '4') {
+                                if (cellvalue == '1') {
+                                    return '<span class=\"label label-default\"  >DFM6-01</span>';
+                                } else if (cellvalue == '2') {
+                                    return '<span class=\"label  label-default\" >DFM6-02</span>';
+                                } else if (cellvalue == '3') {
+                                    return '<span class=\"label  label-default\" >DFM6-03</span>';
+                                } else if (cellvalue == '4') {
+                                    return '<span class=\"label  label-default\" >DFM6-04</span>';
+                                } else if (cellvalue == '5') {
+                                    return '<span class=\"label  label-default\" >DFM6-05</span>';
+                                } else if (cellvalue == '6') {
+                                    return '<span class=\"label  label-default\" >DFM6-06</span>';
+                                } else if (cellvalue == '7') {
+                                    return '<span class=\"label  label-default\" >DFM6-07</span>';
+                                } else if (cellvalue == '8') {
+                                    return '<span class=\"label  label-default\" >DFM6-08</span>';
+                                } else if (cellvalue == '9') {
+                                    return '<span class=\"label  label-default\" >DFM6-09</span>';
+                                }
+                            } else if (item.StampType == '5') {
+                                if (cellvalue == '1') {
+                                    return '<span class=\"label label-default\"  >DFM9-01</span>';
+                                } else if (cellvalue == '2') {
+                                    return '<span class=\"label  label-default\" >DFM9-02</span>';
+                                } else if (cellvalue == '3') {
+                                    return '<span class=\"label  label-default\" >DFM9-03</span>';
+                                } else if (cellvalue == '4') {
+                                    return '<span class=\"label  label-default\" >DFM9-04</span>';
+                                } else if (cellvalue == '5') {
+                                    return '<span class=\"label  label-default\" >DFM9-05</span>';
+                                } else if (cellvalue == '6') {
+                                    return '<span class=\"label  label-default\" >DFM9-06</span>';
+                                } else if (cellvalue == '7') {
+                                    return '<span class=\"label  label-default\" >DFM9-07</span>';
+                                } else if (cellvalue == '8') {
+                                    return '<span class=\"label  label-default\" >DFM9-08</span>';
+                                } else if (cellvalue == '9') {
+                                    return '<span class=\"label  label-default\" >DFM9-09</span>';
+                                }
+                            }
+                            else if (item.StampType == '6') {
+                                if (cellvalue == '1') {
+                                    return '<span class=\"label label-default\"  >WS34芯股--异常</span>';
+                                } else if (cellvalue == '2') {
+                                    return '<span class=\"label  label-default\" >WS18--异常</span>';
+                                } else if (cellvalue == '3') {
+                                    return '<span class=\"label  label-default\" >WS50--异常</span>';
+                                } else if (cellvalue == '4') {
+                                    return '<span class=\"label  label-default\" >WS09--异常</span>';
+                                }
+                            }
+                            else {
+                                return '<span class=\"label label-default\"  >无</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: '是否桁架码垛', name: 'IsTruss', width: 80, align: 'left', formatter: function (cellvalue) {
+                            if (cellvalue == 1) {
+                                return '<span class=\"label label-success\"  >是</span>';
+                            } else if (cellvalue === '') {
+                                return '<span class=\"label  label-default\" >未知</span>';
+                            } else if (cellvalue === 0) {
+                                return '<span class=\"label  label-info\" >否</span>';
+                            } else {
+                                return '<span class=\"label  label-default\" >未知</span>';
+                            }
+                        }
+                    },
+
+                    learun.jfFormatter.col_AddWho(),
+                    learun.jfFormatter.col_AddTime(),
+                    learun.jfFormatter.col_EditWho(),
+                    learun.jfFormatter.col_EditTime(),
+                    learun.jfFormatter.col_MEMO()
+                ],
+                mainId: 'Code',
+                isPage: true,
+                isMultiselect: true,
+                reloadSelected: true,
+                sidx: 'Code',
+                isSubGrid: true,             // 是否有子表
+                subGridExpanded: function (subid, rowdata) {
+                    psuid = subid;
+                    $('#' + subid).jfGrid({
+                        url: top.$.rootUrl + '/FJManager/BillBomSet/GetPaiKuList',
+                        headData: [
+                            { label: '编号', name: 'XYNo', width: 40, align: 'left' },
+                            { label: '行', name: 'Row', width: 40, align: 'left' },
+                            { label: '物料编码', name: 'MatCode', width: 200, align: 'left' },
+                            { label: '物料Id', name: 'MatId', width: 150, align: 'left' },
+                            {
+                                label: '有/无', name: 'IsEmpty', width: 60, align: 'left', formatter: function (cellvalue) {
+                                    if (cellvalue == '0') {
+                                        return '<span class=\"label label-success\"  >有</span>';
+                                    } else if (cellvalue == '1') {
+                                        return '<span class=\"label  label-default\" >无</span>';
+                                    } else {
+                                        return '<span class=\"label  label-default\" >未知</span>';
+                                    }
+                                }
+                            },
+                            {
+                                label: '正/反面', name: 'SideNum', width: 70, align: 'left', formatter: function (cellvalue) {
+                                    if (cellvalue == '1') {
+                                        return '<span class=\"label label-success\"  >正面朝上</span>';
+                                    } else if (cellvalue == '2') {
+                                        return '<span class=\"label  label-default\" >反面朝上</span>';
+                                    } else {
+                                        return '<span class=\"label  label-default\" >未知</span>';
+                                    }
+                                }
+                            },
+                            { label: '工字轮型号', name: 'SpoolType', width: 80, align: 'left' },
+                            {
+                                label: '单/双丝', name: 'SilkType', width: 80, align: 'left', formatter: function (cellvalue) {
+                                    if (cellvalue == '1') {
+                                        return '<span class=\"label label-success\"  >单丝</span>';
+                                    } else if (cellvalue == '2') {
+                                        return '<span class=\"label  label-default\" >双丝</span>';
+                                    } else if (cellvalue == '3') {
+                                        return '<span class=\"label  label-default\" >三丝</span>';
+                                    }
+                                    else {
+                                        return '<span class=\"label  label-default\" >未知</span>';
+                                    }
+                                }
+                            },
+                            { label: '钢丝直径上限', name: 'SilkDiam', width: 100, align: 'left' },
+                            /* { label: '钢丝直径上限', name: 'SilkDiamMaxCount', width: 100, align: 'left' },*/
+                            { label: '数量上限', name: 'QtyMaxCount', width: 100, align: 'left' },
+                            {
+                                label: '是否芯股', name: 'IsCore', width: 100, align: 'left', formatter: function (cellvalue) {
+                                    if (cellvalue == '1') {
+                                        return '<span class=\"label label-success\"  >是</span>';
+                                    } else if (cellvalue == '2') {
+                                        return '<span class=\"label  label-default\" >否</span>';
+                                    }
+                                    else {
+                                        return '<span class=\"label  label-default\" >未知</span>';
+                                    }
+                                }
+                            },
+                            {
+                                label: '是混合行', name: 'IsMixRow', width: 100, align: 'left', formatter: function (cellvalue) {
+                                    if (cellvalue == '1') {
+                                        return '<span class=\"label label-success\"  >是</span>';
+                                    } else if (cellvalue == '0') {
+                                        return '<span class=\"label  label-default\" >否</span>';
+                                    }
+                                    else {
+                                        return '<span class=\"label  label-default\" >未知</span>';
+                                    }
+                                }
+                            },
+                            { label: '混合料行编码', name: 'MixRowCode', width: 100, align: 'left' },
+                            learun.jfFormatter.col_ISSTOP(),
+                        ]
+                    });
+                    $('#' + subid).jfGridSet('reloadSon', { bomSetHdrId: rowdata.Id });
+                },
+            });
+            page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val(), StampType: stampType }) });
+        },
+        search: function (param) {
+            $('#gridtable').jfGridSet('reload', param);
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

WMS.BZWeb/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WMS.BZWeb.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WMS.BZWeb.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

WMS.BZWeb/Properties/Resources.resx

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>

WMS.BZWeb/Properties/launchSettings.json

@@ -6,7 +6,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://*:5012",
+      "applicationUrl": "http://127.0.0.1:8086",
       "hotReloadEnabled": false
     },
     "IIS Express": {
@@ -18,11 +18,11 @@
     }
   },
   "iisSettings": {
-    "windowsAuthentication": false,
+    "windowsAuthentication": true,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://*:60678",
-      "sslPort": 44376
+      "applicationUrl": "http://127.0.0.1:8086",
+      "sslPort": 0
     }
   }
 }

WMS.BZWeb/WMS.BZWeb.csproj

@@ -119,6 +119,10 @@
     </Content>
     <Content Include="Areas\CPManager\Views\Inventorys\FailForm.js" />
     <Content Include="Areas\FJManager\Views\BillBomSet\DFMAll.js" />
+    <Content Include="Areas\FJManager\Views\BillBomSet\PaiKu.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Include="Areas\FJManager\Views\DeviceEffectives\IndexList.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
@@ -159,6 +163,14 @@
     <Content Include="Areas\SXManager\Views\SysCon\PalletizingStationIndex.js" />
   </ItemGroup>
 	
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+	
   <ItemGroup>
     <Content Update="Areas\CPManager\Views\BillInventoryReport\Index.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -168,6 +180,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
+    <Content Update="Areas\FJManager\Views\BillBomSet\PaiKu.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Update="Areas\FJManager\Views\DeviceEffectives\IndexList.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
@@ -190,6 +206,19 @@
     </Content>
   </ItemGroup>
 	
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+	
+  <ItemGroup>
+    <None Update="Properties\launchSettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+	
    
 	
  

WMS.BZWeb/appsettings.json

@@ -8,10 +8,10 @@
 
   "AllowedHosts": "*",
   "ServerOp": {
-    "dbConn": "Server=127.0.0.1;user id=sa;password=Bz123456;database=adms_core;",
+    "dbConn": "Server=127.0.0.1;user id=sa;password=7166766;database=adms_core;",
     "DbType": "SqlServer", //SqlServer,Oracle,MySql
     "RedisPrev": "admscore",
-    "RedisExchangeHosts": "127.0.0.1:6379,password=redis.learun.com,allowadmin=true",
+    "RedisExchangeHosts": "127.0.0.1:6379,password=7166766,allowadmin=true",
     "VirtualPath": "",
     "UItheme": "AdminDefault,AdminAccordion,AdminWindows,AdminTop", //AdminDefault,AdminAccordion,AdminWindows,AdminTop 框架提供4个风格界面，可通过配置确定想要的风格
 
@@ -38,8 +38,8 @@
     "AReportsUrl": "" // 报表服务地址
   },
   "RedisConfigs": {
-    "WriteServerList": "127.0.0.1:6379,defaultDatabase=9",
-    "ReadServerList": "127.0.0.1:6379,defaultDatabase=15",
+    "WriteServerList": "127.0.0.1:6379,password=7166766,defaultDatabase=9",
+    "ReadServerList": "127.0.0.1:6379,password=7166766,defaultDatabase=15",
     "MaxWritePoolSize": 60,
     "MaxReadPoolSize": 60,
     "AutoStart": "true",
@@ -49,37 +49,37 @@
   "ConnectionConfigs": {
     "Connections": [
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT_01HJ",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01PT",
         "DataBaseType": 1,
         "ConfigId": "pt",
         "IsAutoCloseConnection": true
       },
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT_01HJ",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01PT",
         "DataBaseType": 1,
         "ConfigId": "hj",
         "IsAutoCloseConnection": true
       },
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT_01HJ",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01FJ",
         "DataBaseType": 1,
         "ConfigId": "fj",
         "IsAutoCloseConnection": true
       },
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT_01HJ",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01PT",
         "DataBaseType": 1,
         "ConfigId": "sx",
         "IsAutoCloseConnection": true
       },
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT_01HJ",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT_01PT",
         "DataBaseType": 1,
         "ConfigId": "cp",
         "IsAutoCloseConnection": true
       },
       {
-        "ConnectionString": "Data Source=118.178.107.197;User ID=bz;Password=123456;Initial Catalog=WMS_ZT",
+        "ConnectionString": "Data Source=ZLH;User ID=sa;Password=7166766;Initial Catalog=WMS_ZT",
         "DataBaseType": 1,
         "ConfigId": "usercenter",
         "IsAutoCloseConnection": true
@@ -127,4 +127,4 @@
     "SXRedis": "127.0.0.1:6379,database=12,poolsize=50,connectTimeout=5000,syncTimeout=10000",
     "CPRedis": "127.0.0.1:6379,database=11,poolsize=50,connectTimeout=5000,syncTimeout=10000"
   }
-}
+}

WMS.BZWeb/libman.json

@@ -0,0 +1,5 @@
+{
+  "version": "3.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
+}