~tjx/NewPdaSqlServer.git

			@@ -1,5 +1,6 @@
			using System.Data;
			using System.Data.SqlClient;
			using System.Threading.Tasks.Dataflow;
			using Masuit.Tools;
			using NewPdaSqlServer.DB;
			using NewPdaSqlServer.Dto.service;
			@@ -696,7 +697,7 @@

			// 创建插入日志
			var logService = new LogService();
			var LogMsg = "委外退料。条码【" + query.barcode + "】退料单号【" + c_bill_no + "】";
			var LogMsg = "[PDA]委外退料。条码【" + query.barcode + "】退料单号【" + c_bill_no + "】";
			logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);

			return totalResult;
			@@ -773,7 +774,7 @@
			// 获取补料单明细并校验
			var blDetail = Db.Queryable<MesItemBlDetail>()
			.Where(b =>
			b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
			b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
			.First();

			if (blDetail == null)
			@@ -938,8 +939,9 @@
			ErpAutoid = womdab.Erpid,
			PbillNo = query.billNo,
			ItemId = blDetail.Bld012,
			DepotId = stockBarcode.DepotsId.ToString(),
			ItemDabid = womdab.Id,
			DepotId = stockBarcode.DepotId.ToString(),
			ItemDabid = blDetail.Id,
			//AboutGuid = womdab.Id
			// Unit = blDetail.Bld009,
			// DepotId = (int)stockBarcode.DepotsId
			}).IgnoreColumns(true).ExecuteCommand();
			@@ -972,7 +974,7 @@
			PbillNo = query.billNo,
			ItemId = blDetail.Bld012,
			Unit = blDetail.Bld009,
			DepotId = (int)stockBarcode.DepotsId,
			DepotId = (int)stockBarcode.DepotId,
			EbelnK3id = womdab.Eid,
			LineK3id = womdab.Erpid
			}).IgnoreColumns(true).ExecuteCommand();
			@@ -1069,7 +1071,7 @@

			// 创建插入日志
			var logService = new LogService();
			var LogMsg = query.Type + "。条码【" +query.barcode+"】补料单号【"+ outNo +"】";
			var LogMsg = "[PDA]"+query.Type + "。条码【" +query.barcode+"】数量【"+ stockBarcode.Quantity.ToString() + "】出库单号【"+ outNo +"】";
			logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);

			return 1;