~tjx/NewPdaSqlServer.git

			@@ -14,12 +14,12 @@
			/// 获取生产补料单号列表
			/// </summary>
			/// <returns>补料单号列表</returns>
			public List<string> GetSCBLBillNo()
			public List<string> GetSCBLBillNo(WarehouseQuery query)
			{
			var list = Db.Queryable<MesItemBl>()
			.Where(s => (s.Bl018 ?? false) == true
			&& (s.Bl019 ?? false) == false
			&& s.Bl008 == "生产补料")
			&& s.Bl008 == query.Type)
			.Select(s => s.BlNo)
			.ToList();
			return list;
			@@ -39,7 +39,7 @@

			// 检查补料单是否存在且为生产补料类型
			var mesItemBl = Db.Queryable<MesItemBl>()
			.Where(a => a.BlNo == query.billNo && a.Bl008 == "生产补料")
			.Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
			.First();

			if (mesItemBl == null)
			@@ -68,6 +68,7 @@
			}

			/// <summary>
			/// 生产工单补料扫码
			/// 扫描条码 prc_rf_pda_scan_zout_barcode3
			/// </summary>
			/// <param name="query">查询参数</param>
			@@ -80,7 +81,7 @@
			/// - blNo: 补料单号(必填)
			/// </remarks>
			public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
			SctlScanBarcode(
			ScblScanBarcode(
			WarehouseQuery query)
			{
			if (string.IsNullOrEmpty(query.billNo))
			@@ -93,7 +94,7 @@
			throw new Exception("用户名不能为空！");

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


			// 检验是否重复扫描
			@@ -114,7 +115,7 @@

			// 检查补料单状态
			var mesItemBl = Db.Queryable<MesItemBl>()
			.Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
			.Where(a => a.BlNo == query.blNo)
			.First();

			if (mesItemBl == null)
			@@ -184,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("SCBL");
			var outNo = BillNo.GetBillNo(outNoType);

			var existingOut = db.Queryable<MesInvItemOuts>()
			.Where(a => a.BbillNo == query.blNo
			@@ -220,6 +229,7 @@
			Remark = mesItemBl.Bl007,
			DepotCode = womdab.Dab017,
			OutPart = womdaa.Daa013,
			OutType = query.Type,
			FType = 0,
			Factory = stockBarcode.Factory,
			Company = stockBarcode.Company,
			@@ -228,28 +238,25 @@
			PbillNo = womdaa.Daa001,
			OutDate = DateTime.Now,
			Status = 0,
			BbillNo = query.blNo
			BbillNo = query.billNo
			}).IgnoreColumns(true).ExecuteCommand();
			}

			// 检查并更新出库单物料明细
			var itemCount = db.Queryable<MesInvItemOutItems>()
			.Where(i =>
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
			.Count();

			if (itemCount > 0)
			{
			// 更新已存在的物料明细数量
			db.Updateable<MesInvItemOutItems>()
			.SetColumns(i =>
			i.Quantity == i.Quantity + stockBarcode.Quantity)
			i.TlQty == i.TlQty + stockBarcode.Quantity)
			.Where(i =>
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
			i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
			.ExecuteCommand();
			}
			else
			{
			// 插入新的物料明细记录
			db.Insertable(new MesInvItemOutItems
			{
			@@ -257,6 +264,7 @@
			ItemOutId = outId,
			ItemNo = blDetail.Bld002,
			Quantity = stockBarcode.Quantity,
			TlQty = stockBarcode.Quantity,
			CreateBy = query.userName,
			CreateDate = DateTime.Now,
			LastupdateBy = query.userName,
			@@ -271,12 +279,12 @@
			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();
			}


			// 插入出库单条码明细
			db.Insertable(new MesInvItemOutCDetails
			{
			@@ -509,8 +517,8 @@
			// Mblnr = stockBarcode.Mblnr,
			// Zeile = stockBarcode.Zeile,
			// RohInId = stockBarcode.RohInId,
			// BarcodeStatus = 0,
			// OldQty = query.Num,
			Barcodestatus = false,
			Oldqty = query.Num as long?,
			// Unit = stockBarcode.Unit,
			// WeightUnit = stockBarcode.WeightUnit,
			Factory = stockBarcode.Factory,
			@@ -523,8 +531,9 @@
			// MemoBad = stockBarcode.MemoBad,
			ComeFlg = 5,
			// Memo = stockBarcode.Memo,
			SuppId = stockBarcode.SuppId,
			SuppNo = stockBarcode.SuppNo,
			// InsDate = stockBarcode.InsDate, // Added InsDate
			InsDate = stockBarcode.IndepDate, // Added InsDate
			ItemId = stockBarcode.ItemId
			// ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
			}).IgnoreColumns(true).ExecuteCommand();
			@@ -682,7 +691,7 @@
			{
			// 创建新的出库单
			var outId = Guid.NewGuid();
			var outNo = BillNo.GetBillNo("SCBL");
			var outNo = BillNo.GetBillNo("BL(工单补料)");

			// 插入出库单主表
			executeCommand += db.Insertable(new MesInvItemOuts
			@@ -895,12 +904,12 @@

			#region 生产超领

			public List<string> GetSccList()
			public List<string> GetSccList(WarehouseQuery query)
			{
			var list = Db.Queryable<MesItemBl>()
			.Where(s => (s.Bl018 ?? false) == true
			&& (s.Bl019 ?? false) == false
			&& s.Bl008 == "生产超领")
			&& s.Bl008 == query.Type)
			.Select(s => s.BlNo)
			.ToList();
			return list;
			@@ -911,15 +920,16 @@
			/// </summary>
			/// <param name="query">查询参数</param>
			/// <returns>生产超领单明细列表</returns>
			public (string bl001,List<MesItemBlDetail> item) GetMesItemBlDetailBySccBillNo(
			WarehouseQuery query)
			public (string bl001, List<MesItemBlDetail> item)
			GetMesItemBlDetailBySccBillNo(
			WarehouseQuery query)
			{
			if (string.IsNullOrEmpty(query.billNo))
			throw new Exception("请选单据号！");

			// 检查超领单是否存在且为生产超领类型
			// 检查超领单是否存在且为生产超领/委外超领类型
			var mesItemBl = Db.Queryable<MesItemBl>()
			.Where(a => a.BlNo == query.billNo && a.Bl008 == "生产超领")
			.Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
			.First();

			if (mesItemBl == null)
			@@ -959,7 +969,7 @@
			})
			.ToList();

			return (mesItemBl.Bl001,pendingDetails);
			return (mesItemBl.Bl001, pendingDetails);
			}

			/// <summary>
			@@ -1113,7 +1123,7 @@
			if (outRecord == null)
			{
			outId = Guid.NewGuid();
			outNo = BillNo.GetBillNo("SCBL"); // 需要实现生成单号的方法
			outNo = BillNo.GetBillNo("BL(工单补料)"); // 需要实现生成单号的方法

			// 插入出库单主表
			db.Insertable(new MesInvItemOuts
			@@ -1517,7 +1527,7 @@
			itemOut = new MesInvItemOuts
			{
			Guid = Guid.NewGuid(),
			ItemOutNo = BillNo.GetBillNo("SCBL"), // 需要实现生成单号的方法
			ItemOutNo = BillNo.GetBillNo("BL(工单补料)"), // 需要实现生成单号的方法
			TaskNo = query.blNo,
			CreateBy = query.userName,
			CreateDate = DateTime.Now,
			@@ -1695,18 +1705,21 @@


			// 获取最终的待处理列表
			// 获取补料单明细中未完成的记录
			// 通过左连接查询补料单(MesItemBl)和补料单明细(MesItemBlDetail)表
			// 条件: 1.补料单号匹配 2.计划数量(Bld007)减去已补数量(Bld008)大于0(即未完成的)
			var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
			new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
			.Where((a, b) => a.BlNo == query.blNo
			&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
			.Select((a, b) => new MesItemBlDetail
			{
			Bld012 = b.Bld012,
			Bld002 = b.Bld002,
			Bld003 = b.Bld003,
			Bld004 = b.Bld004,
			Bld007 = b.Bld007,
			Bld008 = b.Bld008
			Bld012 = b.Bld012, // 物料ID
			Bld002 = b.Bld002, // 物料编号
			Bld003 = b.Bld003, // 物料名称
			Bld004 = b.Bld004, // 物料规格
			Bld007 = b.Bld007, // 计划数量
			Bld008 = b.Bld008 // 已补数量
			})
			.ToList();