JC34WMS.git - Gitblit

			@@ -216,10 +216,10 @@
			throw Oops.Bah("该托盘上没有可拣货的箱子");
			}
			var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
			var comList = new List<BllCompleteDetail>();
			@@ -273,7 +273,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -337,10 +337,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -396,7 +396,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;

			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -405,6 +405,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			stockDetail.UDF5 = "1";
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			@@ -731,7 +735,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -1509,6 +1513,9 @@
			{
			throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
			}
			string lotNpstr = boxInfos.First().LotNo;
			string skuNo = boxInfos.First().SkuNo;
			string skuName = boxInfos.First().SkuName;

			// 验证是否车间线边仓库
			var areaList = new List<string>() { "B06", "B07", "B09" };
			@@ -1579,10 +1586,27 @@
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}


			#region 插入车间出入库记录表
			//插入入库日志
			var _log = new LogWorkShop
			{
			Type = "1",//类型，0：入库 1：出库
			PalletNo = palletNo,
			BoxNo = boxNo,
			LotNo = lotNpstr,
			SkuNo = skuNo,
			SkuName = skuName,
			Qty = pickQty
			};
			// 插入车间出库记录
			Db.Insertable(_log).ExecuteCommand();
			#endregion


			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			boxNo, "出库", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			@@ -1715,6 +1739,22 @@
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			}

			#region 插入车间出入库记录表
			// 创建实体
			var _log = new LogWorkShop
			{
			Type = "1",//类型，0：入库 1：出库
			PalletNo = model.PalletNo,
			BoxNo = "",
			LotNo = model.LotNo,
			SkuNo = skuModel.SkuNo,
			SkuName = skuModel.SkuName,
			Qty = pickQty
			};
			// 插入车间出库记录
			Db.Insertable(_log).ExecuteCommand();
			#endregion

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			@@ -2147,7 +2187,7 @@
			{
			throw Oops.Bah("未查询到该出库单的信息");
			}
			if (notice.Status != "3")
			if (notice.Status != "3" && notice.Status != "4")
			{
			throw Oops.Bah("出库单的状态不是正在执行，不能拣货");
			}
			@@ -2160,7 +2200,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -2242,7 +2282,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			//删除库存明细
			@@ -2250,6 +2290,10 @@
			//删除或修改库存
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -2331,10 +2375,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = boxInfos.First().Qty;
			if (boxQty > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (boxQty > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2357,10 +2401,10 @@
			{
			throw Oops.Bah("拣货数量不能大于箱内数量");
			}
			if (Convert.ToInt32(pickQty1) > needQty)
			{
			throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			}
			//if (Convert.ToInt32(pickQty1) > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于剩余待拣数量");
			//}

			biaoShi = "2";
			}
			@@ -2375,10 +2419,10 @@
			throw Oops.Bah("该托盘与箱码没有绑定关系");
			}
			var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
			if (boxQty[0] > needQty)
			{
			throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			}
			//if (boxQty[0] > needQty)
			//{
			// throw Oops.Bah("拣货数量不能大于箱内剩余待拣数量");
			//}

			foreach (var item in boxInfos)
			{
			@@ -2452,7 +2496,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -2464,6 +2508,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2487,6 +2535,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			if (stock.Qty <= 0)
			{
			await Db.Deleteable(stock).ExecuteCommandAsync();
			@@ -2540,10 +2592,10 @@
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货出库", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();
			@@ -2591,7 +2643,7 @@
			}
			//出库分配信息
			var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3") && m.SONo == soNo &&
			m.IsDel == "0" && (m.Status == "2" \|\| m.Status == "3" \|\| m.Status == "5") && m.SONo == soNo &&
			m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
			if (allot == null)
			{
			@@ -2671,7 +2723,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -2681,6 +2733,10 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			stockDetail.LockQty -= int.Parse(PickQty);
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -2692,10 +2748,8 @@
			else
			{
			stockDetail.Status = "0";
			}
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (stockDetail.Qty <= 0 && palletData == null)
			}
			if (stockDetail.Qty <= 0)
			{
			await Db.Deleteable(stockDetail).ExecuteCommandAsync();
			}
			@@ -2724,7 +2778,9 @@
			}

			//判断托盘上物料是否拣货完毕
			if (isDel == 0)
			//判断托盘上还有没有其他物料
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
			if (isDel == 0 && palletData == null)
			{
			pallet.Status = "0";
			await Db.Updateable(pallet).ExecuteCommandAsync();
			@@ -2786,8 +2842,8 @@
			//获取当前时间
			DateTime serverTime = Db.GetDate();
			//获取库存明细是否小于等于该垛数

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();

			var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
			if (stockDetail.Count > 0)
			{
			//判断是否大于需要垛数
			@@ -2796,7 +2852,7 @@
			throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
			}
			}
			stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//stockDetail = new AllotSku().GetDataListOrder(stockDetail);
			//获取库存总表信息
			var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
			//验证库存总表是否为空
			@@ -2804,16 +2860,26 @@
			{
			throw Oops.Bah("库存信息不存在，请核查!");
			}

			//目标储位信息
			var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
			if (endLocat == null)
			{
			throw Oops.Bah("库存信息不存在，请核查!");
			}
			//if (endLocat.Status != "0")
			//{
			// throw Oops.Bah("目标储位不是空储位，请核查!");
			//}
			int i = 0;

			//开启事务
			Db.BeginTran();

			//遍历库存信息
			foreach (var s in stockDetail)
			{
			//获取储位信息
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"\|\|l.WareHouseNo == "W02"));
			var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");

			if (locat == null)
			{
			@@ -2827,7 +2893,7 @@
			locat.Status = "3"; //3 出库中
			locat.UpdateTime = serverTime; //修改时间
			locat.UpdateUser = userId; //修改人
			//修改储位信息
			//修改储位信息
			await Db.Updateable(locat).ExecuteCommandAsync();

			//增加库存锁定数量
			@@ -2872,7 +2938,7 @@
			Status = "1",
			LogisticsId = 0,
			IsAdvance = "0",
			OutMode = model.OutMode,//出库口
			OutMode = model.OutMode,//出库目标储位

			CreateUser = userId,
			CreateTime = DateTime.Now
			@@ -2923,7 +2989,7 @@
			EndRoadway = endroad,

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

			@@ -3813,7 +3879,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -3826,6 +3892,10 @@
			stockDetail.InspectMark = "1"; //抽检托标识
			stockDetail.Qty -= pickQty;
			stockDetail.LockQty -= pickQty;
			if (stockDetail.LockQty < 0)
			{
			stockDetail.LockQty = 0;
			}
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			@@ -3849,6 +3919,10 @@
			}
			stock.Qty -= pickQty;
			stock.LockQty -= pickQty;
			if (stock.LockQty < 0)
			{
			stock.LockQty = 0;
			}
			stock.IsSampling = "1";
			if (stock.Qty <= 0)
			{
			@@ -4281,7 +4355,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";

			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();
			@@ -4606,7 +4680,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -4817,7 +4891,7 @@
			await Db.Insertable(comList).ExecuteCommandAsync();
			//修改出库分配信息
			allot.CompleteQty += pickQty;
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			if (allot.Status == "5")
			{
			@@ -5141,7 +5215,7 @@

			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			await Db.Updateable(allot).ExecuteCommandAsync();

			@@ -5265,9 +5339,6 @@

			return data;
			}



			#endregion

			}