From 5418a5c0bc29235f4ea2bc0e7ee23b424366aa0b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 27 二月 2024 10:27:55 +0800
Subject: [PATCH] 1
---
Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs | 2
HTML/views/SOSetting/ExportAllot.html | 15 +++++--
HTML/views/WareHouseSetting/Warehouse.html | 9 ++--
Wms/Wms/Controllers/BllCheckController.cs | 4 +-
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 2
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 7 ++-
HTML/views/WareHouseSetting/Locate.html | 8 ++-
HTML/views/WareHouseSetting/Roadway.html | 8 ++-
HTML/views/HouseWithinSetting/StockCheckSelectPallet.html | 13 +++++-
HTML/views/SOSetting/ComBoxInfo.html | 9 +++-
HTML/views/WareHouseSetting/Exception.html | 9 ++--
HTML/views/HouseWithinSetting/StockCheckLog.html | 3 -
HTML/views/WareHouseSetting/Pallets.html | 9 ++--
HTML/views/WareHouseSetting/Area.html | 8 ++-
Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs | 2
15 files changed, 67 insertions(+), 41 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/StockCheckLog.html b/HTML/views/HouseWithinSetting/StockCheckLog.html
index 1c52504..29674f7 100644
--- a/HTML/views/HouseWithinSetting/StockCheckLog.html
+++ b/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 =
[[
diff --git a/HTML/views/HouseWithinSetting/StockCheckSelectPallet.html b/HTML/views/HouseWithinSetting/StockCheckSelectPallet.html
index 5f53cbc..978d36d 100644
--- a/HTML/views/HouseWithinSetting/StockCheckSelectPallet.html
+++ b/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: [
[
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index 1156189..66afe34 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/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,
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index f0c753f..fa226d7 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 0b2243b..385bc4e 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Exception.html b/HTML/views/WareHouseSetting/Exception.html
index b133c87..3cad3ae 100644
--- a/HTML/views/WareHouseSetting/Exception.html
+++ b/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,
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index 5820381..e344b1d 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/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">
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index e2adf60..9f52be6 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index e9553fb..a7a3e9b 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index 69a31db..8b3986a 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/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',
diff --git a/HTML/views/WareHouseSetting/Warehouse.html b/HTML/views/WareHouseSetting/Warehouse.html
index cf56315..dcf8c9e 100644
--- a/HTML/views/WareHouseSetting/Warehouse.html
+++ b/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',
diff --git a/Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs b/Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs
index 00be559..f8d3e57 100644
--- a/Wms/Model/ModelVm/BllCheckVm/StockCheckVm.cs
+++ b/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; }
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 25845b9..65bb133 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/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;
}
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
index dee62c7..d5cfa71 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckServer.cs
+++ b/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>
/// 鑾峰彇缂栬緫鐩樼偣鍗曟椂淇℃伅
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 3ed9994..9a1220f 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/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)
{
--
Gitblit v1.8.0