From e67692e10bd18b95e0320540d0e91bd537acbae8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 07 六月 2024 11:00:51 +0800
Subject: [PATCH] 调整周期报表
---
Wms/WMS.BLL/DataServer/StockInfoServer.cs | 1
Wms/WMS.Entity/DataEntity/DataStockInfo.cs | 9 ----
HTML/views/StatisticalReport/PeriodicReport.html | 59 ++++++++++++++---------------
3 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/HTML/views/StatisticalReport/PeriodicReport.html b/HTML/views/StatisticalReport/PeriodicReport.html
index 62d9d06..15e6823 100644
--- a/HTML/views/StatisticalReport/PeriodicReport.html
+++ b/HTML/views/StatisticalReport/PeriodicReport.html
@@ -69,37 +69,35 @@
<div class="layui-tab-content">
<!-- 鍗曟嵁鎬昏〃 -->
- <div class="layui-tab-item layui-show">
- <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!-- #region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
-
- <script type="text/html" id="SituationButton">
- {{# if(d.IsQualified=='0'){ }}
- <p>婊¤冻</p>
- {{# } else if(d.IsQualified=='1'){ }}
- <p>涓嶆弧瓒�</p>
- {{# } }}
- </script>
- <script type="text/html" id="CreateTimeButton">
- {{# console.log(d.CreateTime);
- return formatDate(d.CreateTime);
- }}
- </script>
- <script type="text/html" id="UpdateTimeButton">
- {{# console.log(d.CreateTime);
- return formatDate(d.CreateTime);
- }}
- </script>
-
+ <!-- #region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
</div>
+ <!-- #endregion -->
+
+ <script type="text/html" id="SituationButton">
+ {{# if(d.IsQualified=='0'){ }}
+ <p>婊¤冻</p>
+ {{# } else if(d.IsQualified=='1'){ }}
+ <p>涓嶆弧瓒�</p>
+ {{# } }}
+ </script>
+ <script type="text/html" id="CreateTimeButton">
+ {{# console.log(d.CreateTime);
+ return formatDate(d.CreateTime);
+ }}
+ </script>
+ <script type="text/html" id="UpdateTimeButton">
+ {{# console.log(d.CreateTime);
+ return formatDate(d.CreateTime);
+ }}
+ </script>
+
</div>
</div>
</div>
@@ -177,7 +175,7 @@
var $ = layui.$;
- var h1 = GetTableTabHeight();
+ var h1 = GetTableHeight();
refreshTable("",);
//鑾峰彇鍑哄叆搴撴�婚噺
function refreshTable(StartTime,EndTime) {
@@ -196,6 +194,7 @@
}else{
colsJson=TotalColsArr
}
+ console.log('h1:',h1)
infoOptions = {
elem: '#LAY-app-content-list',
height: h1,
diff --git a/Wms/WMS.BLL/DataServer/StockInfoServer.cs b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
index d2c0604..29ce25d 100644
--- a/Wms/WMS.BLL/DataServer/StockInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
@@ -343,7 +343,6 @@
Qty = item.Qty,
SecurityQty = item.SecurityQty,
Situation = item.Qty < item.SecurityQty ? "1" : "0",
- FoldedQty = item.FoldedQty,
IsDel = "0",
CreateTime = DateTime.Now,
CreateUser = 0,
diff --git a/Wms/WMS.Entity/DataEntity/DataStockInfo.cs b/Wms/WMS.Entity/DataEntity/DataStockInfo.cs
index f9ef593..a79ed61 100644
--- a/Wms/WMS.Entity/DataEntity/DataStockInfo.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStockInfo.cs
@@ -9,7 +9,7 @@
///<summary>
///搴撳瓨璁板綍琛�
///</summary>
- [SugarTable("DataStock")]
+ [SugarTable("DataStockInfo")]
public class DataStockInfo : BaseEntity
{
/// <summary>
@@ -171,12 +171,5 @@
/// Nullable:True
/// </summary>
public string Situation { get; set; }
-
- /// <summary>
- /// Desc:鎶樹欢鏁伴噺
- /// Default:
- /// Nullable:True
- /// </summary>
- public decimal FoldedQty { get; set; }
}
}
--
Gitblit v1.8.0