MeiRuiAn/JiAnLiKu.git

			@@ -493,9 +493,41 @@
			Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

			dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
			if (task.TaskType == TaskTypeEnum.InSyncretism.ObjToInt())
			{
			int laststatus = dt_LocationInfo.LocationStatus;
			dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			///更新库存状态
			dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
			// 更新库存明细状态
			dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());

			_unitOfWorkManage.BeginTran();

			// 更新任务状态
			UpdateTaskStatus(task);

			// 更新货位状态
			UpdateLocationStatus(dt_LocationInfo, laststatus);

			// 更新库存信息
			UpdateStockInfo(dt_StockInfo);

			AddRecords(task, dt_StockInfo, dt_LocationInfo, laststatus);

			//返回smom库存移动数据。。。。

			_unitOfWorkManage.CommitTran();
			}
			else
			{
			if (warehouse.WarehouseCode.Contains("CP"))
			{

			if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() \|\| task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
			{
			return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
			}
			// 1. 获取入库单信息
			Dt_InboundOrder? inboundOrder = null;
			if (!string.IsNullOrEmpty(dt_StockInfo.Details.FirstOrDefault()?.OrderNo))
			@@ -728,23 +760,23 @@
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			houseInboundPassBack.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			//var authResult = AuthenticateWithWMS();
			//if (authResult.IsSuccess)
			//{
			// houseInboundPassBack.Context = new Dictionary<string, string>
			// {
			// { "Ticket", authResult.Ticket },
			// { "InvOrgId", authResult.InvOrgId }
			// };

			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
			// 判断Success的值
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			// var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
			// // 判断Success的值
			// if (!response.Success)
			// {
			// throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			// }

			}
			//}

			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
			@@ -755,7 +787,6 @@
			.Where(x => x.WarehouseId == task.WarehouseId &&
			x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
			.ToList();

			if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
			var inventoryAllocate = new InventoryAllocate
			{
			@@ -774,6 +805,7 @@
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			ActiveType=1,
			DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			@@ -783,6 +815,7 @@
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			@@ -796,21 +829,21 @@
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			inventoryAllocate.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			//var authResult = AuthenticateWithWMS();
			//if (authResult.IsSuccess)
			//{
			// inventoryAllocate.Context = new Dictionary<string, string>
			// {
			// { "Ticket", authResult.Ticket },
			// { "InvOrgId", authResult.InvOrgId }
			// };

			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			}
			}
			// var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			// if (!response.Success)
			// {
			// throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			// }
			//}
			}

			_unitOfWorkManage.CommitTran();
			@@ -854,6 +887,8 @@

			}
			}
			}


			return WebResponseContent.Instance.OK();
			}
			@@ -1433,10 +1468,25 @@
			int lastStatus = locationInfo.LocationStatus;

			///盘点出库任务完成逻辑
			if ((task.TaskType == TaskTypeEnum.OutInventory.ObjToInt()))
			if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
			{
			return OutInventoryCompleted(task, stockInfo, locationInfo);
			}
			if (task.TaskType == TaskTypeEnum.OutSyncretism.ObjToInt())
			{
			stockInfo.StockStatus = StockStatusEmun.合托出库完成.ObjToInt();
			stockInfo.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.合托出库完成.ObjToInt();
			});
			_unitOfWorkManage.BeginTran();
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			_unitOfWorkManage.CommitTran();
			}
			else
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

			if (warehouse.WarehouseCode.Contains("CP"))
			@@ -1447,7 +1497,7 @@
			.First();

			Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
			.Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode)
			.Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode&&x.LPNNo==stockInfo.PalletCode)
			.First();
			//List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
			//foreach (var item in stockInfoDetail)
			@@ -1485,7 +1535,7 @@
			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

			// 更新库存状态
			AddCPRetrueOrder(stockInfo, outboundOrder);
			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

			// 区分单据数据来源更新货位状态
			if (outboundOrder.System == null)
			@@ -1558,20 +1608,20 @@
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			passBack.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			}
			// var authResult = AuthenticateWithWMS();
			// if (authResult.IsSuccess)
			// {
			// passBack.Context = new Dictionary<string, string>
			//{
			// { "Ticket", authResult.Ticket },
			// { "InvOrgId", authResult.InvOrgId }
			//};
			// var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
			// if (!response.Success)
			// {
			// throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			// }
			// }
			}
			//调拨出库
			if (outboundOrder.OrderType == 2)
			@@ -1593,7 +1643,8 @@
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfos.Select(item =>
			ActiveType=2,
			DetailList = outStockLockInfo.Select(item =>
			{
			return new Allocate.data1.Inventory
			{
			@@ -1603,6 +1654,7 @@
			OrderQuantity = outboundOrderDetails.OrderQuantity,
			BatchNo = outboundOrderDetails.BatchNo,
			FinishQty = outboundOrderDetails.OrderQuantity,
			OrinalLocation=outboundOrderDetails.OrinalLocation,
			LocationName = task.SourceAddress
			};
			}).ToList()
			@@ -1612,20 +1664,20 @@
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			allocate.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			}
			//var authResult = AuthenticateWithWMS();
			//if (authResult.IsSuccess)
			//{
			// allocate.Context = new Dictionary<string, string>
			//{
			// { "Ticket", authResult.Ticket },
			// { "InvOrgId", authResult.InvOrgId }
			//};
			// var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			// if (!response.Success)
			// {
			// throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			// }
			//}
			}
			}

			@@ -1666,7 +1718,8 @@
			// 3. 执行核心出库逻辑
			return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
			}

			}
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			@@ -1734,7 +1787,7 @@
			// 更新出库订单详情
			_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

			// 更新库存状态
			// 更新库存状态回库单
			AddRetrueOrder(stockInfo, inboundOrder);

			// 区分单据数据来源更新货位状态
			@@ -1882,7 +1935,7 @@
			// 发送出库信息到WMS
			if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 1)
			{
			SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
			//SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
			}
			else if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 2)
			{
			@@ -2149,71 +2202,211 @@
			}

			//成品回库单
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder)
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
			{
			Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id)
			.First();
			if (stockInfoDetail == null)
			.ToList();

			if (stockInfoDetails == null \|\| stockInfoDetails.Count == 0)
			{
			throw new Exception("建立回库单时，未找到该库存信息");
			}

			// 找到与当前出库单明细匹配的库存明细
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
			x.MaterielCode == outboundOrderDetail.MaterielCode &&
			x.BatchNo == outboundOrderDetail.BatchNo);

			if (matchedStockDetail == null)
			{
			throw new Exception($"未找到匹配的库存明细信息，物料:{outboundOrderDetail.MaterielCode}, 批次:{outboundOrderDetail.BatchNo}");
			}

			if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
			{
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
			x.LPNNo == stockInfo.PalletCode &&
			x.LocationCode == stockInfo.LocationCode &&
			x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());

			if (returnOrder == null)
			{
			throw new Exception("反拣出库后，未找到对应反拣回库单信息");
			}

			// 只减去单据明细中的数量
			matchedStockDetail.OutboundQuantity = 0;
			matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
			matchedStockDetail.OrderNo = returnOrder.OrderNo;

			// 更新库存状态
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
			stockInfo.Remark = "反拣入库";
			stockInfoDetail.OutboundQuantity = 0;
			stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
			stockInfoDetail.OrderNo = returnOrder.OrderNo;

			// 更新匹配的明细
			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
			}
			else
			{
			decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
			if (returnQuantity > 0)
			// 计算当前批次的剩余数量
			decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;

			_unitOfWorkManage.BeginTran();

			try
			{
			if (remainingQuantity > 0)
			{
			// 为当前批次创建返库单
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			{
			MaterielCode = stockInfoDetail.MaterielCode,
			MaterielName = stockInfoDetail.MaterielName,
			BatchNo = stockInfoDetail.BatchNo,
			OrderQuantity = returnQuantity,
			ReceiptQuantity = returnQuantity,
			MaterielCode = matchedStockDetail.MaterielCode,
			MaterielName = matchedStockDetail.MaterielName,
			BatchNo = matchedStockDetail.BatchNo,
			OrderQuantity = remainingQuantity,
			ReceiptQuantity = remainingQuantity,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = stockInfoDetail.LinId,
			LinId = matchedStockDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			};

			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			returnOrder.LocationCode = stockInfo.LocationCode;
			}
			_unitOfWorkManage.BeginTran();

			// 添加返库单
			_returnOrderRepository.AddData(returnOrder);
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
			stockInfo.Remark = "余料退库";
			stockInfoDetail.OutboundQuantity = 0;
			stockInfoDetail.StockQuantity = returnQuantity;
			stockInfoDetail.OrderNo = returnOrder.OrderNo;
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
			_unitOfWorkManage.CommitTran();
			}
			else

			// 更新当前批次明细：只保留出库数量，其余返库
			matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
			matchedStockDetail.OutboundQuantity = outboundOrderDetail.OrderQuantity;
			matchedStockDetail.OrderNo = returnOrder.OrderNo;

			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);

			// 处理其他批次的库存明细（全部返库）
			var otherBatchDetails = stockInfoDetails
			.Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
			.ToList();

			foreach (var otherDetail in otherBatchDetails)
			{
			DeleteAndMoveIntoHtStockStatus(stockInfo);
			if (otherDetail.StockQuantity > 0)
			{
			// 为其他批次创建返库单
			Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
			{
			MaterielCode = otherDetail.MaterielCode,
			MaterielName = otherDetail.MaterielName,
			BatchNo = otherDetail.BatchNo,
			OrderQuantity = otherDetail.StockQuantity,
			ReceiptQuantity = otherDetail.StockQuantity,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = otherDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			};

			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			otherReturnOrder.LocationCode = stockInfo.LocationCode;
			}

			_returnOrderRepository.AddData(otherReturnOrder);

			// 其他批次全部返库，库存清零
			otherDetail.StockQuantity = 0;
			otherDetail.OutboundQuantity = 0;
			otherDetail.OrderNo = otherReturnOrder.OrderNo;

			_stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
			}
			}

			// 更新库存主表状态
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
			stockInfo.Remark = "余料退库";
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			}
			else if (remainingQuantity == 0)
			{
			// 当前批次正好出完
			matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
			_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

			// 其他批次全部返库
			var otherBatchDetails = stockInfoDetails
			.Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
			.ToList();

			foreach (var otherDetail in otherBatchDetails)
			{
			if (otherDetail.StockQuantity > 0)
			{
			Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
			{
			MaterielCode = otherDetail.MaterielCode,
			MaterielName = otherDetail.MaterielName,
			BatchNo = otherDetail.BatchNo,
			OrderQuantity = otherDetail.StockQuantity,
			ReceiptQuantity = otherDetail.StockQuantity,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = otherDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			};

			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			otherReturnOrder.LocationCode = stockInfo.LocationCode;
			}

			_returnOrderRepository.AddData(otherReturnOrder);
			}
			}

			// 如果所有批次都出完了，删除库存
			var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
			if (totalRemaining == 0)
			{
			DeleteAndMoveIntoHtStockStatus(stockInfo);
			}
			else
			{
			// 还有库存，更新状态
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
			stockInfo.Remark = "余料退库";
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			}
			}
			else
			{
			throw new Exception($"出库数量 {outboundOrderDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
			}

			_unitOfWorkManage.CommitTran();
			}
			catch
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}
			}
			}
			/// <summary>
			/// 单据明细出库完成回调ERP(表单提交)