JC24WMS.git - Gitblit

			@@ -120,7 +120,7 @@
			.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
			.AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())),it=>it.BindNo == model.BindNo)
			.AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())), it => it.BindNo == model.BindNo)
			.And(m => m.IsDel == "0")
			.ToExpression();

			@@ -563,18 +563,23 @@

			#region 指定储位
			//指定储位数据源（正常的空储位）
			public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer, string locateNo, string BindId, int page, int limit, out int count)
			public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer,
			string locateNo, string BindId, int page, int limit, out int count)
			{
			try
			{
			//获取托盘绑定
			var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0" && a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
			var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0"
			&& a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
			//获取单据明细
			var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo && a.IsDel == "0").Select(a => a.SkuNo).First();
			var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo
			&& a.IsDel == "0").Select(a => a.SkuNo).First();
			//获取物料
			var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo).Select(a => a.CategoryNo).First();
			var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo)
			.Select(a => a.CategoryNo).First();
			//获取物料对应区域
			var categoryAreaNo = Db.Queryable<SysMaterialCategory>().Where(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo).Select(a => a.AreaNo).First();
			var categoryAreaNo = Db.Queryable<SysMaterialCategory>().Where(a => a.IsDel == "0" && a.CategoryNo == skuCategoryNo)
			.Select(a => a.AreaNo).First();

			Expression<Func<SysStorageLocat, bool>> item = Expressionable.Create<SysStorageLocat>()
			.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
			@@ -586,7 +591,7 @@
			.And(m => m.AreaNo.Contains(categoryAreaNo))
			.ToExpression();//注意这一句不能少
			var total = 0;
			var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a=>a.Depth).OrderBy(a=>a.Column)
			var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
			.Select(a => new LocatDto()
			{
			Id = a.Id,
			@@ -595,6 +600,7 @@
			Row = a.Row,
			Column = a.Column,
			Layer = a.Layer,
			Depth = a.Depth,
			Status = a.Status
			}).ToOffsetPage(page, limit, ref total);
			count = total;
			@@ -634,7 +640,7 @@
			throw new Exception("该储位状态不是空储位或标志不是正常的");
			}




			//判断当前托盘是否存在绑定信息
			if (!string.IsNullOrWhiteSpace(bind.LocatNo))
			@@ -755,6 +761,7 @@
			{
			try
			{
			#region 验证托盘合法性
			//验证托盘条码是否为空
			if (string.IsNullOrEmpty(palletNo))
			{
			@@ -771,17 +778,17 @@
			throw new Exception("平库请使用PDA手持进行平库入库");
			}

			OutCommandDto comDto;//返回wcs的入库命令
			var isHaveLocateNo = false; //托盘绑定信息中是否已有指定储位

			var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//托盘信息

			//判断托盘条码是否有效
			if (stock == null)
			{
			throw new Exception("托盘条码不受WMS管理，不可入库！");
			}
			#endregion


			OutCommandDto comDto;//返回wcs的入库命令
			var isHaveLocateNo = false; // 是否已有指定储位
			#region

			//查询托盘绑定信息(状态为等待入库的)
			@@ -823,6 +830,8 @@
			isHaveLocateNo = true; //已有指定储位
			}


			// 验证是否关联单据，获取托盘上存放的物料
			if (palletBindList.First().Type == "0") //物料托入库
			{
			//判断是否绑定单据及单据状态是否正常
			@@ -833,7 +842,7 @@
			{
			throw new Exception("托盘存在物料未绑定入库单，不可入库！");
			}
			if (notice.Status == "3")
			if (notice.Status == "3" \|\| notice.Status == "4")
			{
			throw new Exception($"入库单{item.ASNNo}已关闭，不可入库！");
			}
			@@ -865,29 +874,23 @@
			skuNo = stockDetail.First().SkuNo;

			//获取对应回库规则
			var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "托盘回库验证" && a.IsEnable == "NO");
			var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
			#region 托盘回库规则

			if (function != null)
			{
			//拣货完成后允许托盘回库
			if (function.SetValue == "CompletePick")
			{
			var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
			var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);

			//验证拣货明细是否存在
			if (allot != null)
			//验证拣货明细是否存在
			if (allot != null)
			{
			//验证当前托盘拣货信息是否已完成
			if (allot.Status != "5")
			{
			//验证当前托盘拣货信息是否已完成
			if (allot.Status != "5")
			{
			throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
			}
			throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
			}
			}
			}


			#endregion
			}

			@@ -895,6 +898,7 @@

			SysStorageLocat locate;

			#region 根据sku确认区域划分
			var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
			if (sku == null)
			{
			@@ -940,9 +944,10 @@
			.GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();

			SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m => m.IsDel == "0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //巷道最后一次使用记录
			#endregion


			#region 确定巷道排序

			List<string> roadList2 = new List<string>();
			List<string> roadSmall = new List<string>();
			List<string> roadLarge = new List<string>();
			@@ -1054,19 +1059,43 @@
			Db.BeginTran();
			try
			{
			if (roadNo != null)
			//添加巷道使用记录
			var log = new SysRoadwayUseLog
			{
			//添加巷道使用记录
			var log = new SysRoadwayUseLog
			{
			RoadwayNo = roadNo,
			WareHouseNo = houseNo,
			Row = 0,
			Column = 0,
			Layer = 0,
			};
			Db.Insertable(log).ExecuteCommand();
			}
			RoadwayNo = roadNo,
			WareHouseNo = houseNo,
			Row = 0,
			Column = 0,
			Layer = 0,
			};
			Db.Insertable(log).ExecuteCommand();

			// 添加入库日志记录
			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask //入库任务
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功
			SendDate = DateTime.Now, //发送时间
			BackDate = DateTime.Now, //返回时间
			StartRoadway = "", // 起始巷道
			StartLocat = "",//起始位置
			EndLocat = "",//目标位置
			EndRoadway = roadNo, // 目标巷道
			PalletNo = palletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			Type = "0",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "1",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "0",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "入库口到=>>" + roadNo + "巷道的入库任务", //关键信息

			};
			Db.Insertable(exTask).ExecuteCommand();


			if (palletBindList.Count >= 1)
			{
			@@ -1079,6 +1108,7 @@
			Db.Updateable(palletBindList).ExecuteCommand();
			}
			Db.CommitTran();

			comDto = new OutCommandDto()
			{
			PalletNo = palletNo,//托盘号
			@@ -1086,12 +1116,11 @@
			StartLocate = "", // 起始位置
			EndLocate = "", // 目标位置
			EndRoadway = roadNo, // 目标巷道
			TaskNo = "", // 任务号
			TaskType = "0",// 任务类型 (出库)
			TaskNo = taskNo, // 任务号
			TaskType = "0",// 任务类型:入库任务
			OutMode = "", //目标地址
			Order = 1
			};

			}
			catch (Exception ex)
			{
			@@ -1603,7 +1632,17 @@
			}

			//获取该批次最终质检结果
			//var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).ToList();
			BllQualityInspect quality = new BllQualityInspect();
			//判断是否为退货入库单
			if (notice.Type == "3")
			{
			quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
			}
			else
			{
			quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
			}

			#region 库存明细
			var sd = new DataStockDetail()
			{
			@@ -1650,28 +1689,28 @@
			sd.OwnerName = notice.CustomerName;//货主名称
			}
			else if (notice.Type == "1" \|\| notice.Type == "5")//1:采购入库,2:其它入库
			{
			sd.SupplierNo= notice.CustomerNo;//供应商编码
			{
			sd.SupplierNo = notice.CustomerNo;//供应商编码
			sd.SupplierName = notice.CustomerName;//供应商名称
			}

			//if (quality.Count() > 0)
			//{
			// //修改合格不合格数量
			// if (quality[0].IsQualified == "1") //合格
			// {
			// //增加合格数量
			// quality[0].PassQty += item.Qty;
			// sd.InspectStatus = "1";
			// }
			// else if (quality[0].IsQualified == "0") //不合格
			// {
			// //增加不合格数量
			// quality[0].FailQty += item.Qty;
			// sd.InspectStatus = "2";
			// }
			// Db.Updateable(quality[0]).ExecuteCommand(); //修改质检信息
			//}
			if (quality != null)
			{
			//修改合格不合格数量
			if (quality.IsQualified == "1") //合格
			{
			//增加合格数量
			quality.PassQty += item.Qty;
			sd.InspectStatus = "1";
			}
			else if (quality.IsQualified == "0") //不合格
			{
			//增加不合格数量
			quality.FailQty += item.Qty;
			sd.InspectStatus = "2";
			}
			Db.Updateable(quality).ExecuteCommand(); //修改质检信息
			}

			var sdId = Db.Insertable(sd).ExecuteReturnIdentity(); //新增库存明细信息