Merge branch 'wxw'

wxw

2025-03-11 7631b07ef475e8372811b01563a9719033a0a074

 Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs

@@ -95,98 +95,38 @@
            {
                throw new Exception("质检号不可为空，请核查！");
            }
            //验证物料号是否为空
            if (string.IsNullOrEmpty(model.SkuNo))
            {
                throw new Exception("物料号不可为空，请核查！");
            }
            //获取物料信息
            var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == model.SkuNo);
            if (sku == null)
            {
                throw new Exception("物料信息为空，请核查！");
            }
            //验证批次号是否为空
            if (string.IsNullOrEmpty(model.LotNo))
            {
                throw new Exception("批次号不可为空，请核查！");
            }
            //int isTui = 0;
            //验证入库单号是否为空
            if (!string.IsNullOrEmpty(model.ASNNo))
            {
                //查询是否为退货入库单据
                var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
                if (Arrival == null)
                {
                    throw new Exception("只有入库单据为退货入库单可输入 入库单号，请核查！");
                }

                //获取入库单明细
                var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
                if (ArrivalDetail == null)
                {
                    throw new Exception("输入的批次或物料信息与入库单据不符，请核查！");
                }
                //isTui = 1;
            }

            //查找质检信息中是否存在同批次质检录入记录
            //BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);

            //if (quality != null)
            //{
                ////判断是否为退货入库单
                //if (isTui == 1)
                //{
                //    if (quality.ASNNo == model.ASNNo)
                //    {
                //        throw new Exception("当前退货入库单已创建质检信息，请勿重复创建！");
                //    }
                //}
            //    throw new Exception("当前物料和批次已进行质检，请核查！");
            //}

            ////查找同批次 同单据 入库单信息、
            //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo);

            model.Origin = "WMS"; //来源
            model.CreateTime = Db.GetDate(); //创建日期
            model.SkuNo = sku.SkuNo; //物料号
            model.SkuName = sku.SkuName; //物料名称
            model.SkuNo = ""; //物料号
            model.SkuName = ""; //物料名称
            model.PassQty = 0; //合格数量
            model.FailQty = 0; //不合格数量
            model.Standard = sku.Standard; //规格
            //model.SupplierLot = arrivalDetail.SupplierLot; //供货批次
            model.Standard = ""; //规格

            //查找库存明细信息
            List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo).ToList();
            List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.LotNo == model.LotNo).ToList();
            foreach (var item in detail)
            {
                List<BllBoxInfo> box = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
                //判断合格状态是否合格
                if (model.IsQualified == "1")
                {
                    //合格 相同批次库存信息全部改为合格状态 且合格数量增加为同批次同单号该物料全部数量之和
                    //合格
                    model.PassQty += item.Qty;
                    //修改库存明细合格状态
                    item.InspectStatus = "1"; //1合格
                    //foreach (var b1 in box)
                    //{
                    //    b1.InspectMark = "1"; //1合格
                    //}
                }
                else //不合格
                {
                    //不合格 相同批次、入库单库存信息全部改为不合格物料 且不合格数量增加为同批次同单号该物料全部数量之和
                    //不合格
                    model.FailQty += item.Qty;
                    item.InspectStatus = "2"; //2不合格
                    //foreach (var b1 in box)
                    //{
                    //    b1.InspectMark = "2"; //2不合格
                    //}
                }
                Db.Updateable(box).ExecuteCommand();
                Db.Updateable(item).ExecuteCommand();
            }
            var isquality = Db.Insertable(model).ExecuteCommand();
@@ -194,6 +134,23 @@
            return isquality;
        }

        /// <summary>
        /// 获取库存批次号集合
        /// </summary>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public List<DataStockDetail> GetLotNoList()
        {
            try
            {
                var _list = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && !string.IsNullOrEmpty(w.LotNo)).ToList();
                return _list;
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
        #endregion

    }