盘点调整

hwh

2024-07-22 05ec4c0c2558912a7e793bf629c62416b3872e84

盘点调整

 HTML/views/HouseWithinSetting/CRLogTask.html

@@ -161,6 +161,10 @@
                            html = `<p>盘点单</p>`; 
                        } else if(d.OrderType=='3') { 
                            html = `<p>移库单</p>`; 
                        }else if(d.OrderType=='4') { 
                            html = `<p>取样出库单</p>`; 
                        }else if(d.OrderType=='6') { 
                            html = `<p>视觉盘点</p>`; 
                        } else {
                            
                        }

 Pda/View/HouseDataSetting/stockCheck.html

@@ -583,6 +583,7 @@
                                refreshTable()
                                GetOutInfo()
                                canPickBox = true
                                form.render('select')
                            });

                        } else { //不成功

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1361,7 +1361,7 @@
                   .AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
                   .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
                   .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
                   .And(m => m.AreaNo.Contains(categoryAreaNo))
                   .And(m => m.AreaNo == categoryAreaNo)
                   .ToExpression();//注意 这一句 不能少
                var total = 0;
                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -1440,8 +1440,8 @@
                        IsFinish = 1,//是否可完成
                        Type = "1",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        Status = "0",//任务状态0：等待执行1正在执行2执行完成
                        OrderType = "4",//0 入库单 1 出库单  2 盘点单  3 移库单 4视觉盘点

                        OrderType = "5",////0 入库单 1 出库单  2 盘点单  3 移库单 4 取样出库单 5视觉盘点
                        Msg = $"{locateNo}的视觉盘点任务",
                        CreateTime = time
                    };
                    await Db.Insertable(exTask).ExecuteCommandAsync();

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -5,6 +5,7 @@
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
using SqlSugar;
using Utility;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -177,15 +178,15 @@
            {
                if (string.IsNullOrWhiteSpace(crNo))
                {
                    throw new Exception("盘点单据不能为空");
                    throw Oops.Bah("盘点单据不能为空");
                }
                if (string.IsNullOrWhiteSpace(crDetail))
                {
                    throw new Exception("物料批次不能为空");
                    throw Oops.Bah("物料批次不能为空");
                }
                if (string.IsNullOrWhiteSpace(palletNo))
                {
                    throw new Exception("托盘码不能为空");
                    throw Oops.Bah("托盘码不能为空");
                }
                //箱码为空  是整托要盘点的都正常
                var detail = crDetail.Split("-");
@@ -196,7 +197,7 @@
                    m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo);
                if (checkDetail == null)
                {
                    throw new Exception("未查询到未盘点的盘点明细信息");
                    throw Oops.Bah("未查询到未盘点的盘点明细信息");
                }
                //盘点记录
                var checkLog = Db.Queryable<BllStockCheckLog>().Where(m =>
@@ -216,7 +217,7 @@

                    if (checkLog.Count() == 0 && isContinue == "0")
                    {
                        throw new Exception("未查询到未盘点的箱支信息");
                        throw Oops.Bah("未查询到未盘点的箱支信息");
                    }

                    var list = checkLog.ToList();
@@ -232,7 +233,7 @@
                        l.CheckDate = time;
                        l.CheckUserId = userId;

                        num += int.Parse(l.Qty.ToString());
                        num += Convert.ToInt32(l.Qty);
                    }

                    if (checkDetail.RealQty == null)
@@ -262,7 +263,7 @@

                    if (checkLog.Count() == 0 && isContinue == "0")
                    {
                        throw new Exception("未查询到箱支信息");
                        throw Oops.Bah("未查询到箱支信息");
                    }

                    //
@@ -270,7 +271,7 @@
                    {
                        if (qty == null || qty <= 0)
                        {
                            throw new Exception("数量盘点时、盘亏数量不能为空且需大于0");
                            throw Oops.Bah("数量盘点时、盘亏数量不能为空且需大于0");
                        }
                    }

@@ -283,7 +284,7 @@
                        l.CheckResult = 1;
                        l.CheckDate = time;
                        l.CheckUserId = userId;
                        num -= int.Parse(l.RealQty.ToString());
                        num -= Convert.ToInt32(l.RealQty);
                    }
                    if (checkDetail.RealQty == null)
                    {
@@ -316,12 +317,12 @@
                    {
                        if (string.IsNullOrWhiteSpace(boxNo) || string.IsNullOrWhiteSpace(boxNo3))
                        {
                            throw new Exception("盘盈时箱码与支码不能为空");
                            throw Oops.Bah("盘盈时箱码与支码不能为空");
                        }
                    }
                    if (qty == null || qty <= 0)
                    {
                        throw new Exception("盘盈时数量不能为空且需大于0");
                        throw Oops.Bah("盘盈时数量不能为空且需大于0");
                    }
                    if (isContinue == "0")
                    {
@@ -331,7 +332,7 @@
                            .Count(m => m.IsDel == "0" && m.BoxNo == boxNo && m.BoxNo3 == boxNo3);
                        if (count > 0 || count2 > 0)
                        {
                            throw new Exception("当前库存中已存在该箱支信息");
                            throw Oops.Bah("当前库存中已存在该箱支信息");
                        }
                    }
                    BllStockCheckLog crLog = new BllStockCheckLog();
@@ -395,7 +396,7 @@
                else
                {
                    Db.RollbackTran();
                    throw new Exception("盘点结果不符，请核实！");
                    throw Oops.Bah("盘点结果不符，请核实！");
                }
                var checkLogNum = Db.Queryable<BllStockCheckLog>().Where(m => m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo);
                if (checkLogNum.Count(m => m.CheckResult == null) == 0)

 Wms/Wms/Controllers/BllCheckController.cs

@@ -197,7 +197,7 @@
        {
            try
            {
                var type = new List<string>() { "2", "3", "4" };
                var type = new List<string>() { "2", "3", "4", "6" };
                RefAsync<int> count = new RefAsync<int>();
                var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);