JC24WMS
parent: aec8d474 | 补丁 | 提交 | ignore whitespace
yuyou_x
2024-02-20 b850ff5ee8c1fa3938751ffb9d627fed90a5500e 
修改库存信息、托盘信息后台代码以及前台页面
6个文件已修改
41 ■■■■■ 已修改文件
HTML/views/StatisticalReport/BoxInfor.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/InventoryStatistics.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockDetailServer.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockServer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/StatisticalController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HTML/views/StatisticalReport/BoxInfor.html


@@ -371,8 +371,9 @@


                //#region 自定义表头


                var TotalColsArr = [[


                    {field: '',title: '序号',type:'numbers',align: 'center',fixed: 'left', "disabled": true},


                    {field: 'WareHouseNo', title: '所属仓库', align: 'center'},


                    {field: 'AreaNo', title: '所属区域', align: 'center'},


                    {field: 'WareHouseName', title: '所属仓库', align: 'center'},


                    {field: 'RoadwayName', title: '所属巷道', align: 'center'},


                    {field: 'AreaName', title: '所属区域', align: 'center'},


                    {field: 'LocatNo', title: '储位地址', align: 'center'},


                    {field: 'PalletNo', title: '托盘号', align: 'center'},


                    {field: 'SkuNo', title: '物料编码', align: 'center'},


@@ -433,7 +434,8 @@


                            BitBoxMark:BitBoxMark, //零箱标记


                            InspectStatus:InspectStatus //质量状态


                        };


                        sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {                        


                        sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) { 


                            console.log(res)                       


                            if (res.code == 0) { //成功


                                var list = res.data;


                                $.extend(infoOptions, {




 HTML/views/StatisticalReport/InventoryStatistics.html


@@ -495,8 +495,9 @@


            var DetailColsArr = [[


                        {field: 'PalletNo',title: '托盘号',align: 'center',width: 110,}, 


                        {field: 'LocatNo',title: '储位地址',align: 'center',width: 100,}, 


                        {field: 'RoadwayName',title: '所属巷道',width: 90,align: 'center'}, 


                        {field: 'WareHouseName',title: '所属仓库',width: 90,align: 'center'}, 


                        {field: 'RoadwayName',title: '所属巷道',width: 90,align: 'center'}, 


                        {field: 'AreaName',title: '所属区域',width: 90,align: 'center'}, 


                        {field: 'SkuNo',title: '物料编码',width: 100,align: 'center'}, 


                        {field: 'SkuName',title: '物料名称',align: 'center'}, 


                        {field: 'Standard',title: '物料规格',width: 130,align: 'center'}, 




 Wms/WMS.BLL/DataServer/StockDetailServer.cs


@@ -1,6 +1,7 @@


using System;


using System.Collections.Generic;


using System.Text;


using Model.ModelDto.DataDto;


using SqlSugar;


using WMS.DAL;


using WMS.Entity.Context;


@@ -33,33 +34,33 @@


        /// <param name="bitBoxMark">零箱标记</param>


        /// <param name="inspectStatus">质量状态</param>


        /// <returns></returns>


        public List<DataStockDetail> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)


        public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)


        {


            string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Qty,LockQty,FrozenQty,WareHouseNo,AreaNo,LocatNo,PalletNo,PalletNo2,PalletNo3,InspectMark,BitPalletMark from DataStockDetail where IsDel = @isdel";


            string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";


            //判断物料号是否为空


            if (!string.IsNullOrEmpty(skuNo))


            {


                str += " and SkuNo like @skuno";


                str += " and detail.SkuNo like @skuno";


            }


            //判断物料名称是否为空


            if (!string.IsNullOrEmpty(skuName))


            {


                str += " and SkuName like @skuname";


                str += " and detail.SkuName like @skuname";


            }


            //判断托盘号是否为空


            if (!string.IsNullOrEmpty(palletNo))


            {


                str += " and PalletNo like @palletno";


                str += " and detail.PalletNo like @palletno";


            }


            //判断批次是否为空


            if (!string.IsNullOrEmpty(lotNo))


            {


                str += " and LotNo like @lotno";


                str += " and detail.LotNo like @lotno";


            }


            //判断零托标记是否为空


            if (!string.IsNullOrEmpty(bitPalletMark))


            {


                str += " and BitPalletMark = @bitpalletmark";


                str += " and detail.BitPalletMark = @bitpalletmark";


            }




            int i = 0;


@@ -81,7 +82,7 @@


            if (!string.IsNullOrEmpty(inspectMark))


            {


                boxstr += " and InspectMark = @inspectmark";


                str += " and InspectMark = @inspectmark";


                str += " and detail.InspectMark = @inspectmark";


                i = 1;


            }


            //判断零箱标记是否为空


@@ -94,7 +95,7 @@


            if (!string.IsNullOrEmpty(inspectStatus))


            {


                boxstr += " and InspectStatus = @inspectstatus";


                str += " and InspectStatus = @inspectstatus";


                str += " and detail.InspectStatus = @inspectstatus";


                i = 1;


            }


            //将箱码数据进行排序


@@ -140,7 +141,7 @@




            //排序


            str += " order by PalletNo,SkuNo,LotNo";


            List<DataStockDetail> boxInforList = Db.Ado.SqlQuery<DataStockDetail>(str, new


            List<StockDetailDto> boxInforList = Db.Ado.SqlQuery<StockDetailDto>(str, new


            {


                isdel = "0", //是否删除


                skuno = "%" + skuNo + "%", //物料号




 Wms/WMS.BLL/DataServer/StockServer.cs


@@ -107,7 +107,7 @@


        /// <returns></returns>


        public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)


        {


            string str = "select detail.*,house.WareHouseName as WareHouseName,roadway.RoadwayName as RoadwayName  from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo Where detail.IsDel = @isdel";


            string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName  from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo Where detail.IsDel = @isdel";


            //判断物料编码是否为空


            if (!string.IsNullOrEmpty(skuNo))


            {




 Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs


@@ -1,4 +1,5 @@


using System;


using Model.ModelDto.DataDto;


using System;


using System.Collections.Generic;


using System.Text;


using WMS.Entity.DataEntity;


@@ -22,7 +23,7 @@


        /// <param name="bitBoxMark">零箱标记</param>


        /// <param name="inspectStatus">质量状态</param>


        /// <returns></returns>


        List<DataStockDetail> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus);


        List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus);




        /// <summary>


        /// 导出托盘明细




 Wms/Wms/Controllers/StatisticalController.cs


@@ -98,7 +98,7 @@


        {


            try


            {


                List<DataStockDetail> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);


                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);


                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });


            }


            catch (Exception e)