JC24WMS.git - Gitblit

			@@ -41,7 +41,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public bool ErpAddExportNotice(SoInfo model)
			public void HttpAddExportNotice(SoInfo model)
			{
			try
			{
			@@ -49,11 +49,11 @@
			{
			throw new Exception("单据类型不可为空!");
			}
			if (string.IsNullOrEmpty(model.Customer))
			{
			throw new Exception("客户不可为空!");
			}
			if (string.IsNullOrEmpty(model.OrderCode))
			//if (string.IsNullOrEmpty(model.Customer))
			//{
			// throw new Exception("客户不可为空!");
			//}
			if (string.IsNullOrEmpty(model.OrderNo))
			{
			throw new Exception("系统单号不可为空!");
			}
			@@ -68,10 +68,10 @@

			//客户信息
			var customer = Db.Queryable<SysCustomer>().First(m => m.IsDel == "0" && m.CustomerNo == model.Customer);
			if (customer == null)
			{
			throw new Exception("客户不可为空!");
			}
			//if (customer == null)
			//{
			// throw new Exception("客户不可为空!");
			//}
			var logistics = Db.Queryable<SysLogisticsInfo>().First(m => m.IsDel == "0" && m.CarrierName == model.LogisticsNo);
			int? logisticsId = null;
			if (logistics != null)
			@@ -127,8 +127,9 @@
			}
			if (qty > d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(stocks.First().Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			@@ -139,8 +140,8 @@
			}
			else
			{
			stocks = stockList.Where(m=> m.SkuNo == d.SkuNo && !string.IsNullOrWhiteSpace(m.LotNo)).OrderBy(s => s.LotNo).ToList();

			stocks = stockList.Where(m => m.SkuNo == d.SkuNo && !string.IsNullOrWhiteSpace(m.LotNo)).OrderBy(s => s.LotNo).ToList();

			foreach (var demo in stocks)
			{
			if (q1 >= d.Qty)
			@@ -148,20 +149,21 @@
			continue;
			}
			var q2 = demo.Qty - demo.LockQty - demo.FrozenQty;

			if (q2 > d.Qty - q1)

			if (q2 >= d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(demo.Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			q1 += q2;
			dic.Add(demo.Id,q2);
			dic.Add(demo.Id, q2);
			}


			}
			if (d.Qty >= q1)
			if (d.Qty > q1)
			{
			stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
			if (stocks.Count == 0)
			@@ -169,10 +171,11 @@
			throw new Exception($"总库存中出库物料信息:{d.SkuNo}库存数量不足");
			}
			var q2 = stocks.First().Qty - stocks.First().LockQty - stocks.First().FrozenQty;
			if (q2 > d.Qty - q1)
			if (q2 >= d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(stocks.First().Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			@@ -185,49 +188,50 @@
			throw new Exception($"总库存中出库物料信息:{d.SkuNo} 库存数量不足");
			}
			}

			var item = new BllExportNoticeDetail()
			{
			SONo = billNo,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			LotNo = d.LotNo,
			LotText = "",
			Qty = d.Qty,
			AllotQty = 0,
			FactQty = 0,
			CompleteQty = 0,
			PackagNo = sku.PackagNo,
			Price = sku.Price,
			Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * d.Qty,
			IsBale = "",
			IsBelt = "",
			SupplierLot = stocks.First().SupplierLot,
			IsWave = "0",
			WaveNo = "",
			IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo)? "0":"1",

			CreateUser = 0,
			};
			list.Add(item);
			foreach (var s in dic)
			{
			var st = stockList.First(m => m.Id == s.Key);
			var st = stockList.First(a => a.Id == s.Key);
			var item = new BllExportNoticeDetail()
			{
			SONo = billNo,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			LotNo = st.LotNo,
			LotText = st.LotText,
			Qty = s.Value,
			AllotQty = 0,
			FactQty = 0,
			CompleteQty = 0,
			PackagNo = sku.PackagNo,
			Price = sku.Price,
			Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * d.Qty,
			IsBale = "",
			IsBelt = "",
			SupplierLot = stocks.First().SupplierLot,
			IsWave = "0",
			WaveNo = "",
			IsIssueLotNo = string.IsNullOrWhiteSpace(d.LotNo) ? "0" : "1",

			CreateUser = 0,
			};
			list.Add(item);

			st.LockQty += s.Value;//锁定数量
			var i = Db.Updateable(st).UpdateColumns(it => new { it.LockQty })
			.ExecuteCommand();
			}


			}
			var notice = new BllExportNotice()
			{
			SONo = billNo,
			Type = model.SoType,
			Status = "0",
			Origin = "WMS",
			CustomerNo = model.Customer,
			CustomerName = customer.CustomerName,
			Origin = model.Origin,
			//CustomerNo = model.Customer,
			//CustomerName = customer.CustomerName,
			LogisticsId = logisticsId,
			IsWave = "0",
			WaveNo = "",
			@@ -241,12 +245,10 @@

			if (n <= 0 \|\| m <= 0)
			{
			Db.RollbackTran();
			return false;
			throw new Exception("入库单或明细添加保存失败");
			}
			Db.CommitTran();
			return true;


			}
			catch (Exception ex)
			{
			@@ -258,16 +260,27 @@
			}
			catch (Exception ex)
			{
			Db.RollbackTran();
			throw new Exception(ex.Message);
			}
			}

			//回传出库单
			public bool FinishSo(int id, string url, int userId)
			public bool FinishSo(int id, string url, string userNo, string pwd, int userId)
			{
			try
			{
			var loginPwd = Md5Tools.CalcMd5(pwd);
			var date = Db.Queryable<SysUserInfor>().First(m => m.IsDel == "0" && m.UserName == userNo && m.PassWord == loginPwd);

			if (date == null) //账号密码是否正确
			{
			throw new Exception("账号密码不正确或没有此账号");
			}
			if (date.Status != "0") //当前账号是否正常启用
			{
			throw new Exception("当前账号非启用状态");
			}

			var notice = Db.Queryable<BllExportNotice>().First(m => m.Id == id && m.IsDel == "0");
			if (notice == null)
			{
			@@ -282,7 +295,7 @@
			{
			throw new Exception("未查询到单据明细信息");
			}
			if (userId == notice.UpdateUser)
			if (date.Id == notice.UpdateUser)
			{
			throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
			}
			@@ -299,7 +312,7 @@
			}
			var soInfo = new SoInfo()
			{
			OrderCode = notice.OrderCode,
			OrderNo = notice.OrderCode,
			SoDetails = list
			};
			#region 通过接口发送至erp
			@@ -317,10 +330,10 @@

			notice.Status = "6";
			notice.CheckTime = DateTime.Now;
			notice.CheckUser = userId;
			notice.CheckUser = date.Id;
			Db.Updateable(notice).ExecuteCommand();

			new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "复核", $"复核了单据号为{notice.SONo}的单据信息", userId);
			new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "复核", $"{date.RealName}复核了单据号为{notice.SONo}的单据信息", userId);
			return true;
			}
			catch (Exception e)
			@@ -362,31 +375,31 @@
			.LeftJoin<SysUserInfor>((a, b, c, d, e) => a.CheckUser == e.Id)
			.Select((a, b, c, d, e) => new ExportNoticeDto()
			{
			Id = a.Id,
			SONo = a.SONo,
			Type = a.Type,
			Status = a.Status,
			Origin = a.Origin,
			CustomerNo = a.CustomerNo,
			CustomerName = a.CustomerName,
			LotNo = a.LotNo,
			LotText = a.LotText,
			SupplierLot = a.SupplierLot,
			LogisticsId = a.LogisticsId,
			//Id = a.Id,
			//SONo = a.SONo,
			//Type = a.Type,
			//Status = a.Status,
			//Origin = a.Origin,
			//CustomerNo = a.CustomerNo,
			//CustomerName = a.CustomerName,
			//LotNo = a.LotNo,
			//LotText = a.LotText,
			//SupplierLot = a.SupplierLot,
			//LogisticsId = a.LogisticsId,
			LogisticsName = b.CarrierName,
			IsWave = a.IsWave,
			WaveNo = a.WaveNo,
			IsDespatch = a.IsDespatch,
			Demo = a.Demo,
			//IsWave = a.IsWave,
			//WaveNo = a.WaveNo,
			//IsDespatch = a.IsDespatch,
			//Demo = a.Demo,

			CreateUserName = c.RealName,
			UpdateUserName = c.RealName,
			CreateTime = a.CreateTime,
			UpdateTime = a.UpdateTime,
			//CreateTime = a.CreateTime,
			//UpdateTime = a.UpdateTime,

			CheckUserName = e.RealName,
			CheckTime = a.CheckTime
			})
			//CheckTime = a.CheckTime
			},true)
			.OrderByDescending(a => a.CreateTime)
			.ToOffsetPage(page, limit, ref total);
			count = total;
			@@ -435,7 +448,7 @@
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			skuType = "(0,1,2,3)";
			skuType = "(0,1,2,3,4)";
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			@@ -443,8 +456,8 @@
			inspectStatus = "0,1";
			break;
			case "6"://代储出库
			skuType = "(0,1,2,3)";
			inspectStatus = "0,1";
			skuType = "(0,1,2,3,4)";
			inspectStatus = "0,1,2";
			break;
			case "8"://寄存出库
			skuType = "(0,1,2,3)";
			@@ -461,7 +474,7 @@
			throw new Exception("未查到对应出库类型的物料");
			}

			if (type!="8")
			if (type != "8")
			{
			skuList = skuList.Where(m => m != "100088").ToList();
			}
			@@ -477,6 +490,7 @@
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
			.And(m => skuList.Contains(m.SkuNo))
			.AndIF(type == "6", m => m.OwnerNo == ownerNo)//代储出库需要关联货主
			.AndIF(type != "6", m=> string.IsNullOrWhiteSpace(m.OwnerNo))
			.AndIF(!string.IsNullOrWhiteSpace(msg), it => (it.SkuNo.Contains(msg) \|\| it.SkuName.Contains(msg) \|\| it.LotNo.Contains(msg)))
			.And(it => (it.Qty - it.LockQty - it.FrozenQty) > 0)
			.And(it => (it.Status == "0" \|\| it.Status == "1"))
			@@ -505,7 +519,8 @@
			SkuName = it.SkuName,
			LotNo = it.LotNo,
			Standard = it.Standard,
			Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty
			//Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty,
			Qty = it.Qty - it.LockQty - it.FrozenQty,

			}).ToList();

			@@ -643,7 +658,7 @@
			//}
			//if (d.Qty >= q1)
			//{
			stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
			stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
			// if (stocks.Count == 0)
			// {
			// throw new Exception($"总库存中出库物料信息:{d.SkuNo}库存数量不足");
			@@ -665,7 +680,7 @@
			// throw new Exception($"总库存中出库物料信息:{d.SkuNo} 库存数量不足");
			//}
			}


			var item = new BllExportNoticeDetail()
			{
			SONo = billNo,
			@@ -692,7 +707,7 @@
			};
			list.Add(item);



			stocks.First().LockQty += d.Qty;//锁定数量
			var i = Db.Updateable(stocks.First()).UpdateColumns(it => new { it.LockQty })
			.ExecuteCommand();
			@@ -1231,9 +1246,9 @@
			{
			throw new Exception("未查询到出库单据信息");
			}
			if (notice.Status != "4")
			if (notice.Status != "4" && notice.Status != "3")
			{
			throw new Exception("参数异常,请检查状态是否为执行完成或订单关闭");
			throw new Exception("参数异常,请检查状态是否为正在执行或执行完成");
			}
			//总库存信息
			var stockList = Db.Queryable<DataStock>().ToList();
			@@ -1254,64 +1269,67 @@

			foreach (var d in noticeDetail)
			{
			//更改库存明细锁定数量
			//var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id
			// && o.ExportExecuteFlag != "4" && o.ExportExecuteFlag == "3" && o.pickingType == 0).ToList();
			//foreach (var o in orders)
			//{
			// if (o.ExportQuantity > o.PickedNum) //判断拣货是否已拣完
			// {
			// var pq = dataContext.WmsStockTray.Where(t => t.StockGoodId == o.ExportGoodsCode && t.StockStockCode == o.ExportStockCode);

			// if (string.IsNullOrWhiteSpace(o.ExportLotNo))
			// {
			// pq = pq.Where(t => t.StockLotNo == null \|\| t.StockLotNo == "");
			// }
			// else
			// {
			// pq = pq.Where(t => t.StockLotNo == o.ExportLotNo);
			// }
			// var pallet = pq.FirstOrDefault();
			// //库存托盘信息锁定数量还原为未锁定
			// if (pq != null)
			// {
			// pallet.LockQuantity -= o.ExportQuantity.Value - o.PickedNum;
			// pallet.StockQuantity += o.ExportQuantity.Value - o.PickedNum;
			// }
			// }
			//}

			if (d.Qty != d.CompleteQty)
			if (notice.Type == "0")//成品出库
			{
			throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
			}
			#region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
			/*var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
			if (!string.IsNullOrWhiteSpace(d.LotNo))
			{
			sq = sq.Where(s => s.LotNo == d.LotNo);
			}
			else
			{
			sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
			}
			var st = sq.FirstOrDefault();
			if (st != null)
			{
			if (d.CompleteQty <= d.Qty)
			if (d.Qty != d.CompleteQty)
			{
			st.Qty += d.Qty - d.CompleteQty.Value;
			throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
			}
			}
			if (d.Qty < d.CompleteQty)
			{
			//更改库存明细锁定数量
			var allotList = Db.Queryable<BllExportAllot>().Where(o => o.SODetailNo == d.Id && o.Status == "3" && o.IsDel == "0").ToList();
			foreach (var o in allotList)
			{
			if (o.Qty > o.CompleteQty) //判断拣货是否已拣完
			{
			var pq = Db.Queryable<DataStockDetail>().Where(t => t.IsDel == "0" && t.Id == o.StockId && t.SkuNo == o.SkuNo);

			if (string.IsNullOrWhiteSpace(o.LotNo))
			{
			pq = pq.Where(t => string.IsNullOrWhiteSpace(t.LotNo));
			}
			else
			{
			pq = pq.Where(t => t.LotNo == o.LotNo);
			}
			var pallet = pq.First();
			//库存托盘信息锁定数量还原为未锁定
			if (pq != null)
			{
			//pallet.Qty -= o.CompleteQty.Value - o.Qty;
			pallet.LockQty -= o.Qty - o.CompleteQty.Value;
			Db.Updateable(pallet).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
			}
			}
			}


			#region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
			var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
			if (!string.IsNullOrWhiteSpace(d.LotNo))
			{
			sq = sq.Where(s => s.LotNo == d.LotNo);
			}
			else
			{
			st.Qty -= d.CompleteQty.Value - d.Qty;
			sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
			}
			st.LockQty -= d.Qty;
			st.Qty -= d.Qty;
			//修改总库存表
			Db.Updateable(st).UpdateColumns(it => new { it.Qty, it.LockQty }).ExecuteCommand();
			}*/
			#endregion
			if (notice.Type == "6")//代储
			{
			sq = sq.Where(s => s.OwnerNo == notice.CustomerNo);
			}
			var st = sq.FirstOrDefault();
			if (st != null)
			{
			st.LockQty -= d.Qty - d.CompleteQty.Value;
			//修改总库存表
			Db.Updateable(st).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
			}
			#endregion
			}

			}
			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "关单", $"关闭了单据号为{notice.SONo}的单据信息", userId);
			@@ -1880,6 +1898,7 @@
			OutMode = "", //目标地址
			Order = 1
			});
			taskNoStr = exTask.TaskNo;
			}
			else if (locate.Depth == "02") //深度为2
			{
			@@ -1968,7 +1987,7 @@
			IsSuccess = 0, //是否下发成功 0失败 1成功

			StartLocat = stockNew.LocatNo,//起始位置
			EndLocat = "",//目标位置
			EndLocat = toLocation,//目标位置
			PalletNo = stockNew.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			@@ -1985,7 +2004,7 @@
			StartRoadway = slotBefore.RoadwayNo, //起始巷道
			PalletNo = stockNew.PalletNo,//托盘号
			StartLocate = stockNew.LocatNo, // 起始位置
			EndLocate = "", // 目标位置
			EndLocate = toLocation, // 目标位置
			EndRoadway = "", // 目标巷道
			TaskNo = exYkTask1.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)
			@@ -2022,7 +2041,7 @@
			IsSuccess = 0, //是否下发成功 0失败 1成功

			StartLocat = locate.LocatNo,//起始位置
			EndLocat = "",//目标位置
			EndLocat = toLocation,//目标位置
			PalletNo = item.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			@@ -2033,13 +2052,13 @@
			Msg = locate.LocatNo + "的出库任务"
			};
			Db.Insertable(exTask1).ExecuteCommand();

			logTaskList.Add(exTask1);
			outDto2.Add(new OutCommandDto()
			{
			StartRoadway = locate.RoadwayNo, //起始巷道
			PalletNo = item.PalletNo,//托盘号
			StartLocate = locate.LocatNo, // 起始位置
			EndLocate = "", // 目标位置
			EndLocate = toLocation, // 目标位置
			EndRoadway = locate.RoadwayNo, //目标巷道
			TaskNo = exTask1.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)
			@@ -2114,7 +2133,7 @@
			var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "1" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
			if (taskNo == null)
			{
			taskNo = logTaskList.First(m => m.PalletNo == item.PalletNo);//当前有同托盘不同物料出库
			taskNo = logTaskList.FirstOrDefault(m => m.PalletNo == item.PalletNo);//当前有同托盘不同物料出库
			}
			if (taskNo == null)
			{
			@@ -2133,7 +2152,8 @@
			flagList.Add(1);
			}
			}

			outDto1.AddRange(moveDto);
			outDto1.AddRange(outDto2);
			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", soNo, "出库", $"点击出库按钮出库单号为：{soNo}的出库单", userId);
			Db.CommitTran();
			@@ -2159,6 +2179,10 @@
			{
			str += "3.要出库的托盘正在入库、";
			}
			if (string.IsNullOrWhiteSpace(str))
			{
			str += "托盘可执行，无需下发出库任务";
			}
			if (outDto1.Count > 0)
			{
			// 正式运行程序放开
			@@ -2168,23 +2192,23 @@

			try
			{
			//var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			//response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			//var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			//////解析返回数据
			//var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			//if (wcsModel.StatusCode == 0)
			//{
			// //更改任务的发送返回时间//
			// new TaskServer().EditTaskIssueOk(list2, time1, time2);
			// str += "下发成功";
			//}
			//if (wcsModel.StatusCode == -1)
			//{
			// new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			// throw new Exception(wcsModel.Msg);
			//}
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			str += "下发成功";
			}
			if (wcsModel.StatusCode == -1)
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			throw new Exception(wcsModel.Msg);
			}
			}
			catch (Exception ex)
			{
			@@ -2451,7 +2475,7 @@


			//重新下发出库任务
			public OutCommandDto AgainSendSoTask(string taskNo, int userId, string url)
			public OutCommandDto AgainSendSoTask(string taskNo, string Receiver, int userId, string url)
			{
			try
			{
			@@ -2502,22 +2526,42 @@
			{
			//程序正式发布后放开
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			var response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			var response = HttpHelper.DoPost(url, jsonData, Receiver == "WCS" ? "下发给WCS出库命令" : "下发给AGV出库命令", "WCS");
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			////解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			if (Receiver == "WCS")
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list, time1, time2);
			////解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list, time1, time2);

			}
			if (wcsModel.StatusCode == -1)
			{
			new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
			throw new Exception($"wcs返回状态异常：{wcsModel.Msg}");
			}
			}
			if (wcsModel.StatusCode == -1)
			else if (Receiver == "AGV")
			{
			new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
			throw new Exception($"wcs返回状态异常：{wcsModel.Msg}");
			////解析返回数据
			var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
			if (agvModel.Code == "0")
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list, time1, time2);

			}
			if (agvModel.Code == "1")
			{
			new TaskServer().EditTaskIssueNo(list, time1, time2, agvModel.Message);
			throw new Exception($"agv返回状态异常：{agvModel.Message}");
			}
			}

			}
			catch (Exception ex)
			{
			@@ -2545,6 +2589,38 @@
			{
			throw new Exception("未查询到任务信息");
			}
			//获取对应库位信息
			var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			if (startlocat == null)
			{
			throw new Exception("未查询到储位信息");
			}
			startlocat.Status = "0";//修改分配信息状态
			//获取储位信息
			var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			//获取移库任d务对应目标储位信息
			SysStorageLocat endlocat = new SysStorageLocat();
			if (task.Type == "2")
			{
			endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
			if (endlocat == null)
			{
			throw new Exception("未查询到目标储位信息");
			}
			}
			if (locat == null)
			{
			Db.RollbackTran();
			throw new Exception("未查询到储位信息，请核实！");
			}
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();
			if (endlocat != null)
			{
			endlocat.Status = "0"; //空储位 0
			Db.Updateable(endlocat).ExecuteCommand();
			}

			//修改任务
			task.IsSuccess = 1;
			task.IsSend = 0;
			@@ -2568,31 +2644,6 @@

			noticeDetail.FactQty -= item.Qty; //修改出库单明细的下架数量
			Db.Updateable(noticeDetail).ExecuteCommand();

			//获取储位信息
			var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			//获取移库任务对应目标储位信息
			SysStorageLocat endlocat = new SysStorageLocat();
			if (task.Type == "2")
			{
			endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W03" && a.LocatNo == task.EndLocat);
			if (endlocat == null)
			{
			throw new Exception("未查询到目标储位信息");
			}
			}
			if (locat == null)
			{
			Db.RollbackTran();
			throw new Exception("未查询到储位信息，请核实！");
			}
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();
			if (endlocat != null)
			{
			endlocat.Status = "0"; //空储位 0
			Db.Updateable(endlocat).ExecuteCommand();
			}

			if (noticeDetail.FactQty == 0)
			{
			@@ -2835,7 +2886,7 @@
			}
			else
			{
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && m.IsDel == "0").ToList(); //&& string.IsNullOrWhiteSpace(m.LotNo)
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && m.IsDel == "0" && string.IsNullOrWhiteSpace(m.LotNo)).ToList(); //
			}

			if (stockDetail.Count < 1)
			@@ -2843,11 +2894,11 @@
			throw new Exception("库存不足,无可出库库存");
			}
			//0:成品出库、1:领料出库、2:抽检出库、3：物料取样出库、4:不合格品出库、5:中间品出库、6:代储出库、7:其他出库、8:寄存出库
			if (notice.Type == "0" \|\| notice.Type == "1" )//成品、原辅料出库
			if (notice.Type == "0" \|\| notice.Type == "1")//成品、原辅料出库
			{
			stockDetail = stockDetail.Where(m => m.InspectStatus == "1").ToList();
			}
			else if (notice.Type == "3" )//取样出库
			else if (notice.Type == "3")//取样出库
			{
			stockDetail = stockDetail.Where(m => m.InspectStatus == "0").ToList();
			}
			@@ -2858,46 +2909,48 @@
			else if (notice.Type == "4")//不合格出库
			{
			stockDetail = stockDetail.Where(m => m.InspectStatus == "2").ToList();
			}
			}

			#region 包装信息

			var pack = packList.FirstOrDefault(p => p.PackagNo == detail.PackagNo);
			if (pack == null)
			{
			throw new Exception("未查询到物料包装");
			}
			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱物品数量
			if (pack.L5Num.HasValue)
			if (pack != null)
			{
			pNum = Convert.ToInt32(pack.L5Num);
			bNum = Convert.ToInt32(pack.L4Num);
			//throw new Exception("未查询到物料包装");
			if (pack.L5Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L5Num);
			bNum = Convert.ToInt32(pack.L4Num);
			}
			else if (pack.L4Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L4Num);
			bNum = Convert.ToInt32(pack.L3Num);
			}
			else if (pack.L3Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L3Num);
			bNum = Convert.ToInt32(pack.L2Num);
			}
			else if (pack.L2Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L2Num);
			bNum = Convert.ToInt32(pack.L1Num);
			}
			else if (pack.L1Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L1Num);
			bNum = Convert.ToInt32(pack.L1Num);
			}
			}
			else if (pack.L4Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L4Num);
			bNum = Convert.ToInt32(pack.L3Num);
			}
			else if (pack.L3Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L3Num);
			bNum = Convert.ToInt32(pack.L2Num);
			}
			else if (pack.L2Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L2Num);
			bNum = Convert.ToInt32(pack.L1Num);
			}
			else if (pack.L1Num.HasValue)
			{
			pNum = Convert.ToInt32(pack.L1Num);
			bNum = Convert.ToInt32(pack.L1Num);
			}
			if (pNum == 0)
			{
			throw new Exception("未查询到物料包装托箱关系信息");
			}


			//if (pNum == 0)
			//{
			// throw new Exception("未查询到物料包装托箱关系信息");
			//}
			#endregion
			//取合适库存商品
			Dictionary<int, decimal> stockQtyDic = new Dictionary<int, decimal>();//托出库物品数
			@@ -3112,7 +3165,7 @@
			// {
			// d.LotNo = "";
			// }


			//}
			}
			notice.Status = "0";
			@@ -3182,26 +3235,63 @@
			{
			throw new Exception("获取失败，未找到指定出库单！");
			}
			if (detail.Status != "0" && detail.Status != "1" && detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单状态不是等待执行或分配中！");
			}
			if (detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单已分配完成!");
			}

			var notice = Db.Queryable<BllExportNotice>().First(a => a.SONo == detail.SONo);
			if (notice == null)
			{
			throw new Exception("获取失败，未找到指定出库单!");
			}
			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			if (notice.Type != "1" && notice.Type != "2" && notice.Type != "3")
			{
			throw new Exception("获取失败，出库单状态不允许!");
			if (detail.Status != "0" && detail.Status != "1" && detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单状态不是等待执行或分配中！");
			}
			if (detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单已分配完成!");
			}

			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			{
			throw new Exception("获取失败，出库单状态不允许!");
			}
			}
			string inspectStatus = string.Empty;
			switch (notice.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
			{
			case "0"://成品出库
			inspectStatus = "1";
			break;
			case "1"://领料出库
			inspectStatus = "1";
			break;
			case "2"://抽检出库
			inspectStatus = "0,1,2";
			break;
			case "3"://物料取样出库
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			inspectStatus = "1";
			break;
			case "6"://代储出库
			inspectStatus = "0,1,2";
			break;
			case "8"://寄存出库
			inspectStatus = "0,1";
			break;
			default: //其它出库
			inspectStatus = "0,1";
			break;
			}
			#endregion

			Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), m => inspectStatus.Contains(m.InspectStatus))
			.AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
			.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
			.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)
			@@ -3249,29 +3339,36 @@
			{
			throw new Exception("操作失败，未找到指定出库单详情！");
			}
			if (detail.AllotQty >= detail.Qty \|\| (detail.Status != "0" && detail.Status != "1"))
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}
			var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == detail.SONo);
			if (notice == null)
			{
			throw new Exception("操作失败，未找到指定出库单！");
			}
			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			if (notice.Type != "1" && notice.Type != "2" && notice.Type !="3")
			{
			throw new Exception("操作失败，出库单已分配完成！");
			if (detail.AllotQty >= detail.Qty \|\| (detail.Status != "0" && detail.Status != "1"))
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}

			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}

			//单据明细需要的出库数量
			var needQty = detail.Qty - detail.AllotQty;
			//分配的出库数量
			var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
			if (outQty < needQty)
			{
			throw new Exception("操作失败，出库数量不能大于计划数量！");
			}
			}

			#endregion

			//单据明细需要的出库数量
			var needQty = detail.Qty - detail.AllotQty;
			//分配的出库数量
			var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
			if (outQty != needQty)
			{
			throw new Exception("操作失败，出库数量与计划数量不一致！");
			}

			var stockIds = model.StockList.Select(a => a.StockId).ToList();
			//库存明细
			var stockList = Db.Queryable<DataStockDetail>().Where(a => stockIds.Contains(a.Id)).ToList();
			@@ -3280,10 +3377,10 @@
			var allots = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == detail.Id && m.Status == "0").ToList();

			//库存总表
			//var stockz = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);
			var stockz = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);

			var allotList = new List<BllExportAllot>();
			var outQtys = 0;
			decimal outQtys = 0;
			foreach (var st in model.StockList)
			{
			var stock = stockList.First(a => a.Id == st.StockId);
			@@ -3317,7 +3414,7 @@
			IsBelt = stock.IsBelt,
			Qty = st.Qty,
			CompleteQty = 0,
			Status = "0",
			Status = notice.Status == "4"? "2":"0",
			LogisticsId = notice.LogisticsId,
			IsAdvance = "0",
			OutMode = "",//出库口
			@@ -3332,15 +3429,16 @@
			bl.Qty += st.Qty;
			Db.Updateable(bl).ExecuteCommand();
			}


			//库存明细
			stock.LockQty += st.Qty;
			stock.Status = stock.LockQty == stock.Qty ? "2" : "1";

			//库存总表
			//stockz.LockQty += st.Qty;
			//Db.Updateable(stockz).ExecuteCommand();

			if (detail.AllotQty+ st.Qty > detail.Qty)
			{
			//库存总表
			stockz.LockQty += (decimal)detail.AllotQty + st.Qty - detail.Qty;
			Db.Updateable(stockz).ExecuteCommand();
			}

			Db.Updateable(stock).UpdateColumns(it => new { it.LockQty, it.Status }).ExecuteCommand();
			outQtys += st.Qty;