Administrator
2024-03-13 2ca093b8e4f6c841b16a11ed58b83d8ffd42c3cb
优化库存统计查询
4个文件已修改
18 ■■■■■ 已修改文件
HTML/views/StatisticalReport/InventoryStatistics.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockServer.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IDataServer/IStockServer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/StatisticalController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/InventoryStatistics.html
@@ -401,7 +401,7 @@
                        cols:colsJson
                    };
                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
                        console.log(res)
                        if (res.code == 0) { //成功
                            var list = res.data;
Wms/WMS.BLL/DataServer/StockServer.cs
@@ -32,7 +32,7 @@
        /// <param name="skuNo">物料编码</param>
        /// <param name="skuName">物料名称</param>
        /// <returns></returns>
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo)
        {
            string str = "select stock.SkuNo,stock.SkuName,stock.LotNo,stock.LotText,stock.Standard,stock.Qty," +
                "stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
@@ -59,6 +59,11 @@
            {
                str += " and stock.OwnerName like @ownerName";
            }
            //判断货主名称是否为空
            if (!string.IsNullOrEmpty(lotNo))
            {
                str += " and stock.LotNo like @lotNo";
            }
            //排序
            str += " order by stock.SkuNo";
            List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
@@ -67,7 +72,8 @@
                skuno = "%" + skuNo + "%", //物料编码
                skuname = "%" + skuName + "%", //物料名称
                ownerNo= "%" + ownerNo + "%", //货主编码
                ownerName= "%" + ownerName + "%" //货主名称
                ownerName= "%" + ownerName + "%", //货主名称
                lotNo= "%" + lotNo + "%", //批次号
            });
            //库存总量
Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -16,7 +16,7 @@
        /// <param name="skuNo">物料编码</param>
        /// <param name="skuName">物料名称</param>
        /// <returns></returns>
        List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName);
        List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName, string lotNo);
        /// <summary>
        /// 获取库存明细
Wms/Wms/Controllers/StatisticalController.cs
@@ -40,9 +40,9 @@
        /// <param name="skuName"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName)
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName,string lotNo)
        {
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName);
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName,lotNo);
            return Ok(new
            {
                data = StockList,