ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -1,16 +1,22 @@
			ï»¿using HslCommunication;
			using MailKit.Search;
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			using WIDESEA_DTO.SquareCabin;
			using WIDESEA_ISquareCabinServices;
			using WIDESEA_IWMsInfoServices;
			using WIDESEA_Model.Models;
			using static WIDESEA_DTO.SquareCabin.OrderDto;
			using static WIDESEA_DTO.SquareCabin.TowcsDto;
			@@ -81,8 +87,6 @@





			/// <summary>
			/// wcsåä¼ ç»æè°ç¨æçæ¹æ³ ä¸ç®¡æ¯å¥åº åºåº çç¹é½ä¼è°ç¨è¿ä¸ªæ¥å£
			/// </summary>
			@@ -98,98 +102,154 @@
			return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "è¯·æ±åæ°æ æ" };
			}

			//æ¥æ¾å°å¨é¨ç

			// 2ï¸â£ å¼å¯äºå¡
			BaseDal.Db.Ado.BeginTran();
			foreach (var detail in request.details)
			{
			#region æ¥è¯¢ç©æä¿¡æ¯ãè®¡ç®æ»å
			//æ¥è¯¢ç©æè¡¨
			var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();

			if (goods == null) throw new Exception($"æªæ¾å°ç©æç¼ç ã{detail.productCode}ãçç©æä¿¡æ¯");
			// 3ï¸ è®¡ç®å¥åºæ°éï¼åæ£ï¼éå orderDetails ä¸çæ¯ä¸ª EdiOrderBoxDto å¯¹è±¡
			decimal orderQty = detail.orderDetails?
			.Sum(x => decimal.TryParse(x.quantity, out var q) ? Math.Abs(q) : 0)
			?? 0;

			// 5ï¸â£ æ¥è¯¢åºåè¯¦æ
			var entity = BaseDal.Db.Queryable<Dt_InventoryInfo>()
			.First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.LocationCode == "ç«åº");
			//æ¥è¯¢ç©æè¡¨
			var Goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().First(x => x.MaterielCode == detail.productCode);

			if (entity == null)
			{
			entity = new Dt_InventoryInfo
			{
			PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
			WarehouseCode = "001",
			LocationCode = "ç«åº",
			StockStatus = 1,
			MaterielCode = detail.productCode ?? detail.productName,
			MaterielName = detail.productName ?? "",
			MaterielSpec = detail.productSpecifications ?? "",
			BatchNo = detail.batchNo,
			StockQuantity = 0,
			OutboundQuantity = 0,
			SupplyQuantity = 0,
			InDate = DateTime.Now,
			ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
			ShelfLife = 0,
			ValidityPeriod = "",
			Remark = "WCSåä¼ åå»º"
			};
			}

			// 6ï¸â£ æ¥è¯¢åºåæ¹æ¬¡ä¿¡æ¯
			var batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
			.First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo);

			if (batch == null)
			{
			batch = new Dt_Inventory_Batch
			{
			MaterielCode = detail.productCode ?? detail.productName,
			MaterielName = detail.productName ?? "",
			MaterielSpec = detail.productSpecifications ?? "",
			BatchNo = detail.batchNo,
			StockQuantity = 0,
			OutboundQuantity = 0,
			SupplyQuantity = 0,
			ERPStockQuantity = 0,
			Status = false,
			ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
			ValidityPeriod = DateTime.Now.AddYears(1).ToString("yyyy-MM-dd"),
			Remark = "èªå¨åå»º"
			};
			}
			#endregion

			// 7ï¸â£ æè®¢åç±»åæ§è¡ä¸åé»è¾
			switch (request.orderType)
			{
			case "1": //å¥åº
			entity.StockQuantity = orderQty; //å®éåºå
			entity.InDate = DateTime.Now;
			entity.Remark = "å¥åºååä¼ ";
			{
			#region å¤çå¥åºè®¢å
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no ==reslut).Includes(x => x.Details).First();
			//Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no == "001").Includes(x => x.Details).First();
			if (cabinOrder == null \|\| cabinOrder.OdrderStatus == "å·²å®æ")
			throw new Exception($"å¥åºåå·²å®æ");
			Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo && x.Status == 1).First();
			if (cabinOrderDetail == null \|\| cabinOrderDetail.OrderDetailStatus == "å·²å®æ")
			throw new Exception($"å¥åºåæç»å·²å®æ");
			cabinOrderDetail.Order_Inqty += orderQty;
			if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
			throw new Exception($"å¥åºæ°éä¸å¯è¶åºåæ®æ°é");
			cabinOrder.OdrderStatus = "å¼å§";
			cabinOrderDetail.OrderDetailStatus = "å¼å§";
			if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
			cabinOrderDetail.OrderDetailStatus = "å·²å®æ";
			BaseDal.Db.Updateable(cabinOrderDetail).ExecuteCommand();
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no && x.Warehouse_no == reslut).Includes(x => x.Details).First();
			if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "å·²å®æ").Any())
			cabinOrder.OdrderStatus = "å·²å®æ";
			BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
			#endregion

			#region åå»ºåºåä¿¡æ¯
			// 5ï¸â£ æ¥è¯¢åºåè¯¦æ
			var inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
			.First(x => x.MaterielCode == cabinOrderDetail.Goods_no && x.BatchNo == cabinOrderDetail.Batch_num && x.LocationCode == "ç«åº");
			if (inventoryInfo != null)
			{
			inventoryInfo.StockQuantity += orderQty;
			inventoryInfo.AvailableQuantity += orderQty;
			inventoryInfo.InDate = DateTime.Now;
			BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
			}
			else
			{
			inventoryInfo = new Dt_InventoryInfo
			{
			PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
			WarehouseCode = "001",
			LocationCode = "ç«åº",
			StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt(),
			MaterielCode = goods.MaterielCode,
			MaterielName = goods.MaterielName,
			MaterielSpec = goods.MaterielSpec,
			BatchNo = detail.batchNo,
			StockQuantity = orderQty,
			OutboundQuantity = 0,
			SupplyQuantity = 0,
			AvailableQuantity = orderQty,
			InDate = DateTime.Now,
			ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
			ShelfLife = 0,
			ValidityPeriod = cabinOrderDetail.Exp_date,
			Remark = "WCSåä¼ åå»º"
			};
			BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
			}
			#endregion

			batch.StockQuantity = orderQty;
			batch.Remark = "å¥åºååä¼ ";
			UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
			break;
			#region åå»ºåºåæ¹æ¬¡ä¿¡æ¯
			// 6ï¸â£ æ¥è¯¢åºåæ¹æ¬¡ä¿¡æ¯
			var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
			.First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);

			case "2": // åºåº æ»100 åº20
			decimal actualOutQty = entity.StockQuantity - orderQty;// è®¡ç®æ¬æ¬¡å®éåºåºæ°é 20
			entity.StockQuantity=orderQty; //å®éåºåæ° 100
			entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //å¾åºåºæ°é
			if (entity.StockQuantity < 0) entity.StockQuantity = 0;
			entity.Remark = "åºåºååä¼ ";
			if (inventory_Batch != null)
			{
			inventory_Batch.StockQuantity += orderQty;
			inventory_Batch.AvailableQuantity += orderQty;
			BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
			}
			else
			{
			inventory_Batch = new Dt_Inventory_Batch
			{
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielName = inventoryInfo.MaterielName,
			MaterielSpec = inventoryInfo.MaterielSpec,
			BatchNo = inventoryInfo.BatchNo,
			StockQuantity = inventoryInfo.StockQuantity,
			OutboundQuantity = inventoryInfo.OutboundQuantity,
			AvailableQuantity = inventoryInfo.AvailableQuantity,
			SupplyQuantity = inventoryInfo.SupplyQuantity,
			ERPStockQuantity = 0,
			Status = false,
			ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
			ValidityPeriod = inventoryInfo.ValidityPeriod,
			Remark = "èªå¨åå»º"
			};
			BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
			}
			#endregion

			#region æ·»å å¥åºä»»å¡åå²
			Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			TaskNum = cabinOrderDetail.Id,
			OperateType = OperateTypeEnum.èªå¨å®æ.ToString(),
			InsertTime = DateTime.Now,
			TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskType = TaskTypeEnum.InPick.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = cabinOrder.Order_no,
			StockQuantity = orderQty,
			SupplyQuantity = 0,
			Remark = "å¥åº"
			};
			BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
			#endregion

			batch.StockQuantity = orderQty;
			batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//å¾åºåºæ°é
			if (batch.StockQuantity < 0) batch.StockQuantity = 0;
			batch.Remark = "åºåºååä¼ ";
			UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);
			//è°æ¨ä»»å¡
			_deliveryOrderServices.CreateAllocatInOut(goods);
			//UpdateInboundOrderDetailStatus(request.orderNo, detail.batchNo, detail.productCode);
			break;
			}
			case "2":
			#region æ¾åºåºä»»å¡
			Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000") && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
			if (supplyTask == null) throw new Exception($"æªæ¾å°è®¢åå·ã{request.orderNo}ãç©æç¼å·ã{detail.productCode}ãçåºåºä»»å¡");
			#endregion

			#region å¤çåºåºåãåºåä¿¡æ¯ãåºåºä»»å¡ãè°æ¨ä»»å¡
			_deliveryOrderServices.OutTaskFinish(supplyTask);
			#endregion
			break;

			case "3": // çç¹
			@@ -198,33 +258,21 @@
			if (flag == 1) // çäº
			{
			//åºåæ°-å·®å¼æ°=çäº
			batch.SupplyQuantity +=( batch.StockQuantity - diff);
			batch.Remark = "çç¹ååä¼ - çäº";
			//batch.SupplyQuantity += (batch.StockQuantity - diff);
			//batch.Remark = "çç¹ååä¼ - çäº";
			}
			else if (flag == 2) // çç
			{
			//åºåæ°+å·®å¼æ°=çç
			batch.SupplyQuantity +=(batch.StockQuantity + diff);
			batch.Remark = "çç¹ååä¼ - çç";
			//batch.SupplyQuantity += (batch.StockQuantity + diff);
			//batch.Remark = "çç¹ååä¼ - çç";
			}
			else // çä¸
			{
			batch.Remark = "çç¹ååä¼ - çä¸";
			//batch.Remark = "çç¹ååä¼ - çä¸";
			}
			break;
			}
			// 2ï¸â£ å¼å¯äºå¡
			BaseDal.Db.Ado.BeginTran();
			// 8ï¸â£ ä¿åæ°æ®
			if (entity.Id == 0)
			BaseDal.Db.Insertable(entity).ExecuteCommand();
			else
			BaseDal.Db.Updateable(entity).ExecuteCommand();

			if (batch.Id == 0)
			BaseDal.Db.Insertable(batch).ExecuteCommand();
			else
			BaseDal.Db.Updateable(batch).ExecuteCommand();
			}

			// 9ï¸â£ æäº¤äºå¡
			@@ -255,7 +303,7 @@
			/// </summary>
			/// <param name="batchNo">æ¹æ¬¡å·</param>
			/// <param name="productCode">ç©æåç¼ç /param>
			public void UpdateInboundOrderDetailStatus(string batchNo,string productCode)
			public void UpdateInboundOrderDetailStatus(string orderNo, string batchNo, string productCode)
			{
			try
			{
			@@ -294,7 +342,7 @@

			throw;
			}



			}