GetStockQueryList去除task

admin

2025-11-17 8a72ba164094867487dc8fc2f73e41b5790a7327

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -274,19 +274,8 @@
                    // 判断库存明细是否已有此托盘信息  
                    var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.LotNo == detail.LotNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
                    var sdId1 = 0;
                    if (sd1 != null)
                    if (sd1 == null)
                    {
                        sdId1 = sd1.Id;
                        // 库存已存在 更新数据
                        sd1.Qty += bind.Qty;
                        sd1.CompleteTime = comTime;
                        sd1.UpdateUser = userId;
                        sd1.UpdateTime = comTime;

                        Db.Updateable(sd1).ExecuteCommand();
                    }
                    else
                    {                        
                        // 库存不存在 插入数据
                        sd1 = new DataStockDetail()
                        {
@@ -296,7 +285,7 @@
                            SkuNo = sku.SkuNo,
                            SkuName = sku.SkuName,
                            Standard = sku.Standard,
                            Qty = bind.Qty,
                            Qty = 0,
                            LockQty = 0,
                            FrozenQty = 0,
                            InspectQty = 0,
@@ -317,7 +306,7 @@
                            InspectMark = bind.InspectMark,
                            InspectStatus = sku.IsInspect,
                            BitPalletMark = bind.BitPalletMark,
                            PackagNo = sku.PackagNo,                    
                            PackagNo = sku.PackagNo,
                            IsBale = bind.IsBale,
                            IsBelt = bind.IsBelt,

@@ -358,20 +347,19 @@
                            //修改合格不合格数量
                            if (quality.IsQualified == "1") //合格
                            {
                                //增加合格数量
                                quality.PassQty += bind.Qty;
                                sd1.InspectStatus = "1";
                            }
                            else if (quality.IsQualified == "0") //不合格
                            {
                                //增加不合格数量
                                quality.FailQty += bind.Qty;
                                sd1.InspectStatus = "2";
                            }
                            Db.Updateable(quality).ExecuteCommand(); //修改质检信息
                        }
                        //添加库存明细
                        sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
                    }
                    else
                    {
                        sdId1 = sd1.Id;
                    }
                    #endregion

@@ -524,10 +512,13 @@
                    #endregion

                    #region 库存明细
                    if (sd1.Qty <= 0)
                    {
                        sd1.Qty = bind.Qty;
                    }
                    
                    // 库存已存在 更新数据
                    sd1.Qty += bind.Qty;
                    sd1.CompleteTime = comTime;
                    sd1.UpdateUser = userId;
                    sd1.UpdateTime = comTime;

                    //更改库存明细数量
                    Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
                    #endregion
@@ -6297,6 +6288,10 @@
                {
                    throw new Exception("储位信息不存，请核查!");
                }
                if (storageLocat.WareHouseNo != "W04")
                {
                    throw new Exception("该储位不是平库储位，请检查!");
                }
                if (storageLocat.Status != "0")
                { 
                    var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
@@ -6304,6 +6299,11 @@
                    {
                        throw new Exception("储位不是空闲状态，请核查!");
                    }
                    var logIng = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.EndLocat == storageLocat.LocatNo && w.Status == "1" && w.PalletNo != model.PalletNo);
                    if (logIng != null)
                    {
                        throw new Exception("该储位有正在执行的入库任务，请核查!");
                    }
                }
                #endregion