JC24WMS.git - Gitblit

			@@ -1466,11 +1466,11 @@
			toLocation = outMode;//出库口
			}
			}
			else
			else
			{
			unstackingMode2 = "1";//非成品出库走PDA拆垛
			toLocation = outMode;//出库口
			}
			}
			#endregion

			// 储位号
			@@ -1885,23 +1885,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)
			{
			@@ -2087,6 +2087,86 @@
			}
			}

			/// <summary>
			/// wcs返回的成功信号（移库成功）
			/// </summary>
			/// <param name="taskNo">任务号</param>
			/// <param name="userId">操作人</param>
			/// <exception cref="Exception"></exception>
			public void RelocationSuccess(string taskNo, int userId)
			{
			try
			{
			//当前任务信息
			var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
			if (task == null)
			{
			throw new Exception($"未查询到任务号为：‘{taskNo}’的任务信息");
			}
			if (task.Status == "2")
			{
			throw new Exception("当前任务已完成");
			}
			Db.BeginTran();
			//库存中当前托盘的信息
			var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
			//当前任务中的目标储位信息
			//当前任务中的原储位
			var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.StartLocat);
			if (locate == null)
			{
			throw new Exception($"WMS系统中没有该{task.StartLocat}储位对应的信息");
			}
			var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
			if (locate2 == null)
			{
			throw new Exception($"WMS系统中没有该{task.EndLocat}储位对应的信息");
			}

			try
			{
			task.Status = "2";//任务状态
			task.IsSend = 0;
			task.IsCancel = 0;
			task.IsFinish = 0;
			task.FinishDate = DateTime.Now;//完成时间
			Db.Updateable(task).ExecuteCommand();

			#region 修改储位状态

			//原储位改为空储位 0
			locate.Status = "0";
			Db.Updateable(locate).ExecuteCommand();

			//目标储位改为有货物 1
			locate2.Status = "1";
			Db.Updateable(locate2).ExecuteCommand();
			foreach (var item in stockDetail)
			{
			item.WareHouseNo = locate2.WareHouseNo;
			item.AreaNo = locate2.AreaNo;
			item.RoadwayNo = locate2.RoadwayNo;
			item.LocatNo = locate2.LocatNo;
			}
			Db.Updateable(stockDetail).ExecuteCommand();

			#endregion

			Db.CommitTran();
			}
			catch (Exception ex)
			{
			Db.RollbackTran();
			throw new Exception(ex.Message);
			}
			}
			catch (Exception ex)
			{
			throw new Exception("完成反馈失败：" + ex.Message);
			}
			}


			//重新下发出库任务
			public OutCommandDto AgainSendSoTask(string taskNo, int userId, string url)
			{
			@@ -2208,7 +2288,16 @@

			//获取储位信息
			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();
			@@ -2216,6 +2305,11 @@
			}
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();
			if (endlocat != null)
			{
			endlocat.Status = "0"; //空储位 0
			Db.Updateable(endlocat).ExecuteCommand();
			}

			if (noticeDetail.FactQty == 0)
			{
			@@ -2404,7 +2498,7 @@
			}
			if (notice.Status != "0" && notice.Status != "1")
			{
			throw new Exception("参数异常,请检查状态是否为等待执行或部分分配或来源是否是WMS");
			throw new Exception("参数异常,请检查状态是否为等待执行或部分分配;");
			}
			//出库单明细
			var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.AllotQty - m.Qty) <= 0).ToList();
			@@ -2439,32 +2533,46 @@
			//判断单号是否指定批次
			if (!string.IsNullOrWhiteSpace(detail.LotNo))
			{
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && m.LotNo == detail.LotNo && m.IsDel == "0").ToList();
			if (detail.LotNo.Contains(";"))
			{
			var lotNoList = detail.LotNo.Split(";");
			var lotNoList2 = new List<string>();

			foreach (var lotNoItem in lotNoList)
			{
			lotNoList2.Add(lotNoItem);
			}
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && lotNoList2.Contains(m.LotNo) && m.IsDel == "0").ToList();
			}
			else
			{
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && m.LotNo == detail.LotNo && m.IsDel == "0").ToList();
			}

			}
			else
			{
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && string.IsNullOrWhiteSpace(m.LotNo) && m.IsDel == "0").ToList();
			stockDetail = stockDetail.Where(m => m.SkuNo == detail.SkuNo && m.IsDel == "0").ToList(); //&& string.IsNullOrWhiteSpace(m.LotNo)
			}

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

			//if (notice.Type == "0" \|\| notice.Type == "1")//成品、原辅料出库
			//{
			stockDetail = stockDetail.Where(m => m.InspectStatus == "1").ToList();
			//}
			//else if (notice.Type == "2" \|\| notice.Type == "3")//成品、原辅料出库(不合格)
			//{
			// stockDetail = stockDetail.Where(m => m.InspectStatus == "2").ToList();
			//}
			//else if (notice.Type == "4")//取样出库
			//{
			// stockDetail = stockDetail.Where(m => m.InspectStatus == "0").ToList();
			//}
			//将库存明细按深度进行排序深度1在前深度2在后
			//stockDetail = stockDetail.OrderBy(d => int.Parse(d.LocatNo.Substring(6, 2))).ToList();
			#region 包装信息

			var pack = packList.FirstOrDefault(p => p.PackagNo == detail.PackagNo);
			@@ -2556,6 +2664,22 @@
			}

			var sd = Db.Updateable(s).UpdateColumns(it => new { it.LockQty, it.Status }).ExecuteCommand();
			if (notice.Type == "1" \|\| notice.Type == "5" \|\| notice.Type == "6" \|\| notice.Type == "7" \|\| notice.Type == "8")//1：领料出库、
			{
			if (string.IsNullOrWhiteSpace(detail.LotNo))
			{
			detail.LotNo = s.LotNo;

			}
			else
			{
			if (!detail.LotNo.Contains(s.LotNo))
			{
			detail.LotNo += ";" + s.LotNo;
			}
			}
			}

			}
			detail.AllotQty += qty;
			detail.UpdateUser = userId;
			@@ -3041,10 +3165,7 @@
			var lie = int.Parse(oldAddress.Substring(2, 2));
			var ceng = int.Parse(oldAddress.Substring(4, 2));

			var sqlString = $@"select LocatNo,[Row],[Column],Layer, (ABS(Row-{row}) + ABS([Column]-{lie}) + ABS(Layer-{ceng})) as distNum
			from SysStorageLocat
			where Flag = '0' and Status = '0' and Depth = '02' and RoadwayNo = '{roadWay}' and AreaNo in '{category}'
			order by distNum;";
			var sqlString = $@"select LocatNo,[Row],[Column],Layer, (ABS(Row-{row}) + ABS([Column]-{lie}) + ABS(Layer-{ceng})) as distNum from SysStorageLocat where Flag = '0' and Status = '0' and Depth = '02' and RoadwayNo = '{roadWay}' and AreaNo in ('{category.AreaNo}') order by distNum;";

			var addressModels = Db.Ado.SqlQuery<AddressCls>(sqlString).ToList();
			if (addressModels.Count > 0) // 判断同巷道内排空库位