chengsc
2025-05-13 6167bf4c8fe617d9f9861585042149d48ad15dbb
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -872,6 +872,25 @@
            return allotList2;
        }
        public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListBySo(string soNo)
        {
            if (string.IsNullOrWhiteSpace(soNo))//判断托盘是否为空
            {
                throw Oops.Bah("单据为空,请选择单据");
            }
            //获取状态为待拣货或者部分拣货的出库单
            var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.Status == "0" || m.Status == "1"));
            var list = await allotList.GroupBy(m => new { m.SODetailNo, m.SkuNo, m.SkuName, m.LotNo }).Select(m => new DetailIdSkuLotNo()
            {
                SoDetailId = m.SODetailNo,
                SkuName = m.SkuName,
                LotNo = m.LotNo,
            }).ToListAsync();
            return list;
        }
        //获取出库托盘上的物料批次(根据托盘码)
        public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(string palletNo, string soNo)
        {
@@ -1772,7 +1791,7 @@
                DateTime serverTime = Db.GetDate();
                //获取库存明细是否小于等于该垛数
                 
                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0").ToListAsync();
                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();
                if (stockDetail.Count > 0)
                {
                    //判断是否大于需要垛数
@@ -1935,13 +1954,13 @@
                        ////解析返回数据 
                        var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                        if (wcsModel.code == 0)
                        if (wcsModel.code == 200)
                        {
                            //更改任务的发送返回时间//
                            new TaskServer().EditTaskIssueOk(list2, time1, time2);
                            //str += "下发成功";
                        }
                        if (wcsModel.code == -1)
                        else
                        {
                            new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
                            throw Oops.Bah(wcsModel.message);
@@ -1968,7 +1987,7 @@
            catch (Exception e)
            {
                Db.RollbackTran();
                return e.Message;
                throw new Exception(e.Message);
            }
        }