~tjx/NewPdaSqlServer.git

			@@ -94,7 +94,7 @@
			throw new Exception("用户名不能为空！");

			if (string.IsNullOrEmpty(query.blNo))
			throw new Exception("补料单号不能为空！");
			throw new Exception("申请单号不能为空！");


			// 检验是否重复扫描
			@@ -185,9 +185,17 @@
			// 开启事务处理
			var success = UseTransaction(db =>
			{
			var outNoType = "";
			if(query.Type == "生产补料")
			{
			outNoType = "BL(工单补料)";
			}else
			{
			outNoType = "CL(工单超领)";
			}
			// 获取或创建出库单
			var outId = Guid.NewGuid();
			var outNo = BillNo.GetBillNo("BL(工单补料)");
			var outNo = BillNo.GetBillNo(outNoType);

			var existingOut = db.Queryable<MesInvItemOuts>()
			.Where(a => a.BbillNo == query.blNo
			@@ -221,7 +229,7 @@
			Remark = mesItemBl.Bl007,
			DepotCode = womdab.Dab017,
			OutPart = womdaa.Daa013,
			OutType = "生产补料",
			OutType = query.Type,
			FType = 0,
			Factory = stockBarcode.Factory,
			Company = stockBarcode.Company,
			@@ -237,7 +245,7 @@
			// 检查并更新出库单物料明细
			var itemCount = db.Queryable<MesInvItemOutItems>()
			.Where(i =>
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
			.Count();

			if (itemCount > 0)
			@@ -246,7 +254,7 @@
			.SetColumns(i =>
			i.TlQty == i.TlQty + stockBarcode.Quantity)
			.Where(i =>
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId)
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
			.ExecuteCommand();
			else
			// 插入新的物料明细记录
			@@ -271,7 +279,8 @@
			ErpId = womdab.Eid,
			ErpAutoid = womdab.Erpid,
			PbillNo = query.billNo,
			ItemId = blDetail.Bld012
			ItemId = blDetail.Bld012,
			DepotId = stockBarcode.DepotsId.ToString(),
			// Unit = blDetail.Bld009,
			// DepotId = (int)stockBarcode.DepotsId
			}).IgnoreColumns(true).ExecuteCommand();