JC34WMS.git - Gitblit

			@@ -128,7 +128,12 @@
			if (palletNo != palletNoNew)//非整托拣货
			{
			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)
			//if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			//{
			// throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
			//}
			//只允许绑定同一个出库单下的物料
			if (pinStockDetails.GroupBy(e => e.SONo).Count() > 0 && pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
			}
			@@ -148,9 +153,14 @@
			if (newPalletInfo.Status == "0")
			{
			var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo \|\| m.LotNo != stockDetail.LotNo)).ToList();
			if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			//if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			//{
			// throw Oops.Bah("一个托盘只能接受一个出库单拼托！");
			//}
			//只允许绑定同一个出库单下的物料
			if (pinStockDetails.GroupBy(e => e.SONo).Count() > 0 && pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
			{
			throw Oops.Bah("一个托盘只能接受一个出库单拼托！");
			throw Oops.Bah("拼托托盘上只能放同一个出库单下的物料！");
			}
			}
			else
			@@ -1779,14 +1789,13 @@
			#endregion

			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
			skuModel.SkuName, "拣货", $"在PDA车间出库页上对：：{skuModel.SkuName}的物料进行拣货操作", userId);
			var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库", skuModel.SkuName, "拣货", $"在PDA车间出库页上对：{skuModel.SkuName}的物料进行拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();