ZhongRui/ALDbanyunxiangmu.git

			@@ -8,6 +8,7 @@
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			@@ -18,6 +19,7 @@
			using WIDESEA_ICheckService;
			using WIDESEA_IOutboundService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;
			using WIDESEA_Model.Models.Check;

			namespace WIDESEA_CheckService
			@@ -75,6 +77,18 @@
			model.Creater = "MES";
			model.CreateDate = DateTime.Now;
			model.MaterielName = materielInfo?.MaterielName ?? "";
			var stockDetailIds = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo && x.ValidDate !=null)
			.Select(x => x.Id)
			.ToList();

			if (stockDetailIds.Count > 0)
			{
			BaseDal.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(x => x.Status == StockStatusEmun.鎵嬪姩鍐荤粨.ObjToInt())
			.Where(x => stockDetailIds.Contains(x.Id))
			.ExecuteCommand();
			}
			BaseDal.AddData(model);
			var outboundOrders = ConvertToOutboundOrders(model);

			@@ -102,6 +116,45 @@
			{
			isupdate = true;
			}
			if (model.Result != 0 && recheckOrder.SignSeq != model.SignSeq)
			{
			var stockDetailIds = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo && x.ValidDate != null)
			.Select(x => x.Id)
			.ToList();

			if (stockDetailIds.Count > 0)
			{
			var datevaliDate = BaseDal.Db.Queryable<Dt_MaterialExpirationDate>().Where(x => x.MaterialCode.Contains(model.MaterielCode.Substring(0, 6))).First();

			BaseDal.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(x => x.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt())
			.Where(x => stockDetailIds.Contains(x.Id))
			.ExecuteCommand();

			if (model.InspectionNumber == 1)
			{
			BaseDal.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.OneExtensionDays)))
			.Where(x => stockDetailIds.Contains(x.Id))
			.ExecuteCommand();
			}
			else if (model.InspectionNumber == 2)
			{
			BaseDal.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.TwoExtensionDays)))
			.Where(x => stockDetailIds.Contains(x.Id))
			.ExecuteCommand();
			}
			else
			{
			BaseDal.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.ThreeExtensionDays)))
			.Where(x => stockDetailIds.Contains(x.Id))
			.ExecuteCommand();
			}
			}
			}
			recheckOrder.OrderNo = model.OrderNo;
			recheckOrder.MaterielCode = model.MaterielCode;
			recheckOrder.BatchNo = model.BatchNo;
			@@ -116,6 +169,7 @@
			recheckOrder.ModifyDate = DateTime.Now;
			var materielInfo = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().First(x => model.MaterielCode.Equals(x.MaterielCode));
			recheckOrder.MaterielName= materielInfo?.MaterielName??"";

			BaseDal.UpdateData(recheckOrder);

			if (isupdate)