JC34WMS.git - Gitblit

			@@ -1014,10 +1014,11 @@
			skuList = skuList.Where(m => m.SkuNo == "100088").ToList();
			}
			skuStrList = skuList.Select(m => m.SkuNo).ToList();
			var areaStr = new List<string>() { "B06", "B07", "B09" };
			var stockRst = new StockServer();
			var stockDetailRst = new StockDetailServer();
			Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
			.And(it => it.WareHouseNo == house \|\| string.IsNullOrWhiteSpace(it.LocatNo))
			.And(it => it.WareHouseNo == house \|\| string.IsNullOrWhiteSpace(it.LocatNo) \|\| (it.WareHouseNo == "W04" && !areaStr.Contains(it.AreaNo)))
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
			.And(m => skuStrList.Contains(m.SkuNo))
			.AndIF(type == "6", m => m.OwnerNo == ownerNo)//代储出库需要关联货主
			@@ -3033,7 +3034,7 @@
			foreach (var item in list)
			{
			var outModeLocate = "";
			if (outMode == "1")
			if (outMode == "17")
			{
			if (i < outLocatelist1.Count)
			{
			@@ -3042,11 +3043,11 @@
			else
			{
			var j = i % outLocatelist1.Count;


			outModeLocate = outLocatelist1[j].LocatNo;
			}
			}
			else if(outMode == "2")
			else if (outMode == "18")
			{
			if (i < outLocatelist1.Count)
			{
			@@ -3058,6 +3059,10 @@

			outModeLocate = outLocatelist2[j].LocatNo;
			}
			}
			else
			{
			throw new Exception("出库口工位异常");
			}

			var taskNoStr = "";
			@@ -3150,18 +3155,17 @@

			outDto1.Add(new OutCommandDto()
			{
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)0入 1出 2移

			PalletNo = item.PalletNo,//托盘号
			StartLocate = locate.LocatNo, // 起始位置
			StartRoadway = locate.RoadwayNo,//其实巷道
			EndLocate = outModeLocate, // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)0入 1出 2移
			OutMode = outModeLocate, //出库口
			Order = 1,

			//UnstackingMode = "unstackingMode2",//拣货方式 0机器拆托出 1 人工拣货出
			//CompleteQty = outCount2, //拆的件数
			//BoxexQty = outCount, //总件数

			Order = 999,
			Type = PLCTypeEnum.AGV

			});
			taskNoStr = exTask.TaskNo;

			@@ -3376,11 +3380,12 @@
			try
			{
			List<LogTask> logTaskList = new List<LogTask>();//此次出库任务集合，为应对同托盘不同物料出库


			//循环分配的信息生成出库任务
			foreach (var item in list)
			{
			var taskNoStr = "";
			string toLocation = string.Empty;//目标位置

			// 储位号
			var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo;
			@@ -3390,11 +3395,11 @@
			//判断托盘是否在库内
			if (string.IsNullOrWhiteSpace(locateNo)) //库外
			{
			if (notice.Type == "0")
			{
			flagList.Add(5);
			continue;
			}
			//if (notice.Type == "0")
			//{
			// flagList.Add(5);
			// continue;
			//}
			//判断托盘是否在入库中
			var imBl = com.GetImTask(item.PalletNo);
			if (imBl != null)
			@@ -3446,8 +3451,6 @@
			}

			#endregion



			if (locate.Status == "1") //有物品
			{
			@@ -3515,7 +3518,7 @@
			Type = "2",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "从" + locate.LocatNo + "到" + toLocation + "的出库任务", //关键信息
			Msg = "从" + locate.LocatNo + "到" + moveAddress + "的移库任务", //关键信息
			};
			Db.Insertable(ykTask).ExecuteCommand();
			logTaskList.Add(ykTask);
			@@ -3563,7 +3566,7 @@
			IsSuccess = 0, //是否下发成功 0失败 1成功

			StartLocat = locate.LocatNo,//起始位置
			EndLocat = toLocation,//outMode,//目标位置
			EndLocat = outMode,//outMode,//目标位置
			PalletNo = item.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			@@ -3571,11 +3574,11 @@
			Type = "1",//任务类型 0 入库任务 1 出库任务 2 移库任务
			Status = "0",//任务状态0：等待执行1正在执行2执行完成
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			Msg = "从" + locate.LocatNo + "到" + toLocation + "的出库任务", //关键信息
			Msg = "从" + locate.LocatNo + "到" + outMode + "的出库任务", //关键信息
			};
			Db.Insertable(exTask).ExecuteCommand();
			logTaskList.Add(exTask);
			var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation);
			var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, outMode);
			outDto1.Add(new OutCommandDto()
			{
			PalletNo = item.PalletNo,//托盘号
			@@ -3715,23 +3718,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<WcsModel2>(response);
			if (wcsModel.code == 200)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			str += "下发成功";
			}
			else
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
			throw new Exception(wcsModel.message);
			}
			}
			catch (Exception ex)
			{
			@@ -4331,12 +4334,12 @@
			try
			{

			task.Status = "5";//任务状态
			//判断起始目标位置都是平库
			if (pingKuList.Contains(task.StartLocat) && pingKuList.Contains(task.EndLocat))
			{
			//task.Status = "5";//任务状态
			////判断起始目标位置都是平库
			//if (pingKuList.Contains(task.StartLocat) && pingKuList.Contains(task.EndLocat))
			//{
			task.Status = "2";
			}
			//}

			task.IsSend = 0;
			task.IsCancel = 0;