HTML/views/SOSetting/ExportNotice.html

@@ -400,12 +400,12 @@
                        {{# function GetBtn2(d){
                                var html = '';
                                
                                if((d.Status == "0" ||d.Status == "1") && d.Qty > d.AllotQty && d.IsWave == "0"){ 
                                if((d.Status == "0" ||d.Status == "1")){ 
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
                                                <i class="layui-icon layui-icon-ok"></i>手动分配
                                            </a>`;
                                } 
                                if(d.Status == "0" && d.Origin == "WMS" && d.IsWave == "0"){
                                if(d.Status == "0" && d.Origin == "WMS"){
                                    html +=`<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
                                                <i class="layui-icon layui-icon-delete"></i>删除
                                            </a>`;

 HTML/views/home/console2.html

@@ -264,7 +264,7 @@
                            </div>
                        </div>
                    </div> -->
                    <div style="width: 100%;height: 38.33%;">
                    <div style="width: 100%;height: 40%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            库存物料类型分布
@@ -275,7 +275,7 @@
                            </div>
                        </div>
                    </div>
                    <div style="width: 80%;margin-top: 15%;height: 38.33%;">
                    <div style="width: 100%;margin-top: 15%;height: 40%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            库存质量状态分布
@@ -430,7 +430,7 @@
                            <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
                        </div>
                    </div>
                    <div style="width: 100%;height: 33.33%;">
                    <!-- <div style="width: 100%;height: 33.33%;">
                        <div class="layui-card-header">
                            <img src="../../img/console/xiexian.png" style="height: 20px;">
                            月度出入库趋势
@@ -440,7 +440,7 @@
                                style="width: 100%; height: 100%; display: flex; align-items: center;justify-content: center;">
                            </div>
                        </div>
                    </div>
                    </div> -->
                </div>
            </div>
        </div>
@@ -652,57 +652,57 @@
            };


            //获取月度出入库趋势（折线）
            this.chartXian = echarts.init(document.getElementById("xianOrder"));
            var option3;
            // //获取月度出入库趋势（折线）
            // this.chartXian = echarts.init(document.getElementById("xianOrder"));
            // var option3;

            option3 = {
                title: {
                    text: ''
                },
                tooltip: {
                    trigger: 'axis'
                },
                legend: {
                    data: ['入库', '出库']
                },
                grid: {
                    top: '15%',
                    left: '5%',
                    bottom: '15%',
                    containLabel: true
                },
                toolbox: {
                    feature: {
                        //saveAsImage: {}//保存图片
                    }
                },
                xAxis: {
                    type: 'category',
                    boundaryGap: false,
                    data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
                    axisLine: { show: false }, // 隐藏 x 轴线
                    axisTick: { show: false }, // 隐藏 x 轴刻度线
                },
                yAxis: {
                    type: 'value'
                },
                series: [
                    {
                        name: '入库',
                        type: 'line',
                        stack: 'Total',
                        data: [120, 132, 101, 134, 90, 230, 210]
                    },
                    {
                        name: '出库',
                        type: 'line',
                        stack: 'Total',
                        data: [220, 182, 191, 234, 290, 330, 310]
                    }
                ]
            };
            this.chartXian.setOption(option3);
            // option3 = {
            //     title: {
            //         text: ''
            //     },
            //     tooltip: {
            //         trigger: 'axis'
            //     },
            //     legend: {
            //         data: ['入库', '出库']
            //     },
            //     grid: {
            //         top: '15%',
            //         left: '5%',
            //         bottom: '15%',
            //         containLabel: true
            //     },
            //     toolbox: {
            //         feature: {
            //             //saveAsImage: {}//保存图片
            //         }
            //     },
            //     xAxis: {
            //         type: 'category',
            //         boundaryGap: false,
            //         data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
            //         axisLine: { show: false }, // 隐藏 x 轴线
            //         axisTick: { show: false }, // 隐藏 x 轴刻度线
            //     },
            //     yAxis: {
            //         type: 'value'
            //     },
            //     series: [
            //         {
            //             name: '入库',
            //             type: 'line',
            //             stack: 'Total',
            //             data: [120, 132, 101, 134, 90, 230, 210]
            //         },
            //         {
            //             name: '出库',
            //             type: 'line',
            //             stack: 'Total',
            //             data: [220, 182, 191, 234, 290, 330, 310]
            //         }
            //     ]
            // };
            // this.chartXian.setOption(option3);


            //仓库状况总

 Pda/View/SoSetting/ExNoticeOut.html

@@ -296,7 +296,9 @@
                    $("#endSelect").append('<option value ="B020101">一楼-B020101</option> <option value ="B020102">一楼-B020102</option> <option value ="B020103">一楼-B020103</option> '
                    +'<option value ="B020104">一楼-B020104</option> <option value ="B020201">一楼-B020201</option> <option value ="B020202">一楼-B020202</option>'
                    +' <option value ="B020301">一楼-B020301</option> <option value ="B020302">一楼-B020302</option> <option value ="B020303">一楼-B020303</option>'
                    +' <option value ="B020304">一楼-B020304</option>');
                    +'<option value ="B020304">一楼-B020304</option>'
                      +'<option value ="B010201">一楼-B010201</option> <option value ="B010202">一楼-B010202</option> <option value ="B010203">一楼-B010203</option> <option value ="B010204">一楼-B010204</option> <option value ="B010205">一楼-B010205</option> <option value ="B010206">一楼-B010206</option> <option value ="B010207">一楼-B010207</option> <option value ="B010208">一楼-B010208</option> <option value ="B010209">一楼-B010209</option>'
                );
                    
                }else if($("#endFloor").val() == "2"){
                    $("#endSelect").append('<option value ="B050101">二楼-B050101</option> <option value ="B050102">二楼-B050102</option> <option value ="B050103">二楼-B050103</option> '

 Pda/View/SoSetting/palletOut.html

@@ -71,6 +71,7 @@
                                    <option value=""></option>
                                    <option value="B080101">B080101</option>
                                    <option value="B080102">B080102</option> 
                                    <option value="B050103">B050103</option> 
                                </select>
                                <!-- <img src="/assets/down_arraw.png" > -->
                            </div>

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Linq;
using System.Reflection.Metadata;
using System.Security.Cryptography.X509Certificates;
@@ -412,23 +413,61 @@

        #endregion

        #region 库存查询


        /// <summary>
        /// pda库存查询
        /// </summary>
        /// <param name="locatNo">储位编号</param>
        /// <param name="palletNo">托盘号</param> 
        /// <param name="boxNo">箱码</param> 
        /// <returns></returns>
        //public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
        //{
        //    return await Db.Queryable<DataStockDetail>()
        //             .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
        //             .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
        //             .ToListAsync();
        //}
        public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
        {
            string dataSql = "", whereStr = "";

            if (string.IsNullOrWhiteSpace(boxNo))
            {
                whereStr = string.IsNullOrWhiteSpace(locatNo) ? "1=1" : $@"LocatNo='{locatNo}'";

                dataSql = $@"select SkuName,SkuNo,LotNo,LocatNo,PalletNo,sum(isnull(Qty,0)) as Qty,sum(isnull(LockQty,0)) as LockQty,sum(isnull(LockQty,0)) as FrozenQty
    from DataStockDetail
    where IsDel='0' and PalletNo='{palletNo}' and {whereStr}
    group by SkuName,SkuNo,LotNo,LocatNo,PalletNo
    order by SkuNo,LotNo";
            }
            else
            {
                whereStr = string.IsNullOrWhiteSpace(palletNo) ? "1=1" : $@"a.PalletNo='{palletNo}'";

                dataSql = $@"select a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo,sum(isnull(a.Qty,0)) as Qty,0 as LockQty,0 as FrozenQty
    from DataBoxInfo a
    left join DataStockDetail b on b.Id=a.StockDetailId
    where a.IsDel='0' and a.BoxNo='{boxNo}' and {whereStr}
    group by a.SkuName,a.SkuNo,a.LotNo,b.LocatNo,a.PalletNo
    order by a.SkuNo,a.LotNo";
            }
            DataTable dataDt = await Db.Ado.GetDataTableAsync(dataSql);

            var result = dataDt.Rows.Cast<DataRow>().Select(e => new StockDetailWithQtyDto
            {
                LocatNo = e["LocatNo"] + "",
                PalletNo = e["PalletNo"] + "",
                SkuNo = e["SkuNo"] + "",
                SkuName = e["SkuName"] + "",
                LotNo = e["LotNo"] + "",
                Qty = Convert.ToDecimal(e["Qty"]),
                LockQty = Convert.ToDecimal(e["LockQty"]),
                FrozenQty = Convert.ToDecimal(e["FrozenQty"])
            });

            return result.ToList();
        }
        #region 注释代码
        /*
        public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
        {

            return await Db.Queryable<DataStockDetail>("a")
                .InnerJoin<DataBoxInfo>((a, b) => a.LotNo == b.LotNo)
                .Where((a, b) => a.IsDel == "0")
@@ -529,7 +568,9 @@
                })
                .ToListAsync();
        }
        */
        #endregion


        #region 托盘变更（托盘解绑绑定）

@@ -842,7 +883,7 @@
                {
                    storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04").OrderBy(o => o.AreaNo).ToListAsync();
                }
                

            }
            return storageArea;
        }
@@ -1079,7 +1120,7 @@
            }
        }*/

        public async Task AgvTransport(string palletNo, string areaNo,string locatNoEnd, string ruku, string url, int userId)
        public async Task AgvTransport(string palletNo, string areaNo, string locatNoEnd, string ruku, string url, int userId)
        {
            try
            {
@@ -1121,7 +1162,7 @@
                    else
                    {
                        EndLocat = await GetLocat(areaNo);//系统分配储位地址
                    }                    
                    }
                }
                else
                {
@@ -1313,7 +1354,7 @@
                {
                    throw Oops.Bah("该托盘信息不存在!");
                }
                if (palletInfo.Status!="0")
                if (palletInfo.Status != "0")
                {
                    throw Oops.Bah("该托盘不是空托盘!");
                }
@@ -1323,7 +1364,7 @@
                {
                    throw Oops.Bah("获取目标储位失败!");
                }
                

                //起始储位信息
                var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
                if (storageLocat == null)
@@ -1598,7 +1639,7 @@
            {
                locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
                               .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
            }            
            }

            if (locatInfo2 != null)
            {
@@ -1620,7 +1661,7 @@
        #endregion

        #region 零箱解绑
        public void LingxingUnbind(string palletNo,string boxNo, int userId)
        public void LingxingUnbind(string palletNo, string boxNo, int userId)
        {
            try
            {
@@ -1726,11 +1767,11 @@
                    throw new Exception("该箱码信息错误，存在多个此箱码信息");
                }
                var boxInfo = boxList.First();
                if (boxInfo.Qty<=devanQty)
                if (boxInfo.Qty <= devanQty)
                {
                    throw new Exception("拆箱数量大等于当前箱内数量");
                }
                

                boxInfo.Qty -= devanQty;
                boxInfo.BitBoxMark = "1";
                //更新箱码库存表
@@ -1745,7 +1786,7 @@
                //如果结果大于0，则说明第一个字符串大于第二个字符串。
                var maxBoxCode = maxBoxCode1;
                var bol = String.CompareOrdinal(maxBoxCode1, maxBoxCode2);
                if (bol<0)
                if (bol < 0)
                {
                    maxBoxCode = maxBoxCode2;
                }
@@ -1759,14 +1800,14 @@
                    BoxNo = boxNoNew,
                    Qty = devanQty,
                    FullQty = boxInfo.FullQty,
                    

                    Status = "2",//0：未组托  1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
                    LotNo = boxInfo.LotNo,
                    LotText = boxInfo.LotText,
                    SkuNo = boxInfo.SkuNo,
                    SkuName = boxInfo.SkuName,
                    Standard = boxInfo.Standard,
                    

                    SupplierLot = boxInfo.SupplierLot,
                    InspectStatus = boxInfo.InspectStatus,
                    InspectMark = boxInfo.InspectMark,
@@ -1787,17 +1828,17 @@

                #region 获取拆箱的信息打印

                

                var data = new BoxListInfoDto()
                {
                    SkuNo = boxInfo.SkuNo,
                    SkuName = boxInfo.SkuName,
                    LotNo = boxInfo.LotNo,
                    BoxNoList = new List<string>() { boxNoNew } ,
                    BoxNoList = new List<string>() { boxNoNew },
                    Date1 = boxInfo.ProductionTime == null ? "" : Convert.ToDateTime(boxInfo.ProductionTime).ToString("yyyy-MM-dd"),
                    Date2 = boxInfo.ExpirationTime == null ? "" : Convert.ToDateTime(boxInfo.ExpirationTime).ToString("yyyy-MM-dd"),
                };
                

                #endregion

                return data;
@@ -1815,7 +1856,7 @@
        {
            try
            {
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).GroupBy(m=>m.SONo).Select(m=>m.SONo).ToList();
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).GroupBy(m => m.SONo).Select(m => m.SONo).ToList();
                if (stockDetail.Count == 0)
                {
                    throw new Exception("没有查询到托盘库存信息");
@@ -1875,7 +1916,7 @@
                    throw new Exception("库存托盘没有信息");
                }
                var locate = stockDetail.First().LocatNo;
                var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09" || m.AreaNo == "B24") && m.IsDel == "0").ToList();
                var locatList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09" || m.AreaNo == "B24") && m.IsDel == "0").ToList();
                var locat = locatList.FirstOrDefault(m => m.LocatNo == locate);
                //判断托盘储位是否在车间
                if (locat == null)
@@ -1885,14 +1926,14 @@
                locat.Status = "0";
                Db.Updateable(locat).ExecuteCommand();
                //判断托盘信息
                

                foreach (var item in stockDetail)
                {
                    if (item.UDF5 != "1" || string.IsNullOrWhiteSpace(item.SONo))
                    {
                        continue;
                    }
                   

                    //item.WareHouseNo = "";
                    //item.RoadwayNo = "";
                    //item.AreaNo = "";
@@ -1939,20 +1980,20 @@
        /// </summary>
        /// <param name="boxNo"></param>
        /// <param name="pallNo"></param>
        public void GetBoxInfo(string boxNo,string pallNo)
        public void GetBoxInfo(string boxNo, string pallNo)
        {
            try
            {
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo).ToList();
                if (!string.IsNullOrWhiteSpace(pallNo))
                {
                    boxInfo = boxInfo.Where(m=>m.PalletNo == pallNo).ToList();
                    boxInfo = boxInfo.Where(m => m.PalletNo == pallNo).ToList();
                }
                if (boxInfo.Count!=1)
                if (boxInfo.Count != 1)
                {
                    throw new Exception("标签信息错误，请联系管理员");
                }
                

            }
            catch (Exception e)
            {
@@ -1960,7 +2001,7 @@
            }
        }

        public void UpPalletByBox(string boxNo,string pallet,string palletNew,int userId)
        public void UpPalletByBox(string boxNo, string pallet, string palletNew, int userId)
        {
            try
            {
@@ -1969,13 +2010,13 @@
                {
                    throw new Exception("参数错误，托盘、新托盘、箱码均不能为空");
                }
                var boxInfoList = Db.Queryable<DataBoxInfo>().Where(m=>m.IsDel == "0" && m.BoxNo == boxNo).ToList();
                var boxInfoList = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo).ToList();
                if (boxInfoList.Count != 1)
                {
                    throw new Exception("标签信息数量不是1条");
                }
                var boxInfo = boxInfoList.First();
                var detail1 = Db.Queryable<DataStockDetail>().First(m=>m.IsDel == "0" && m.PalletNo == pallet && m.Id == boxInfo.StockDetailId );
                var detail1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == pallet && m.Id == boxInfo.StockDetailId);
                if (detail1 == null)
                {
                    throw new Exception("未查询到托盘和箱码的库存明细");
@@ -1986,7 +2027,7 @@
                    throw new Exception("未查询到新托盘信息");
                }
                var detailNewBl = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNew && (m.SkuNo != boxInfo.SkuNo || m.LotNo != boxInfo.LotNo));
                if (detailNewBl!=null)
                if (detailNewBl != null)
                {
                    throw new Exception("新托盘上已有其他物料箱信息");
                }
@@ -2007,7 +2048,7 @@
                    detailNew.Qty = boxInfo.Qty;
                    detailNew.LockQty = 0;
                    detailNew.FrozenQty = 0;
                    detailNew.InspectQty = 0; 
                    detailNew.InspectQty = 0;
                    detailNew.ASNNo = "";

                    detailNew.PalletNo = palletNew;
@@ -2088,11 +2129,11 @@
            try
            {
                var data = new List<SelectSkuLotNo>();
                var detailList = Db.Queryable<DataStockDetail>().Where(m=>m.IsDel == "0" && m.PalletNo == palletNo).ToList();
                var detailList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();

                foreach (var item in detailList)
                {
                    if (data.Count(m=>m.DetailId == item.Id.ToString()) == 0)
                    if (data.Count(m => m.DetailId == item.Id.ToString()) == 0)
                    {
                        data.Add(new SelectSkuLotNo()
                        {
@@ -2122,7 +2163,7 @@
        /// <param name="qty"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        public void UpPalletByQty(string palletNo,string palletNoNew,string detailId,decimal qty,int userId)
        public void UpPalletByQty(string palletNo, string palletNoNew, string detailId, decimal qty, int userId)
        {
            try
            {
@@ -2131,11 +2172,11 @@
                {
                    throw new Exception("参数错误，托盘、新托盘、物料批次均不能为空");
                }
                if (qty<=0)
                if (qty <= 0)
                {
                    throw new Exception("参数数量不能为小等0");
                }
                 var detailId2 = int.Parse(detailId);
                var detailId2 = int.Parse(detailId);
                var detail1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Id == detailId2);
                if (detail1 == null)
                {
@@ -2146,7 +2187,7 @@
                {
                    throw new Exception("未查询到新托盘信息");
                }
                

                //添加/更新库存托盘信息
                var detailNew1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == detail1.SkuNo && m.LotNo == detail1.LotNo);
                var newId = 0;
@@ -2215,7 +2256,7 @@
                    Db.Updateable(detail1).ExecuteCommand();
                }

                

                //添加操作日志
                new OperationCrServer().AddLogOperationCr("库内作业", "操作日志", palletNo, "编辑", $"物料拆托:{detail1.SkuName}物料换托，原托盘{palletNo}，新托盘{palletNoNew}", userId);


 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -38,6 +38,7 @@
        }



        /// <summary>
        /// 获取库存物料类型分布
        /// </summary>
@@ -196,8 +197,7 @@
        /// <param name="wareHouseNo">所属仓库</param>
        /// <param name="areaNo">所属区域</param>
        /// <returns></returns>
        public async Task<List<MateDataStockDto>> GetDataStockList(string selectType, string skuNo, string skuName, string ownerNo,
            string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
        public async Task<List<MateDataStockDto>> GetDataStockList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
        {
            Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
            .AndIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
@@ -338,8 +338,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, string ownerNo, string ownerName, string startTime, string endTime)
        public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
        {
            string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
                "roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName  " +
@@ -434,7 +433,10 @@
        /// <returns></returns>
        public List<MateDataStockDto> GetInventoryWarning(string skuNo, string skuName, string lotNo, string type)
        {
            string str = "select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty - stock.LockQty - Stock.FrozenQty ResidueQty,stock.LotNo from SysMaterials mate right join DataStock stock on mate.SkuNo = stock.SkuNo Where stock.IsDel = @isdel and stock.Qty - stock.LockQty - Stock.FrozenQty <= mate.LowInventory";
            string str = $@"select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty-stock.LockQty-Stock.FrozenQty ResidueQty,stock.LotNo 
from SysMaterials mate 
right join DataStock stock on mate.SkuNo=stock.SkuNo 
Where stock.IsDel=@isdel and stock.Qty-stock.LockQty-Stock.FrozenQty<mate.LowInventory";
            //判断物料号是否为空
            if (!string.IsNullOrEmpty(skuNo))
            {