JC24WMS.git - Gitblit

parent: 565d1f64 | 补丁 | 提交 | ignore whitespace

yuyou_x

2024-02-27 5418a5c0bc29235f4ea2bc0e7ee23b424366aa0b

15个文件已修改

	HTML/views/HouseWithinSetting/StockCheckLog.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/HouseWithinSetting/StockCheckSelectPallet.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SOSetting/ComBoxInfo.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/SOSetting/ExportAllot.html	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Area.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Exception.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/FlatLibraryLegend.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Locate.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Pallets.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Roadway.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/Warehouse.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/Controllers/BllCheckController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 HTML/views/HouseWithinSetting/StockCheckLog.html

@@ -78,7 +78,7 @@
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>搜索
                        </button>
                    </div>
                </div>
@@ -182,7 +182,6 @@
                laypage = layui.laypage,
                layer = layui.layer;
            var h1 = GetTableHeight();


            var TotalColsArr = 
                [[

 HTML/views/HouseWithinSetting/StockCheckSelectPallet.html

@@ -9,6 +9,14 @@
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <script>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function() {
			
            //获取table默认显示数
            pageCntFirst();
        });
      </script>
</head>

<body>
@@ -142,8 +150,9 @@
                    where: param,
                    id: 'goods-list',
                    page: true,
                    limit: pageCnt,
                    limits: pageLimits,
                    even: true,
                    limit: pageCnt,
                    limits: pageLimits,
                    cellMinWidth: 80, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                    cols: [
                    [

 HTML/views/SOSetting/ComBoxInfo.html

@@ -8,11 +8,11 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
        <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">

            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                    <div class="layui-form-item" style="margin-bottom: 0px;">
                        
                        <div class="layui-inline zongdan" >
@@ -30,6 +30,8 @@
                    </div>
                </div>
            </div>

            <div id="center"></div>

            <div class="layui-card-body">

@@ -54,6 +56,7 @@
                var $ = layui.$,
                    form = layui.form,
                    layer = layui.layer;
                var h1 = GetTableHeight();
                var boxNo = getQueryString('BoxNo');
                if (!boxNo)
                {
@@ -94,7 +97,7 @@
                // 表单需要的变量
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-98',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

 HTML/views/SOSetting/ExportAllot.html

@@ -23,11 +23,11 @@
    <link rel="stylesheet" href="../../css/public.css" media="all">
</head>

<body>
<body id="body">

    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
                <div class="layui-form-item">

                    <div class="layui-inline">
@@ -120,10 +120,13 @@
            <div class="layui-card-body">
                <div>
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title">
                        <ul class="layui-tab-title" id="tab">
                            <li class="layui-this">托盘信息</li>
                            <li>箱码信息</li>
                        </ul>

                        <div id="center"></div>

                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -288,6 +291,8 @@
                layer = layui.layer,
                laydate = layui.laydate;
            var $ = layui.$;
            var h1 = GetTableTabHeight();
			
            // var h1 = GetTableTopHeight();
            // var h2 = GetTableBottomHeight(); 
            // laydate.render({
@@ -547,7 +552,7 @@
                        elem: '#LAY-app-content-list',
                        url: IP + "/BllSo/GetExportAllotList",
                        method: 'POST',
                        height: 'full-210',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType: 'application/json',
@@ -726,7 +731,7 @@
                        elem: '#LAY-app-content-list2',
                        url: IP + "/BllSo/GetCompleteDetailList",
                        method: 'POST',
                        height: 'full-206',
                        height: h1,
                        id: 'LAY-app-content-list2',
                        where: param,
                        contentType: 'application/json',

 HTML/views/WareHouseSetting/Area.html

@@ -17,11 +17,11 @@
            });
          </script>
    </head>
    <body>
    <body id="body">

        <div class="layui-fluid"style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 70px;">所属仓库</label>
@@ -73,6 +73,7 @@
                        </div>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                     <script type="text/html" id="buttonTpl">
@@ -110,6 +111,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;
                var $ = layui.$;
                var h1 = GetTableHeight();
                refreshTable("","","","");
                var tableIns;
                
@@ -143,7 +145,7 @@
                        elem: '#LAY-app-content-list',
                        url: IP +"/Sys/GetStorageAreaList",
                        method: 'POST',
                        height: 'full-95',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType:'application/json',

 HTML/views/WareHouseSetting/Exception.html

@@ -17,9 +17,9 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-card" style="padding-bottom: 0">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                <div class="layui-form-item" >
                    <div class="layui-inline">
                        <label class="layui-form-label">异常号</label>
@@ -79,6 +79,7 @@
                    </div>
                </div>
            </div>
            <div id="center"></div>
            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                <script type="text/html" id="table-content-list">
@@ -121,7 +122,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;

                    var h1 = GetTableHeight();
                    refreshTable("", "", "", "","","","");
                    var tableIns;

@@ -210,7 +211,7 @@
                }
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: 'full-130',
                    height: h1,
                    id: 'LAY-app-content-list',
                    page: true,
                    limit: pageCnt,

 HTML/views/WareHouseSetting/FlatLibraryLegend.html

@@ -3,7 +3,7 @@

<head>
    <meta charset="utf-8">
    <title>储位图例</title>
    <title>平库图例</title>
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">

 HTML/views/WareHouseSetting/Locate.html

@@ -18,11 +18,11 @@
            });
          </script>
    </head>
    <body>
    <body id="body">

        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">所属仓库</label>
@@ -117,6 +117,7 @@
                        </div>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
                    <script type="text/html" id="table-content-list">
@@ -147,6 +148,7 @@
                    layer = layui.layer,
                    $ = layui.$;
                    var houseid = 0;
                    var h1 = GetTableHeight();
                // 表单需要的变量
                var doing = true;
                active = { 
@@ -273,7 +275,7 @@
                console.log(where);
                var tableIns = table.render({
                    elem: '#LAY-app-content-list',
                    height: 'full-135',
                    height: h1,
                    id: 'LAY-app-content-list',
                    url: IP + "/Sys/GetStorageLocatList",
                    method: 'post',

 HTML/views/WareHouseSetting/Pallets.html

@@ -23,10 +23,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 70px;">托盘条码：</label>
@@ -56,6 +56,7 @@
                        </div>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                     
@@ -83,7 +84,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
				
                    var h1 = GetTableHeight();
                var isTrue= true; 
                 
                var where = {
@@ -92,7 +93,7 @@
                }
                var tableIns = table.render({
                    elem: '#LAY-app-content-list',
                    height: 'full-95',
                    height: h1,
                    id: 'LAY-app-content-list',
                    url: IP + "/Sys/GetPalletsList",
                    method: 'post',

 HTML/views/WareHouseSetting/Roadway.html

@@ -17,11 +17,11 @@
            });
          </script>
    </head>
    <body>
    <body id="body">

        <div class="layui-fluid"style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 70px;">所属仓库</label>
@@ -68,6 +68,7 @@
                        </div>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                     <script type="text/html" id="buttonTpl">
@@ -105,6 +106,7 @@
                    laypage = layui.laypage,
                    layer = layui.layer;
                // var $ = layui.$;
                var h1 = GetTableHeight();
                refreshTable("","","","");
                var tableIns;
                
@@ -143,7 +145,7 @@
                        elem: '#LAY-app-content-list',
                        url: IP +"/Sys/GetStorageRoadwayList",
                        method: 'POST',
                        height: 'full-95',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType:'application/json',

 HTML/views/WareHouseSetting/Warehouse.html

@@ -18,10 +18,10 @@
            });
          </script>
    </head>
    <body>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 56px;">仓库编码</label>
@@ -52,7 +52,7 @@
                        </div>
                    </div>
                </div>

                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    <script type="text/html" id="table-content-list">
@@ -77,6 +77,7 @@
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
                    var h1 = GetTableHeight();
                refreshTable("","","");
                var tableIns;

@@ -90,7 +91,7 @@
                        elem: '#LAY-app-content-list',
                        url: IP +"/Sys/GetWarehouseList",
                        method: 'POST',
                        height: 'full-95',
                        height: h1,
                        id: 'LAY-app-content-list',
                        where: param,
                        contentType:'application/json',

 Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs

@@ -46,7 +46,7 @@
    /// <summary>
    /// 查询库存明细（添加盘点明细时选择查询）
    /// </summary>
    public class GetStockDetailVm
    public class GetStockDetailVm : IndexPage
    {
        public string HouseNo { get; set; }
        public string RoadwayNo { get; set; }

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -143,7 +143,7 @@
        }

        //获取库存明细信息（盘点选择明细数据源）
        public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg)
        public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg, int page, int limit, out int count)
        {
            try
            {
@@ -158,7 +158,7 @@
                    .And(m => m.IsDel == "0" && m.SkuNo != "100099" && m.Status == "0")
                    .ToExpression();//注意 这一句 不能少


                var total = 0;
                var list = Db.Queryable<DataStockDetail>().Where(item).GroupBy(m => new { m.SkuNo, m.SkuName, m.Standard, m.LotNo, m.LotText, m.SupplierLot, m.LocatNo, m.PalletNo })
                    .Select(a => new StockDetailDto()
                    {
@@ -171,7 +171,8 @@
                        Qty = SqlFunc.AggregateSum(a.Qty),
                        LocatNo = a.LocatNo,
                        PalletNo = a.PalletNo
                    }).ToList();
                    }).ToOffsetPage(page, limit, ref total);
                count = total;

                return list;
            }

 Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs

@@ -45,7 +45,7 @@
        /// <param name="locateNo">储位号</param>
        /// <param name="msg">物料编码、名称、批次号</param>
        /// <returns></returns>
        List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg);
        List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg, int page, int limit, out int count);

        /// <summary>
        /// 获取编辑盘点单时信息

 Wms/Wms/Controllers/BllCheckController.cs

@@ -101,9 +101,9 @@
        {
            try
            {
                var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg);
                var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg, model.Page, model.Limit, out int count);

                return Ok(new { code = 0, count = bolls.Count, msg = "获取库存明细信息", data = bolls });
                return Ok(new { code = 0, count, msg = "获取库存明细信息", data = bolls });
            }
            catch (Exception e)
            {

			@@ -78,7 +78,7 @@
			<div class="layui-inline">
			<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
			lay-filter="LAY-app-contlist-search">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>搜索
			</button>
			</div>
			</div>
			@@ -182,7 +182,6 @@
			laypage = layui.laypage,
			layer = layui.layer;
			var h1 = GetTableHeight();


			var TotalColsArr =
			[[

			@@ -9,6 +9,14 @@
			<meta name="viewport"
			content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<script>
			// 这里是需要在页面渲染之前执行的代码
			document.addEventListener("DOMContentLoaded", function() {

			//获取table默认显示数
			pageCntFirst();
			});
			</script>
			</head>

			<body>
			@@ -142,8 +150,9 @@
			where: param,
			id: 'goods-list',
			page: true,
			limit: pageCnt,
			limits: pageLimits,
			even: true,
			limit: pageCnt,
			limits: pageLimits,
			cellMinWidth: 80, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
			cols: [
			[

			@@ -8,11 +8,11 @@
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">

			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item" style="margin-bottom: 0px;">

			<div class="layui-inline zongdan" >
			@@ -30,6 +30,8 @@
			</div>
			</div>
			</div>

			<div id="center"></div>

			<div class="layui-card-body">

			@@ -54,6 +56,7 @@
			var $ = layui.$,
			form = layui.form,
			layer = layui.layer;
			var h1 = GetTableHeight();
			var boxNo = getQueryString('BoxNo');
			if (!boxNo)
			{
			@@ -94,7 +97,7 @@
			// 表单需要的变量
			var infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-98',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,

			@@ -23,11 +23,11 @@
			<link rel="stylesheet" href="../../css/public.css" media="all">
			</head>

			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item">

			<div class="layui-inline">
			@@ -120,10 +120,13 @@
			<div class="layui-card-body">
			<div>
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">托盘信息</li>
			<li>箱码信息</li>
			</ul>

			<div id="center"></div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -288,6 +291,8 @@
			layer = layui.layer,
			laydate = layui.laydate;
			var $ = layui.$;
			var h1 = GetTableTabHeight();

			// var h1 = GetTableTopHeight();
			// var h2 = GetTableBottomHeight();
			// laydate.render({
			@@ -547,7 +552,7 @@
			elem: '#LAY-app-content-list',
			url: IP + "/BllSo/GetExportAllotList",
			method: 'POST',
			height: 'full-210',
			height: h1,
			id: 'LAY-app-content-list',
			where: param,
			contentType: 'application/json',
			@@ -726,7 +731,7 @@
			elem: '#LAY-app-content-list2',
			url: IP + "/BllSo/GetCompleteDetailList",
			method: 'POST',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list2',
			where: param,
			contentType: 'application/json',

			@@ -17,11 +17,11 @@
			});
			</script>
			</head>
			<body>
			<body id="body">

			<div class="layui-fluid"style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 70px;">所属仓库</label>
			@@ -73,6 +73,7 @@
			</div>
			</div>
			</div>
			<div id="center"></div>
			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			<script type="text/html" id="buttonTpl">
			@@ -110,6 +111,7 @@
			laypage = layui.laypage,
			layer = layui.layer;
			var $ = layui.$;
			var h1 = GetTableHeight();
			refreshTable("","","","");
			var tableIns;

			@@ -143,7 +145,7 @@
			elem: '#LAY-app-content-list',
			url: IP +"/Sys/GetStorageAreaList",
			method: 'POST',
			height: 'full-95',
			height: h1,
			id: 'LAY-app-content-list',
			where: param,
			contentType:'application/json',

			@@ -17,9 +17,9 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-card" style="padding-bottom: 0">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item" >
			<div class="layui-inline">
			<label class="layui-form-label">异常号</label>
			@@ -79,6 +79,7 @@
			</div>
			</div>
			</div>
			<div id="center"></div>
			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			<script type="text/html" id="table-content-list">
			@@ -121,7 +122,7 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();
			refreshTable("", "", "", "","","","");
			var tableIns;

			@@ -210,7 +211,7 @@
			}
			var infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-130',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,

			@@ -3,7 +3,7 @@

			<head>
			<meta charset="utf-8">
			<title>储位图例</title>
			<title>平库图例</title>
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport"
			content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">

			@@ -18,11 +18,11 @@
			});
			</script>
			</head>
			<body>
			<body id="body">

			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 60px;">所属仓库</label>
			@@ -117,6 +117,7 @@
			</div>
			</div>
			</div>
			<div id="center"></div>
			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
			<script type="text/html" id="table-content-list">
			@@ -147,6 +148,7 @@
			layer = layui.layer,
			$ = layui.$;
			var houseid = 0;
			var h1 = GetTableHeight();
			// 表单需要的变量
			var doing = true;
			active = {
			@@ -273,7 +275,7 @@
			console.log(where);
			var tableIns = table.render({
			elem: '#LAY-app-content-list',
			height: 'full-135',
			height: h1,
			id: 'LAY-app-content-list',
			url: IP + "/Sys/GetStorageLocatList",
			method: 'post',

			@@ -23,10 +23,10 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 70px;">托盘条码：</label>
			@@ -56,6 +56,7 @@
			</div>
			</div>
			</div>
			<div id="center"></div>
			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>

			@@ -83,7 +84,7 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;

			var h1 = GetTableHeight();
			var isTrue= true;

			var where = {
			@@ -92,7 +93,7 @@
			}
			var tableIns = table.render({
			elem: '#LAY-app-content-list',
			height: 'full-95',
			height: h1,
			id: 'LAY-app-content-list',
			url: IP + "/Sys/GetPalletsList",
			method: 'post',

			@@ -18,10 +18,10 @@
			});
			</script>
			</head>
			<body>
			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 56px;">仓库编码</label>
			@@ -52,7 +52,7 @@
			</div>
			</div>
			</div>

			<div id="center"></div>
			<div class="layui-card-body">
			<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
			<script type="text/html" id="table-content-list">
			@@ -77,6 +77,7 @@
			form = layui.form,
			laypage = layui.laypage,
			layer = layui.layer;
			var h1 = GetTableHeight();
			refreshTable("","","");
			var tableIns;

			@@ -90,7 +91,7 @@
			elem: '#LAY-app-content-list',
			url: IP +"/Sys/GetWarehouseList",
			method: 'POST',
			height: 'full-95',
			height: h1,
			id: 'LAY-app-content-list',
			where: param,
			contentType:'application/json',

			@@ -46,7 +46,7 @@
			/// <summary>
			/// 查询库存明细（添加盘点明细时选择查询）
			/// </summary>
			public class GetStockDetailVm
			public class GetStockDetailVm : IndexPage
			{
			public string HouseNo { get; set; }
			public string RoadwayNo { get; set; }

			@@ -143,7 +143,7 @@
			}

			//获取库存明细信息（盘点选择明细数据源）
			public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg)
			public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg, int page, int limit, out int count)
			{
			try
			{
			@@ -158,7 +158,7 @@
			.And(m => m.IsDel == "0" && m.SkuNo != "100099" && m.Status == "0")
			.ToExpression();//注意这一句不能少


			var total = 0;
			var list = Db.Queryable<DataStockDetail>().Where(item).GroupBy(m => new { m.SkuNo, m.SkuName, m.Standard, m.LotNo, m.LotText, m.SupplierLot, m.LocatNo, m.PalletNo })
			.Select(a => new StockDetailDto()
			{
			@@ -171,7 +171,8 @@
			Qty = SqlFunc.AggregateSum(a.Qty),
			LocatNo = a.LocatNo,
			PalletNo = a.PalletNo
			}).ToList();
			}).ToOffsetPage(page, limit, ref total);
			count = total;

			return list;
			}

			@@ -45,7 +45,7 @@
			/// <param name="locateNo">储位号</param>
			/// <param name="msg">物料编码、名称、批次号</param>
			/// <returns></returns>
			List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg);
			List<StockDetailDto> GetCheckStockDetailList(string houseNo,string roadwayNo,string locateNo,string msg, int page, int limit, out int count);

			/// <summary>
			/// 获取编辑盘点单时信息

			@@ -101,9 +101,9 @@
			{
			try
			{
			var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg);
			var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg, model.Page, model.Limit, out int count);

			return Ok(new { code = 0, count = bolls.Count, msg = "获取库存明细信息", data = bolls });
			return Ok(new { code = 0, count, msg = "获取库存明细信息", data = bolls });
			}
			catch (Exception e)
			{