MeiRuiAn/HuaiAn.git

			@@ -1,6 +1,8 @@
			ï»¿using AutoMapper;
			using MailKit.Search;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Serialization;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			@@ -9,6 +11,7 @@
			using System.Threading.Tasks;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			@@ -18,6 +21,8 @@
			using WIDESEA_DTO.ERP;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Outbound;
			using WIDESEA_External.ERPService;
			using WIDESEA_External.Model;
			using WIDESEA_IBasicService;
			using WIDESEA_IOutboundRepository;
			using WIDESEA_IOutboundService;
			@@ -36,18 +41,63 @@
			private readonly IStockInfoService _stockInfoService;
			private readonly IStockInfoRepository _stockInfoRepository;
			public IOutboundOrderRepository Repository => BaseDal;
			private readonly IInvokeERPService _invokeERPService;
			private readonly IOutStockLockInfoService _outStockLockInfoService;
			private readonly IOutboundOrderRepository _outboundOrderRepository;

			public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
			IStockInfoRepository stockInfoRepository) : base(BaseDal)
			public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
			IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService,
			IOutboundOrderRepository outboundOrderRepository) : base(BaseDal)
			{
			_mapper = mapper;
			_unitOfWorkManage=unitOfWorkManage;
			_unitOfWorkManage = unitOfWorkManage;
			_basicService = basicService;
			_outboundOrderDetailRepository = outboundOrderDetailRepository;
			_stockInfoService = stockInfoService;
			_stockInfoRepository= stockInfoRepository;
			_stockInfoRepository = stockInfoRepository;
			_invokeERPService = invokeERPService;
			_outStockLockInfoService = outStockLockInfoService;
			_outboundOrderRepository = outboundOrderRepository;
			}
			public override WebResponseContent AddData(SaveModel saveModel)
			{
			if (saveModel.MainData.TryGetValue(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), out object? upperOrderNo) && upperOrderNo != null && !string.IsNullOrEmpty(upperOrderNo.ToString()))
			{
			Dt_OutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.UpperOrderNo == upperOrderNo.ToString() && x.WarehouseId == Convert.ToInt32(saveModel.MainData[nameof(Dt_OutboundOrder.WarehouseId).FirstLetterToLower()]));
			if (outboundOrder != null)
			{
			return WebResponseContent.Instance.Error($"{upperOrderNo}é¢æåå·å·²åå¨");
			}
			}
			saveModel.DetailData[0].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
			return base.AddData(saveModel);
			}
			public WebResponseContent GetOutboundOrders(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			int pageNo = saveModel.MainData["pageNo"].ObjToInt();
			string? orderNo = saveModel.MainData["orderNo"].ToString();
			int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();
			if (string.IsNullOrEmpty(orderNo))
			{
			dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.åºåºå®æ.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
			}
			else
			{
			dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.åºåºå®æ.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
			}

			content.OK(data: dt_ReceiveOrders);
			}
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			return content;
			}
			public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
			{
			try
			@@ -80,7 +130,6 @@
			}
			else
			{
			Dt_StockInfo? stockInfo = null;
			Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
			{
			RowNo = Convert.ToInt32(model.RowNo),
			@@ -91,20 +140,7 @@
			OrderQuantity = model.Qty,
			OrderId = oldOutboundOrder.Id
			};
			//ERPä¸ä¼ æµè¯ä»é¢æåæ´æ°å¯¹åºåºåç¶æ
			if (warehouse.WarehouseId == 1)
			{
			//è·ååºåºååºå
			stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.MCode && x.BatchNo == model.MLot && x.InboundOrderRowNo == Convert.ToInt32(model.RowNo))).First();
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			_unitOfWorkManage.BeginTran();
			if (stockInfo != null)
			{
			_stockInfoRepository.UpdateData(stockInfo);
			}
			_outboundOrderDetailRepository.AddData(outboundOrderDetail);
			_unitOfWorkManage.CommitTran();
			}
			}
			else
			@@ -117,8 +153,8 @@
			MaterielName = materielInfo.MaterielName,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			OrderQuantity = model.Qty,
			Unit = materielInfo.MaterielUnit
			};

			Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
			{
			UpperOrderNo = model.OrderNo,
			@@ -126,23 +162,11 @@
			OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
			CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
			WarehouseId = warehouse.WarehouseId,
			DepartmentCode = model.DepartmentCode,
			DepartmentName = model.DepartmentName,
			Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
			};
			Dt_StockInfo? stockInfo = null;
			//ERPä¸ä¼ æµè¯ä»é¢æåæ´æ°å¯¹åºåºåç¶æ
			if (warehouse.WarehouseId==1)
			{
			//è·ååºåºååºå
			stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.MCode && x.BatchNo == model.MLot && x.InboundOrderRowNo == Convert.ToInt32(model.RowNo))).First();
			stockInfo.StockStatus=StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			_unitOfWorkManage.BeginTran();
			if (stockInfo!=null)
			{
			_stockInfoRepository.UpdateData(stockInfo);
			}
			Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			}
			}
			else if (model.Way == 2)
			@@ -188,25 +212,136 @@
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			public WebResponseContent ReleaseOutOrder(int id)
			//ä¸æ¥åºåºå®æ
			public WebResponseContent TestOutUpload(int id, List<Dt_OutStockLockInfo>? outStockLockInfos)
			{
			try
			{
			Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
			Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);
			ERPIssueModel issueModel = new ERPIssueModel();
			List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
			List<Dt_OutStockLockInfo> _OutStockLockInfos = new List<Dt_OutStockLockInfo>();
			int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			if (outboundOrder.Details.Count == overCount)
			{
			outboundOrder.OrderStatus = OutOrderStatusEnum.åºåºå®æ.ObjToInt();
			_outboundOrderRepository.UpdateData(outboundOrder);
			}
			if (outboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥åºåºå");
			return WebResponseContent.Instance.Error("åºåºåä¸åå¨");
			}
			if(outboundOrder.Details == null \|\| outboundOrder.Details.Count == 0)
			if (outboundOrder.CreateType == OrderCreateTypeEnum.CreateInSystem.ObjToInt())
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°æç»ä¿¡æ¯");
			return WebResponseContent.Instance.OK();
			}
			//æµè¯æ¶åºç»ERPä¸æ¥åºåºå®æ
			if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
			{
			List<ERPPickModel> eRPPicks = new List<ERPPickModel>();
			foreach (var item in outboundOrder.Details)
			{
			if (item.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) continue;
			stockInfos = TestOutStocksUpdate(warehouse, item).Data as List<Dt_StockInfo> ?? null;
			if (stockInfos == null) continue;
			List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>();
			for (int i = 0; i < stockInfos.Count; i++)
			{
			ERPPickItemModel pickItemModel = new ERPPickItemModel()
			{
			Lotno = stockInfos[i].Details[0].BatchNo,
			Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),
			Location = warehouse.WarehouseCode
			};
			eRPOutPick.Add(pickItemModel);
			}

			ERPPickModel pickModel = new ERPPickModel()
			{
			Rowindex = item.RowNo,
			Material = item.MaterielCode,
			Qty = (item.OrderQuantity.ObjToInt()).ToString(),
			Dataitem = eRPOutPick
			};
			eRPPicks.Add(pickModel);
			}
			ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
			{
			Pickcode = outboundOrder.UpperOrderNo,
			PickList = eRPPicks
			};
			issueModel = new ERPIssueModel()
			{
			UniqueTag = id.ToString(),
			Code = outboundOrder.OrderNo,//æµè¯
			WarehouseCode = warehouse.WarehouseCode,
			Docremark = "",
			Deptno = outboundOrder.DepartmentCode,
			Deptname = outboundOrder.DepartmentName,
			Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			Createuser = outboundOrder.Creater,
			Issitem = new List<ERPIssueItemModel>() { issueItemModel },
			};
			}
			else
			{
			List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();

			//è·ååºåºè¯¦æå
			foreach (var item in outStockLockInfos)
			{
			ERPPickItemModel pickItemModel = new ERPPickItemModel()
			{
			Lotno = item.BatchNo,
			Qty = item.AssignQuantity.ObjToInt().ToString(),
			Location = warehouse.WarehouseCode
			};
			//è·ååºåºåæç»
			Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);
			ERPPickModel pickModel = new ERPPickModel()
			{
			Rowindex = outboundOrderDetail.RowNo,
			Material = outboundOrderDetail.MaterielCode,
			Qty = pickItemModel.Qty,
			Dataitem = new List<ERPPickItemModel> { pickItemModel }
			};
			if (item.OrderQuantity == item.AssignQuantity)
			{
			item.Status = OutLockStockStatusEnum.åºåºå®æ.ObjToInt();
			}
			eRPPickModels.Add(pickModel);
			_OutStockLockInfos.Add(item);
			}
			ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
			{
			Pickcode = outboundOrder.UpperOrderNo,
			PickList = eRPPickModels
			};
			issueModel = new ERPIssueModel()
			{
			UniqueTag = id.ToString(),
			Code = outboundOrder.OrderNo,
			WarehouseCode = warehouse.WarehouseCode,
			Docremark = "",
			Deptno = outboundOrder.DepartmentCode,
			Deptname = outboundOrder.DepartmentName,
			Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			Createuser = outStockLockInfos.FirstOrDefault().Creater,
			Issitem = new List<ERPIssueItemModel>() { issueItemModel },
			};
			}

			foreach (var item in outboundOrder.Details)
			if (stockInfos.Count > 0)
			{
			_stockInfoRepository.UpdateData(stockInfos);
			}

			else
			{
			_outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
			}
			//åºåºå®æä¸æ¥ERP æµè¯æ³¨é
			_invokeERPService.InvokeOutStandardsApi(issueModel);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			@@ -214,5 +349,33 @@
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			/// <summary>
			/// æ´æ¹åºåºååºåç¶æ
			/// </summary>
			/// <param name="warehouse"></param>
			/// <param name="model"></param>
			/// <returns></returns>
			public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse,Dt_OutboundOrderDetail outboundOrderDetails)
			{
			try
			{
			//è·ååºåºååºå
			List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x=>x.Details.Any(j=>j.MaterielCode== outboundOrderDetails.MaterielCode)).Take((int)outboundOrderDetails.OrderQuantity).ToList();
			if (stockInfos.Count <= 0)
			{
			return WebResponseContent.Instance.OK();
			}
			//æ´æ¹ç¶æ
			stockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			});
			return WebResponseContent.Instance.OK("æå", stockInfos);
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			}
			}