Merge branch 'master' into wxw

Administrator

2024-02-24 fb7cd0fab09d7814bbd3200de748e9290257cd2f

Merge branch 'master' into wxw

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -752,6 +752,10 @@
                    }

                    var info = boxInfo.First(m => m.BindNo == item.Id);
                    //获取托盘绑定对应单据
                    var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.Id == item.ASNDetailNo);
                    if (info != null)
                    {
                    if (!msgS.Contains(info.SkuNo))
                    {
                        msgS += info.SkuNo + ";";
@@ -763,6 +767,21 @@

                    }
                }
                    else
                    {
                        if (!msgS.Contains(noticeDetail.SkuNo))
                        {
                            msgS += noticeDetail.SkuNo + ";";
                        }

                        if (!msgL.Contains(noticeDetail.LotNo))
                        {
                            msgL += noticeDetail.LotNo + ";";

                        }
                    }
                    
                }
                var time = DateTime.Now;
                var log = new BllAuditLog()
                {

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -218,7 +218,7 @@
        {
            try
            {

                //获取托盘绑定信息
                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Id == id);
                if (bind == null)
                {
@@ -228,6 +228,8 @@
                {
                    throw new Exception("该托盘绑定信息的状态不是等待入库，不能删除");
                }
                //获取除删除绑定信息外是否存在该托盘且同单据其它绑定信息
                var bindid = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == bind.PalletNo && m.Id != id && m.ASNNo == bind.ASNNo).ToList();
                //获取托盘信息
                var pallet = Db.Queryable<SysPallets>().First(a => a.IsDel == "0" && a.PalletNo == bind.PalletNo && a.Status == "1");
                if (pallet == null)
@@ -307,10 +309,13 @@
                    Db.Updateable(noticeDetail).ExecuteCommand();
                }

                if (bindid.Count == 0)
                {
                pallet.Status = "0";
                pallet.UpdateUser = userId;
                pallet.UpdateTime = DateTime.Now;
                Db.Updateable(pallet).ExecuteCommand();
                }

                new OperationASNServer().AddLogOperationAsn("入库作业", "托盘绑定", bind.PalletNo, "删除", $"删除了入库单：{bind.ASNNo}、托盘码：{bind.PalletNo}的信息", userId);
                Db.CommitTran();
@@ -509,11 +514,17 @@
                }

                var info = boxInfo.First(m => m.BindNo == bind.Id);
                //入库单明细
                var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == bind.ASNDetailNo);
                if (noticeDetail == null && info.SkuNo != "100099")
                {
                    throw new Exception("未查询到托盘绑定的入库单明细信息");
                }
                var log = new BllAuditLog()
                {
                    OrderNo = notice.ASNNo,
                    PalletNo = bind.PalletNo,
                    Msg = $"物料：{info.SkuNo}、批次：{info.LotNo};",
                    Msg = info == null ? $"物料：{noticeDetail.SkuNo}、批次：{noticeDetail.LotNo};": $"物料：{info.SkuNo}、批次：{info.LotNo};",
                    Reason = reason,
                    Status = "0",
                    Opinion = "",