修改信息

yuyou_x

2024-03-23 1b804d3e0c990bd45be003170a5e1cd8138b3743

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -177,7 +177,7 @@
                        skuType = "(4)";
                        break;
                    case "7"://寄存入库
                        skuType = "(0,1,2,3,4)";
                        skuType = "(3)";
                        break;
                    default: //其它
                        skuType = "(0,1,2,3,4)";
@@ -238,7 +238,7 @@
            string sqlString = string.Empty;
            string sqlDetailStr = string.Empty;
            //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
            var TypeLot = "1, 2, 5, 6, 7";
            var TypeLot = "1, 2, 5, 6, 7"; //批次可为空单据类型

            try
            {
@@ -752,16 +752,35 @@
                    }

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

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

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

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

                        }
                    }

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

                    }
                }
                var time = DateTime.Now;
                var log = new BllAuditLog()
@@ -869,7 +888,7 @@
                {
                    ASNNo = asnNo,
                    Type = model.AsnType,
                    Origin = model.Origin,
                    Origin = string.IsNullOrEmpty(model.Origin) ? "ERP" : model.Origin,
                    CustomerNo = model.Customer,
                    CustomerName = CustomerModel.CustomerName,
                    OrderCode = model.OrderCode,
@@ -953,6 +972,10 @@
                {
                    throw new Exception("未查询到单据信息");
                }
                if (notice.Status != "3")
                {
                    throw new Exception("复核失败，单据非关闭状态");
                }
                var detail = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.ASNNo == notice.ASNNo && m.IsDel == "0").ToList();
                if (detail.Count == 0)
                {