测试流程，修改问题

chengsc

2024-08-19 5e2454c2a75cb70afc0d1933e5c29e02e21231e6

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -200,7 +200,7 @@
                    LotNo = m.LotNo,
                    LotText = m.LotText,
                    SupplierLot = m.SupplierLot,
                    Qty = (int)m.Qty,
                    Qty = m.Qty,

                    PalletNo = m.PalletNo
                }).ToList();
@@ -641,7 +641,7 @@
                                    BoxNo2 = l.BoxNo2,
                                    BoxNo3 = l.BoxNo3,
                                    PalletNo = l.PalletNo,
                                    Qty = (int)l.RealQty,
                                    Qty = (decimal)l.RealQty,
                                    FullQty = stockBoxInfo.FullQty,//满箱数量
                                    Status = "2",
                                    SkuNo = l.SkuNo,
@@ -1327,21 +1327,79 @@
                // 更改当前任务中的储位状态（改为0空储位）
                locate.Status = "0"; 
                Db.Updateable(locate).ExecuteCommand();

                //目标储位信息
                var endLocate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
                if (endLocate != null)
                {
                    if (endLocate.Status != "4")
                    {
                        throw new Exception("目标储位状态非移入中");
                    }
                }
                //更改库存明细
                foreach (var item in stockDetail)
                {
                    item.Status = "0";//待分配
                    item.LockQty = 0;//锁定数量改为0
                    item.LocatNo = "";//储位更改（改为空）
                    item.WareHouseNo = "";//所属仓库更改（改为空）
                    item.RoadwayNo = "";//所属巷道更改（改为空）
                    item.AreaNo = "";//所属区域更改（改为空）
                    //item.Status = "0";//待分配
                    //item.LockQty = 0;//锁定数量改为0
                    if (endLocate != null)//有目标储位说明移到其他区域储位
                    {
                        item.LocatNo = endLocate.LocatNo;//储位更改
                        item.WareHouseNo = endLocate.WareHouseNo;//所属仓库更改
                        item.RoadwayNo = endLocate.RoadwayNo;//所属巷道更改
                        item.AreaNo = endLocate.AreaNo;//所属区域更改 

                    }
                    else//没有目标储位说明移到入库口
                    {
                        item.LocatNo = "";//储位更改（改为空）
                        item.WareHouseNo = "";//所属仓库更改（改为空）
                        item.RoadwayNo = "";//所属巷道更改（改为空）
                        item.AreaNo = "";//所属区域更改（改为空）
                    }
                    if (item.Qty == item.LockQty && item.LockQty>0)
                    {
                        item.Status = "2";
                    }
                    else if (item.Qty > item.LockQty && item.LockQty > 0)
                    {
                        item.Status = "1";
                    }
                    else if (item.Qty > item.LockQty && item.LockQty == 0)
                    {
                        item.Status = "0";
                    }
                    Db.Updateable(item).ExecuteCommand();

                    //更改库存总表
                    var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
                    stock.LockQty -= (decimal)item.Qty;
                    Db.Updateable(stock).ExecuteCommand();
                    
                    

                    if (endLocate != null && endLocate.AreaNo == "B12") //是否是3楼缓存区 是：删除库存
                    {
                        //库存箱码明细删除
                        var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
                        Db.Deleteable(boxInfo).ExecuteCommand();
                        //删除库存托盘信息
                        Db.Deleteable(item).ExecuteCommand();
                        //更改库存总表
                        var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
                        stock.LockQty -= (decimal)item.Qty;
                        stock.Qty -= (decimal)item.Qty;
                        Db.Updateable(stock).ExecuteCommand();
                        //更改托盘状态
                        var pallet = Db.Queryable<SysPallets>().First(m=>m.IsDel =="0" && m.PalletNo == task.PalletNo);
                        if (pallet != null)
                        {
                            pallet.Status = "0";
                            Db.Updateable(pallet).ExecuteCommand();
                        }
                    }
                }
                if (endLocate != null)
                {
                    //更改目标储位状态
                    endLocate.Status = "1";//有物品
                    Db.Updateable(endLocate).ExecuteCommand();
                }

                if (userId != 0)
@@ -1527,7 +1585,7 @@
                task.CancelDate = DateTime.Now;
                Db.Updateable(task).ExecuteCommand();

                //修改储位信息
                //修改起始储位信息
                var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
                if (locat == null)
                {
@@ -1536,6 +1594,14 @@
                locat.Status = "1"; //有物品
                Db.Updateable(locat).ExecuteCommand();

                //修改目标储位信息
                var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
                if (locatEnd != null)
                {
                    locatEnd.Status = "0"; //空储位
                    Db.Updateable(locatEnd).ExecuteCommand();
                }                

                //修改库存明细
                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
                if (stockDetail == null)