JC24WMS.git - Gitblit

			@@ -1370,6 +1370,14 @@
			#endregion

			#region 添加移库任务信息
			var stkModel = Db.Queryable<DataStockDetail>().First(m => m.LocatNo == slotBefore.LocatNo);
			string PalletNo = "LN000000"; // 默认演示托盘
			if (stkModel != null)
			{
			PalletNo = stkModel.PalletNo;
			}
			//获取移库的库位
			var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, stkModel.SkuNo);

			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask //出库任务
			@@ -1379,9 +1387,9 @@
			Receiver = "PDA",
			IsSuccess = 1, //是否下发成功 0失败 1成功

			StartLocat = locat == null ? "" : s.LocatNo,//起始位置
			EndLocat = model.OutMode,//目标位置
			PalletNo = s.PalletNo,//托盘码
			StartLocat = stkModel.LocatNo,//起始位置
			EndLocat = newSlot,//目标位置
			PalletNo = PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			@@ -1390,7 +1398,7 @@
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			CreateTime = serverTime, //创建时间
			CreateUser = userId, //创建人
			Msg = "Pda空托从" + locat == null ? "" : s.LocatNo + "到" + model.OutMode + "的移库任务", //关键信息
			Msg = "Pda空托从" + locat == null ? "" : s.LocatNo + "到" + newSlot + "的移库任务", //关键信息
			//FinishDate = serverTime, //完成时间
			};
			moveDto.Add(new OutCommandDto()
			@@ -1398,10 +1406,10 @@
			PalletNo = exTask.PalletNo,//托盘号
			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = model.OutMode, // 目标位置
			EndLocate = exTask.EndLocat, // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "2",// 任务类型 (出库)
			OutMode = model.OutMode, //目标地址
			OutMode = "", //目标地址
			Order = 1
			});
			Db.Insertable(exTask).ExecuteCommand();
			@@ -1731,7 +1739,7 @@
			}

			////更改储位状态为出库中
			//locat.Status = "3"; //3 出库中
			//locat.Status = "3"; // 1 有物品
			//locat.UpdateTime = serverTime; //修改时间
			//locat.UpdateUser = userId; //修改人
			////修改储位信息
			@@ -2082,18 +2090,26 @@
			#endregion

			#region 添加移库任务信息
			var stkModel = Db.Queryable<DataStockDetail>().First(m=>m.LocatNo == slotBefore.LocatNo);
			string PalletNo = "LN000000"; // 默认演示托盘
			if (stkModel != null)
			{
			PalletNo = stkModel.PalletNo;
			}
			//获取移库的库位
			var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, stkModel.SkuNo);

			var taskNo = new Common().GetMaxNo("TK");
			var exTask = new LogTask //出库任务
			var exTask = new LogTask // 移库任务
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功

			StartLocat = locat == null ? "" : s.LocatNo,//起始位置
			EndLocat = model.OutMode,//目标位置
			PalletNo = s.PalletNo,//托盘码
			StartLocat = stkModel.LocatNo,//起始位置
			EndLocat = newSlot,//目标位置
			PalletNo = PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			IsCancel = 1,//是否可取消
			IsFinish = 1,//是否可完成
			@@ -2102,7 +2118,7 @@
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			CreateTime = serverTime, //创建时间
			CreateUser = userId, //创建人
			Msg = "WCS空托从" + locat == null ? "" : s.LocatNo + "到" + model.OutMode + "的移库任务", //关键信息
			Msg = "WCS空托从" + locat == null ? "" : s.LocatNo + "到" + newSlot + "的移库任务", //关键信息
			//FinishDate = serverTime, //完成时间
			};
			moveDto.Add(new OutCommandDto()
			@@ -2110,10 +2126,10 @@
			PalletNo = exTask.PalletNo,//托盘号
			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = model.OutMode, // 目标位置
			EndLocate = exTask.EndLocat, // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "2",// 任务类型 (出库)
			OutMode = model.OutMode, //目标地址
			OutMode = "", //目标地址
			Order = 1
			});
			Db.Insertable(exTask).ExecuteCommand();
			@@ -3300,6 +3316,7 @@
			}
			}


			//取样出库拣货(无标签)
			public void SampleSoSetQtyPick(string soType, string soNo, string soDetailId, string palletNo, string PickQty, string asnNo, int userId)
			{

	Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2291,7 +2291,7 @@

			SysStorageLocat locate;
			var areaList = new List<string>();
			areaList.Add("A07");
			areaList.Add("A03");
			locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);

			Db.BeginTran();