调整周期报表

yuyou_x

2024-06-07 e67692e10bd18b95e0320540d0e91bd537acbae8

调整周期报表

 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">&#xe610;</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">&#xe610;</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,

 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,

 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; }
    }
}