Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

Merge branch 'wxw'

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -566,6 +566,19 @@
                    });
                    return;
                }
                var type= $("#Type").val();
                if(type=='6'){
                    var customerName=$("#CustomerName").val();
                    if(customerName==''){
                        layer.msg("代储单据请选择货主！", {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {

                        });
                        return;
                    }
                }
                SetArrivalNotice();
            });


 HTML/views/StatisticalReport/BoxInfor.html

@@ -52,6 +52,20 @@
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">货主编码</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">货主名称</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline mingxi">
                            <label class="layui-form-label" style="width: 60px;">批次号</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <input type="text" id="LotNo"  name="LotNo" placeholder="批次号" autocomplete="off" class="layui-input">
@@ -303,7 +317,7 @@

                var $ = layui.$;
                var yemianid =0;
                refreshTable("","","","","","","","","","");
                refreshTable("","","","","","","","","","","","");

                // 表单需要的变量
                var infoOptions;
@@ -378,6 +392,8 @@
                    {field: 'PalletNo', title: '托盘号', align: 'center'},
                    {field: 'SkuNo', title: '物料编码', align: 'center'},
                    {field: 'SkuName', title: '物料名称', align: 'center'},
                    {field: 'OwnerNo',title: '货主编码',align: 'center'},
                    {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    {field: 'SupplierLot', title: '供货批次', align: 'center'},
@@ -390,7 +406,7 @@
                var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
                //#endregion
                //获取托盘明细
                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus) {
                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName) {
                    //#region 自定义表头
                    var colsJson
                    var param1={
@@ -432,7 +448,9 @@
                            InspectMark:InspectMark, //检验标记
                            BitPalletMark:BitPalletMark, //零托标记
                            BitBoxMark:BitBoxMark, //零箱标记
                            InspectStatus:InspectStatus //质量状态
                            InspectStatus:InspectStatus, //质量状态
                            OwnerNo:OwnerNo, //货主编码
                            OwnerName:OwnerName //货主名称
                        };
                        sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) { 
                            console.log(res)                       
@@ -639,9 +657,12 @@
                    var BitBoxMark = $("#BitBoxMark").val();
                    var InspectStatus = $("#InspectStatus").val();

                    var OwnerNo = $("#OwnerNo").val();
                    var OwnerName = $("#OwnerName").val();

                    if(yemianid == 0){
                        console.log("总单");
                        refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus);
                        refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
                    }else if(yemianid == 1){
                        quanid = '';
                        console.log("明细");
@@ -667,7 +688,7 @@
                    yemianid = data.index
                    if(yemianid == 0){
                        console.log("总单");
                        refreshTable("","","","","","","","","","");
                        refreshTable("","","","","","","","","","","","");
                    }else if(yemianid == 1){
                        console.log("明细");
                        refreshTable2(quanid);

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -51,6 +51,20 @@
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">货主编码</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">货主名称</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline mingxi">
                        <label class="layui-form-label" style="width: 60px;">批次号</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                            <input type="text" id="LotNo" name="LotNo" placeholder="批次号" autocomplete="off"
@@ -71,6 +85,7 @@
                                class="layui-input">
                        </div>
                    </div>
					
                    <div class="layui-inline ">
                        <label class="layui-form-label" style="width: 60px;">库存状态</label>
                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -337,7 +352,11 @@
                        {field: '',title: '序号',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
                        {field: 'SkuNo',title: '物料编码',align: 'center',totalRowText: "合计:", "disabled": true}, 
                        {field: 'SkuName',title: '物料名称',align: 'center', "disabled": true}, 
                        {field: 'Standard',title: '物料规格',align: 'center', "disabled": true}, 
                        {field: 'Standard',title: '物料规格',align: 'center', "disabled": true},
                        {field: 'LotNo',title: '批次号',align: 'center', "disabled": true},
                        {field: 'LotText',title: '批次描述',align: 'center'},
                        {field: 'OwnerNo',title: '货主编码',align: 'center'},
                        {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                        {field: 'Qty',title: '库存数量',align: 'center',totalRow: true}, 
                        {field: 'LockQty',title: '锁定数量',align: 'center',totalRow: true}, 
                        {field: 'FrozenQty',title: '冻结数量',align: 'center',totalRow: true}
@@ -378,7 +397,7 @@
                        cols:colsJson
                    };

                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val(), {}, 'get', function (res) {
                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                        console.log(res)
                        if (res.code == 0) { //成功
                            var list = res.data;
@@ -502,6 +521,8 @@
                        {field: 'SkuName',title: '物料名称',align: 'center'}, 
                        {field: 'Standard',title: '物料规格',width: 130,align: 'center'}, 
                        {field: 'LotNo',title: '批次号',align: 'center'}, 
                        {field: 'OwnerNo',title: '货主编码',align: 'center'},
                        {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                        {field: 'Qty',title: '库存数量',width: 110,align: 'center'}, 
                        {field: 'LockQty',title: '锁定数量',width: 110,align: 'center'},
                        {field: 'Status',templet: '#buttonTpl',title: '库存状态',width: 90,align: 'center'}, 
@@ -510,7 +531,7 @@
                    ]];
            var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
            function refreshTable2(sku) {
            function refreshTable2(sku,lotNo) {
                //#region 自定义表头
                var colsJson2
                var param1={
@@ -542,7 +563,7 @@
                        cols:colsJson2
                    };
                    
                    sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + $("#LotNo").val() + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val(), {}, 'get', function (res) {
                    sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                        if (res.code == 0) //成功
                        {
                            var list = res.data;
@@ -572,6 +593,7 @@

            //接受全局变量
            let quanSkuNo = '';
            let quanLotNo='';
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                var SkuNo = $("#SkuNo").val();
@@ -579,6 +601,8 @@
                var LotNo = $("#LotNo").val();
                var LocatNo = $("#LocatNo").val();
                var PalletNo = $("#PalletNo").val();
                var OwnerNo = $("#OwnerNo").val();
                var OwnerName = $("#OwnerName").val();
                var Status = $("#Status").val();
                var InspectStatus = $("#InspectStatus").val();
                if (yemianid == 0) {
@@ -586,8 +610,9 @@
                    refreshTable(SkuNo, SkuName);
                } else if (yemianid == 1) {
                    quanSkuNo = '';
                    quanLotNo='';
                    console.log("明细");
                    refreshTable2(SkuNo);
                    refreshTable2(SkuNo,LotNo);
                }

            });
@@ -599,7 +624,8 @@
                $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
                console.log(obj);
                quanSkuNo = obj.data.SkuNo;
                refreshTable2(obj.data.SkuNo);
                quanLotNo=obj.data.lotNo;
                refreshTable2(obj.data.SkuNo,obj.data.LotNo);
                yemianid = 1;
            });

@@ -612,7 +638,7 @@
                    refreshTable(SkuNo, SkuName);
                } else if (yemianid == 1) {
                    console.log("明细");
                    refreshTable2(quanSkuNo);
                    refreshTable2(quanSkuNo,quanLotNo);
                }
            });


 Wms/Model/ModelDto/DataDto/MateDataStockDto.cs

@@ -119,6 +119,20 @@
        /// 是否打带
        /// </summary>
        public string IsBelt { get; set; }

        /// <summary>
        /// Desc:货主编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerNo { get; set; }

        /// <summary>
        /// Desc:货主名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerName { get; set; }
    }

    /// <summary>

 Wms/Model/ModelDto/DataDto/StockDetailDto.cs

@@ -164,5 +164,19 @@
        /// 是否打带
        /// </summary>           
        public string IsBelt { get; set; }

        /// <summary>
        /// Desc:货主编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerNo { get; set; }

        /// <summary>
        /// Desc:货主名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerName { get; set; }
    }
}

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1438,12 +1438,19 @@
                            #endregion

                            break;
                        case "0":
                        case "0":                            
                            var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.ASNDetailNo);
                            if (noticeDetail == null)
                            {
                                throw new Exception("未查询到托盘绑定的入库单明细信息");
                            }
                            var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
                            if (notice == null)
                            {
                                throw new Exception("未查询到托盘绑定的入库单信息");
                            }
                            string ownerNo = notice.CustomerNo;//货主编码
                            string ownerName = notice.CustomerName;//货主名称

                            var sku1 = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo);
                            string isinspect = "0";
@@ -1460,7 +1467,7 @@
                            {
                                LotNo = item.LotNo,
                                LotText = noticeDetail.LotText,
                                SupplierLot = noticeDetail.SupplierLot,
                                SupplierLot = noticeDetail.SupplierLot,                                
                                SkuNo = noticeDetail.SkuNo,
                                SkuName = noticeDetail.SkuName,
                                Standard = noticeDetail.Standard,
@@ -1488,6 +1495,9 @@
                                PackagNo = noticeDetail.PackagNo,
                                IsBale = item.IsBale,
                                IsBelt = item.IsBelt,

                                OwnerNo = ownerNo,
                                OwnerName = ownerName,

                                IsDel = "0",
                                CreateUser = 0,
@@ -1577,6 +1587,9 @@
                                    LockQty = 0,
                                    FrozenQty = 0,

                                    OwnerNo = ownerNo,
                                    OwnerName = ownerName,

                                    IsDel = "0",
                                    CreateUser = userId,
                                    CreateTime = comTime
@@ -1598,8 +1611,7 @@
                            var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
                                .Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
                            if (asnDetailNum == 0)
                            {
                                var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
                            {                                
                                notice.Status = "2";
                                notice.CompleteTime = comTime;
                                Db.Updateable(notice).ExecuteCommand();

 Wms/WMS.BLL/DataServer/StockDetailServer.cs

@@ -34,7 +34,7 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<StockDetailDto> 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 ownerNo, string ownerName)
        {
            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";
            //判断物料号是否为空
@@ -61,6 +61,16 @@
            if (!string.IsNullOrEmpty(bitPalletMark))
            {
                str += " and detail.BitPalletMark = @bitpalletmark";
            }
            //判断货主编码是否为空
            if (!string.IsNullOrEmpty(ownerNo))
            {
                str += " and detail.OwnerNo like @ownerNo";
            }
            //判断货主名称是否为空
            if (!string.IsNullOrEmpty(ownerName))
            {
                str += " and detail.OwnerName like @ownerName";
            }

            int i = 0;
@@ -151,6 +161,8 @@
                bitpalletmark = bitPalletMark, //零托标记
                inspectmark = inspectMark, //检验标记
                inspectstatus = inspectStatus, //质量状态
                ownerNo = "%" + ownerNo + "%", //货主编码
                ownerName = "%" + ownerName + "%" //货主名称
                //stockdetailid = "(" + arr + ")" //库存明细id
            });


 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -32,9 +32,9 @@
        /// <param name="skuNo">物料编码</param>
        /// <param name="skuName">物料名称</param>
        /// <returns></returns>
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName)
        public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
        {
            string str = "select stock.SkuNo,stock.SkuName,stock.Standard,stock.Qty,stock.LockQty,stock.FrozenQty,(mate.Weight * stock.Qty) WeightSum from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
            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 from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
            //判断物料编码是否为空
            if (!string.IsNullOrEmpty(skuNo))
            {
@@ -45,13 +45,25 @@
            {
                str += " and stock.SkuName like @skuname";
            }
            //判断货主编码是否为空
            if (!string.IsNullOrEmpty(ownerNo))
            {
                str += " and stock.OwnerNo like @ownerNo";
            }
            //判断货主名称是否为空
            if (!string.IsNullOrEmpty(ownerName))
            {
                str += " and stock.OwnerName like @ownerName";
            }
            //排序
            str += " order by stock.SkuNo";
            List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
            {
                isdel = "0", //是否删除
                skuno = "%" + skuNo + "%", //物料编码
                skuname = "%" + skuName + "%" //物料名称
                skuname = "%" + skuName + "%", //物料名称
                ownerNo= "%" + ownerNo + "%", //货主编码
                ownerName= "%" + ownerName + "%" //货主名称
            });

            //库存总量
@@ -66,8 +78,8 @@
                    //foreach循环库存总量
                    foreach (var dto in StockListDto)
                    {
                        //判断物料是否相同
                        if (dto.SkuNo == item.SkuNo)
                        //判断物料和批次是否相同
                        if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
                        {
                            dto.Qty =  (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
                            dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
@@ -105,7 +117,7 @@
        /// <param name="status">库存状态</param>
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
        public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
        {
            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";
            //判断物料编码是否为空
@@ -143,6 +155,16 @@
            {
                str += " and detail.InspectStatus = @inspectstatus";
            }
            //判断货主编码是否为空
            if (!string.IsNullOrEmpty(ownerNo))
            {
                str += " and detail.OwnerNo like @ownerNo";
            }
            //判断货主名称是否为空
            if (!string.IsNullOrEmpty(ownerName))
            {
                str += " and detail.OwnerName like @ownerName";
            }
            //排序
            str += " order by detail.SkuNo,detail.PalletNo,detail.LotNo";
            List<StockDetailDto> stockDetailsList = Db.Ado.SqlQuery<StockDetailDto>(str, new
@@ -154,7 +176,9 @@
                locatno = locatNo, //储位地址
                palletno = palletNo, //托盘条码
                status = status, //库存状态
                inspectstatus = inspectStatus //质检状态
                inspectstatus = inspectStatus, //质检状态
                ownerNo = "%" + ownerNo + "%", //货主编码
                ownerName = "%" + ownerName + "%" //货主名称
            });
            return stockDetailsList;
        }

 Wms/WMS.Entity/DataEntity/DataStock.cs

@@ -50,6 +50,18 @@
        /// </summary>           
        public string SupplierLot { get; set; }
        /// <summary>
        /// Desc:货主编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerNo { get; set; }
        /// <summary>
        /// Desc:货主名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerName { get; set; }
        /// <summary>
        /// Desc:数量
        /// Default:
        /// Nullable:False

 Wms/WMS.Entity/DataEntity/DataStockDetail.cs

@@ -33,6 +33,20 @@
        public string SupplierLot {get;set;}

        /// <summary>
        /// Desc:货主编号
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerNo { get; set; }

        /// <summary>
        /// Desc:货主名称
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string OwnerName { get; set; }

        /// <summary>
        /// Desc:物料编码
        /// Default:
        /// Nullable:True

 Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs

@@ -23,7 +23,7 @@
        /// <param name="bitBoxMark">零箱标记</param>
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        List<StockDetailDto> 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, string ownerNo, string ownerName);

        /// <summary>
        /// 导出托盘明细

 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);
        List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName);

        /// <summary>
        /// 获取库存明细
@@ -29,7 +29,7 @@
        /// <param name="status">库存状态</param>
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus);
        List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName);

        #endregion
        

 Wms/Wms/Controllers/StatisticalController.cs

@@ -40,9 +40,9 @@
        /// <param name="skuName"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList(string skuNo, string skuName)
        public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName)
        {
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName);
            List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName);
            return Ok(new
            {
                data = StockList,
@@ -64,9 +64,9 @@
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
        public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
        {
            List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus);
            List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName);
            return Ok(new
            {
                data = stockDetailsList,
@@ -94,11 +94,11 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus)
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName)
        {
            try
            {
                List<StockDetailDto> 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, ownerNo, ownerName);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)