JC34WMS.git - Gitblit

			@@ -22,6 +22,7 @@
			using WMS.Entity.BllAsnEntity;
			using System.Threading.Tasks;
			using Utility;
			using WMS.BLL.Logic;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -118,20 +119,20 @@
			#region 拼托信息
			var sdId = 0;
			bool isNew = false;
			var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);

			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);

			if (pinStockDetail != null)
			{
			if (palletNo != palletNoNew)//非整托拣货
			{
			if (pinStockDetail.SONo != notice.SONo)
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id!= pinStockDetail.Id).ToList();
			if (pinStockDetails.Count(m=>m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}

			sdId = pinStockDetail.Id;
			}
			else
			@@ -147,6 +148,7 @@
			newPalletInfo.Status = "1";
			await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
			}

			var sd = new DataStockDetail();
			if (isNew)
			{
			@@ -189,7 +191,7 @@
			sd.IsDel = "0";
			sd.CreateUser = userId;
			sd.CreateTime = nowDate;

			sd.UDF5 = "1";
			//新增拼托库存明细信息
			sdId = await Db.Insertable(sd).ExecuteReturnIdentityAsync();
			}
			@@ -269,6 +271,7 @@

			if (palletNo != palletNoNew)
			{
			var locateStr = stockDetail.LocatNo;
			//删除原托盘库存明细
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();

			@@ -280,10 +283,19 @@
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();

			//更改储位状态为空储位
			var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
			if (locate != null)
			{
			locate.Status = "0";
			Db.Updateable(locate).ExecuteCommand();
			}
			}
			else
			{
			stockDetail.SONo = soNo;
			stockDetail.UDF5 = "1";
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}

			@@ -301,14 +313,13 @@
			}
			else
			{
			var biaoShi = "0";//0：整箱拣货、1：散支拣货、2：数量拣货
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			if (await boxInfo.CountAsync() == 0)
			{
			throw Oops.Bah("未查询到该箱码的信息");
			}

			boxInfos = boxInfo.ToList();
			var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();

			//整箱拣货
			@@ -322,7 +333,7 @@
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			boxInfos = await boxInfo.ToListAsync();

			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
			@@ -360,9 +371,13 @@
			comList.Add(completeDetail);

			//修改库存箱码明细
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			if (palletNo != palletNoNew)
			{
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			}

			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			await Db.Updateable(item).ExecuteCommandAsync();

			@@ -382,6 +397,7 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			stockDetail.UDF5 = "1";
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -397,15 +413,9 @@

			if (stockDetail.Qty <= 0)
			{
			var locateStr = stockDetail.LocatNo;
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}
			var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (num2 <= 0)
			{

			//改变托盘状态
			var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			@@ -414,7 +424,20 @@
			}
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();

			//更改储位状态为空储位
			var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
			if (locate != null)
			{
			locate.Status = "0";
			Db.Updateable(locate).ExecuteCommand();
			}
			}
			else
			{
			await Db.Updateable(stockDetail).ExecuteCommandAsync();
			}

			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			await Db.Updateable(noticeDetail).ExecuteCommandAsync();
			@@ -542,18 +565,15 @@

			#region 拼托信息
			bool isNew = false;
			var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
			var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo== stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
			if (pinStockDetail != null)
			{
			if (palletNo != palletNoNew)//非整托拣货
			{
			if (pinStockDetail.SONo != notice.SONo)
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}
			}
			@@ -617,6 +637,7 @@
			sd.IsDel = "0";
			sd.CreateUser = userId;
			sd.CreateTime = nowDate;
			sd.UDF5 = "1";

			//新增拼托库存明细信息
			await Db.Insertable(sd).ExecuteReturnIdentityAsync();
			@@ -628,11 +649,13 @@
			//修改拼托托盘库存明细
			pinStockDetail.Qty += int.Parse(PickQty);
			pinStockDetail.LockQty += int.Parse(PickQty);
			pinStockDetail.UDF5 = "1";
			await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
			}
			else
			{
			pinStockDetail.SONo = soNo;
			pinStockDetail.UDF5 = "1";
			await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
			}
			}
			@@ -697,7 +720,7 @@
			await Db.Updateable(allot).ExecuteCommandAsync();

			int isDel = 0;

			var locateStr = stockDetail.LocatNo;
			if (palletNo != palletNoNew)
			{
			//删除或修改库存明细
			@@ -742,6 +765,15 @@

			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();

			//更改储位状态为空储位
			var locate = Db.Queryable<SysStorageLocat>().First(m=>m.IsDel == "0" && m.LocatNo == locateStr);
			if (locate!=null)
			{
			locate.Status = "0";
			Db.Updateable(locate).ExecuteCommand();
			}

			}

			//修改出库单明细拣货数量
			@@ -803,10 +835,10 @@
			throw Oops.Bah("托盘码为空，请输入托盘码");
			}
			var palletInfo = await Db.Queryable<DataStockDetail>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (!string.IsNullOrEmpty(palletInfo.WareHouseNo) && type != "1")
			{
			throw Oops.Bah("该托盘还未出库");
			}
			//if (!string.IsNullOrEmpty(palletInfo.WareHouseNo) && type != "1")
			//{
			// throw Oops.Bah("该托盘还未出库");
			//}
			if (type == "1")//平库出库获取单据
			{
			var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
			@@ -1739,8 +1771,7 @@
			//获取当前时间
			DateTime serverTime = Db.GetDate();
			//获取库存明细是否小于等于该垛数
			//string str = "select * from DataStockDetail where IsDel = '0' and SkuNo = '100099' and Status = '0' ";
			//var stockDetail = Db.Ado.SqlQuery<DataStockDetail>(str);

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0").ToListAsync();
			if (stockDetail.Count > 0)
			{
			@@ -1766,21 +1797,22 @@
			foreach (var s in stockDetail)
			{
			//获取储位信息
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W01");
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"\|\|l.WareHouseNo == "W02"));

			if (locat != null)
			if (locat == null)
			{
			if (locat.Status != "1")
			{
			continue;
			}
			//更改储位状态为出库中
			locat.Status = "3"; //3 出库中
			locat.UpdateTime = serverTime; //修改时间
			locat.UpdateUser = userId; //修改人
			//修改储位信息
			await Db.Updateable(locat).ExecuteCommandAsync();
			throw new Exception("储位上没有空托盘跺");
			}
			if (locat.Status != "1")
			{
			continue;
			}
			//更改储位状态为出库中
			locat.Status = "3"; //3 出库中
			locat.UpdateTime = serverTime; //修改时间
			locat.UpdateUser = userId; //修改人
			//修改储位信息
			await Db.Updateable(locat).ExecuteCommandAsync();

			//增加库存锁定数量
			//stock.AllotQty +=
			@@ -1840,10 +1872,10 @@
			{
			TaskNo = taskNo,
			Sender = "WMS",
			Receiver = "PDA",
			Receiver = "WCS",
			IsSuccess = 1, //是否下发成功 0失败 1成功

			StartLocat = locat == null ? "零箱库" : s.LocatNo,//起始位置
			StartLocat = s.LocatNo,//起始位置
			EndLocat = model.OutMode,//目标位置
			PalletNo = s.PalletNo,//托盘码
			IsSend = 1,//是否可再次下发
			@@ -1854,19 +1886,28 @@
			OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单
			CreateTime = serverTime, //创建时间
			CreateUser = userId, //创建人
			Msg = "Pda空托从" + locat == null ? "零箱库" : s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息
			Msg = "Pda空托从" + s.LocatNo + "到" + model.OutMode + "的出库任务", //关键信息
			//FinishDate = serverTime, //完成时间
			};
			var endroad = "";
			if (locat.WareHouseNo == "W01")
			{
			endroad = new AllotLocation().RoadwayToStationNum(locat.RoadwayNo, model.OutMode);
			}

			outDtoList.Add(new OutCommandDto()
			{
			PalletNo = exTask.PalletNo,//托盘号
			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = "", // 目标位置
			TaskNo = exTask.TaskNo, // 任务号
			TaskType = "1",// 任务类型 (出库)
			OutMode = model.OutMode, //目标地址
			Order = 1
			PalletNo = exTask.PalletNo,//托盘号

			StartLocate = exTask.StartLocat, // 起始位置
			StartRoadway = locat.RoadwayNo, //所属巷道
			EndLocate = model.OutMode, // 目标位置
			EndRoadway = endroad,

			Order = 999,
			Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
			});
			await Db.Insertable(exTask).ExecuteCommandAsync();

			@@ -1893,17 +1934,17 @@
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			////解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
			if (wcsModel.code == 0)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			//str += "下发成功";
			}
			if (wcsModel.StatusCode == -1)
			if (wcsModel.code == -1)
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			throw Oops.Bah(wcsModel.Msg);
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
			throw Oops.Bah(wcsModel.message);
			}
			}
			catch (AppFriendlyException e)
			@@ -1921,13 +1962,13 @@
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "空托出库", i + "", "下发", $"用PDA下发了 {i} 个空托垛", userId);
			Db.CommitTran();

			return "";
			return "成功";

			}
			catch (Exception e)
			{
			Db.RollbackTran();
			return "";
			return e.Message;
			}

			}