ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -1,5 +1,6 @@
			ï»¿using HslCommunication;
			using MailKit.Search;
			using Microsoft.AspNetCore.Mvc;
			using Newtonsoft.Json;
			using SqlSugar;
			using System;
			@@ -7,12 +8,19 @@
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;

			using WIDESEA_IBasicService;
			using WIDESEA_ISquareCabinServices;
			using WIDESEA_IWMsInfoServices;
			using WIDESEA_Model.Models;

			using static System.Net.WebRequestMethods;
			@@ -24,11 +32,26 @@
			{
			public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
			{

			static string SearchDate = "";

			public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal) : base(BaseDal)
			static string SearchDate = "";
			private readonly IBasicService _basicService;
			private readonly IMedicineGoodsServices _medicineGoodsServices;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			private readonly IInventoryInfoService _inventoryInfoService;
			private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
			private readonly ISupplyTaskService _supplyTaskService;
			public IRepository<Dt_CabinOrder> Repository => BaseDal;

			public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
			{
			_basicService = basicService;
			_medicineGoodsServices = medicineGoodsServices;
			_unitOfWorkManage = unitOfWorkManage;
			_inventory_BatchServices = inventory_BatchServices;
			_inventoryInfoService = inventoryInfoService;
			_cabinOrderDetailServices = cabinOrderDetailServices;
			_supplyTaskService = supplyTaskService;
			}

			/// <summary>
			@@ -129,7 +152,186 @@
			// return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			// }
			//}
			public WebResponseContent GetCabinOrders(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			int pageNo = saveModel.MainData["pageNo"].ObjToInt();
			string warehouseCode = saveModel.MainData["warehouseId"].ToString();
			string orderNo = saveModel.MainData["orderNo"].ToString();
			List<Dt_CabinOrder> dt_ReceiveOrders = new List<Dt_CabinOrder>();
			if (string.IsNullOrEmpty(orderNo))
			{
			dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.OdrderStatus == "æ°å»º" \|\| x.OdrderStatus == "å¼å§") && x.Warehouse_no == warehouseCode).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
			}
			else
			{
			dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.Order_no.Contains(orderNo) \|\| x.Supplier_no.Contains(orderNo)) && (x.OdrderStatus == "æ°å»º" \|\| x.OdrderStatus == "å¼å§") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
			}

			content.OK(data: dt_ReceiveOrders);
			}
			catch (Exception)
			{

			throw;
			}
			return content;
			}
			public WebResponseContent GetCabinOrderDetail(int pageNo, string orderNo)
			{
			WebResponseContent content = new WebResponseContent();
			Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Includes(x => x.Details).First(x => x.Order_no == orderNo);
			List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
			content.OK(data: cabinOrderDetails);
			return content;
			}
			public WebResponseContent FeedbackIn([FromBody] SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			var LocationCode = saveModel.MainData["LocationCode"].ToString();
			var orderNo = saveModel.MainData["orderNo"].ToString();
			var batchNo = saveModel.MainData["batchNo"].ToString();
			var Inqty = saveModel.MainData["Inqty"].ObjToInt();
			var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
			Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
			if (cabinOrder == null) return WebResponseContent.Instance.Error($"å¥åºåå·²å®æ");
			Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
			if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"å¥åºåæç»å·²å®æ");
			Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
			if (materielInfo == null) return WebResponseContent.Instance.Error($"è¯·ç»´æ¤ç©æç¼å·ã{cabinOrderDetail.Goods_no}ãçç©æä¿¡æ¯");
			cabinOrderDetail.Order_Inqty += Inqty;
			if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
			return WebResponseContent.Instance.Error($"å¥åºæ°éä¸å¯è¶åºåæ®æ°é");

			#region å¤çå¥åºåï¼è´§ä½ï¼åºåï¼åºåæ¹æ¬¡ä¿¡æ¯
			_unitOfWorkManage.BeginTran();

			#region å¥åºå
			cabinOrder.OdrderStatus = "å¼å§";
			cabinOrderDetail.OrderDetailStatus = "å¼å§";
			if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
			{
			cabinOrderDetail.OrderDetailStatus = "å·²å®æ";
			_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.èªå¨å®æ);
			}
			else
			{
			_cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			}
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).First();
			if (cabinOrder1.Details == null \|\| cabinOrder1.Details.Count < 1) cabinOrder.OdrderStatus = "å·²å®æ";
			Repository.UpdateData(cabinOrder);
			#endregion

			#region è´§ä½
			var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
			if (location == null) return WebResponseContent.Instance.Error($"è¯·ç»´æ¤è´§ä½ç¼å·ã{LocationCode}ãçè´§ä½ä¿¡æ¯");
			if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
			return WebResponseContent.Instance.Error($"è´§ä½ç¼å·ã{LocationCode}ãå·²ç¦ç¨ï¼è¯·æ¢å¤æ£å¸¸åä½¿ç¨");
			if (location.LocationStatus != LocationStatusEnum.InStock.ObjToInt())
			{
			location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			}
			#endregion

			#region åºå
			Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
			if (inventoryInfo != null)
			{
			inventoryInfo.StockQuantity += Inqty;
			_inventoryInfoService.UpdateData(inventoryInfo);
			}
			else
			{
			inventoryInfo = new Dt_InventoryInfo()
			{
			LocationCode = LocationCode,
			MaterielCode = materielInfo.MaterielCode,
			MaterielName = materielInfo.MaterielName,
			MaterielSpec = materielInfo.MaterielSpec,
			OutboundQuantity = 0,
			StockQuantity = Inqty,
			StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt(),
			ValidityPeriod = cabinOrderDetail.Exp_date,
			WarehouseCode = cabinOrderDetail.Reservoirarea,
			SupplyQuantity = 0,
			InDate = DateTime.Now,
			BatchNo = cabinOrderDetail.Batch_num,
			Creater = App.User.UserName,
			CreateDate = DateTime.Now,
			};
			_inventoryInfoService.AddData(inventoryInfo);
			}
			#endregion

			#region ä»»å¡è®°å½
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = cabinOrderDetail.Reservoirarea,
			TaskNum = cabinOrderDetail.Id,
			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 = location.LocationCode,
			OrderNo = cabinOrder.Order_no,
			StockQuantity = Inqty,
			SupplyQuantity = 0,
			Remark = "å¥åº"
			};
			_supplyTaskService.AddData(supplyTask);
			#endregion

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
			if (inventory_Batch != null)
			{
			inventory_Batch.StockQuantity += Inqty;
			_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			else
			{
			inventory_Batch = new Dt_Inventory_Batch()
			{
			BatchNo = inventoryInfo.BatchNo,
			CreateDate = inventoryInfo.CreateDate,
			Creater = inventoryInfo.Creater,
			MaterielCode = inventoryInfo.MaterielCode,
			ERPStockQuantity = 0,
			MaterielName = inventoryInfo.MaterielName,
			MaterielSpec = inventoryInfo.MaterielSpec,
			OutboundQuantity = inventoryInfo.OutboundQuantity,
			ProductionDate = inventoryInfo.ProductionDate,
			Status = false,
			StockQuantity = inventoryInfo.StockQuantity,
			ValidityPeriod = inventoryInfo.ValidityPeriod,
			SupplyQuantity = inventoryInfo.SupplyQuantity,
			};
			_inventory_BatchServices.AddData(inventory_Batch);
			}
			#endregion

			_unitOfWorkManage.CommitTran();
			#endregion

			content.OK(cabinOrderDetail.Order_Inqty.ToString());
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}

			public WebResponseContent GetUpstreamOrder()
			{
			@@ -195,28 +397,125 @@
			Supplier_no = order.supplier_no,
			Account_tiem = order.account_time,
			OdrderStatus = "æ°å»º",
			Supplier_name=order.supplier_name,
			Supplier_name = order.supplier_name,
			Warehouse_no = order.warehouse_no,
			Details = order.details.Select(d => new Dt_CabinOrderDetail
			{
			//OrderId è¦æ¿å°å¥åºåè¡¨ä¸çidï¼å¦ä½æ¿ä¸å°å°±å°è¿ä¸ªåæ®µæ¹äºï¼æ¹æå¥åºåå·
			// SqlSugar InsertNavå·¥ä½åçåæå¥ä¸»è¡¨ (Dt_CabinOrder)//è·åçæçä¸»é®ID//èªå¨è®¾ç½®åè¡¨çå³èåæ®µ (OrderId)//åæå¥(Dt_CabinOrderDetail)
			Goods_no = d.goods_no,
			Order_qty = d.order_qty,
			Batch_num = d.batch_num,
			Exp_date = d.exp_date,
			OrderDetailStatus="æ°å»º",
			Status = order.warehouse_no== "001" ? 0 : 2, //å¦ææ¯001æ¿é£ä¹å°±æ¯æªåæ¥ç¶æï¼å¦æä¸æ¯001æ¿é£ä¹å°±æ¯æ éåæ¥ç¶æ
			}).ToList()
			Details = new List<Dt_CabinOrderDetail>()
			//Details = order.details.Select(d => new Dt_CabinOrderDetail
			//{
			// //OrderId è¦æ¿å°å¥åºåè¡¨ä¸çidï¼å¦ä½æ¿ä¸å°å°±å°è¿ä¸ªåæ®µæ¹äºï¼æ¹æå¥åºåå·
			// // SqlSugar InsertNavå·¥ä½åçåæå¥ä¸»è¡¨ (Dt_CabinOrder)//è·åçæçä¸»é®ID//èªå¨è®¾ç½®åè¡¨çå³èåæ®µ (OrderId)//åæå¥(Dt_CabinOrderDetail)
			// Goods_no = d.goods_no,
			// Order_qty = d.order_qty,
			// Batch_num = d.batch_num,
			// Exp_date = d.exp_date,
			// OrderDetailStatus = "æ°å»º",
			// Status = order.warehouse_no == "001" ? 0 : 2, //å¦ææ¯001æ¿é£ä¹å°±æ¯æªåæ¥ç¶æï¼å¦æä¸æ¯001æ¿é£ä¹å°±æ¯æ éåæ¥ç¶æ
			//}).ToList()
			};
			foreach (var item in order.details)
			{
			// å°ä¸æ¸¸å¥åºæ°éè½¬ä¸ºæ£æ°
			item.order_qty = Math.Abs(item.order_qty);
			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			//Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
			Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
			///æ ¹æ®ç©æä¿¡æ¯å¤§å°ä»¶å±æ§åºåæ¯å¦å¥ç«åº //å¤§ä»¶å¥å¹³åº
			if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
			{
			Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
			{
			Reservoirarea = order.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = item.order_qty,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OrderDetailStatus = "æ°å»º",
			Status = 2
			};
			entityOrder.Details.Add(orderDetail);
			}
			else
			{
			Dt_CabinOrderDetail orderDetail = null;
			var ys = item.order_qty % materielInfo.BoxQty; //ä¸è½æ´é¤ç®±è§çæ£ä»¶æ°
			var xs = item.order_qty / materielInfo.BoxQty;//æ´ç®±æ°é
			#region çæç«åºå¥åºå

			#region å¤ææ¯å¦ææ£ä»¶
			if (ys > 0)
			{
			orderDetail = new Dt_CabinOrderDetail()
			{
			Reservoirarea = order.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = ys,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OrderDetailStatus = "æ°å»º",
			Status = 0
			};
			materielInfo.Business_qty += ys;
			}
			#endregion

			#region å¤æç«åºåºåæ¯å¦å¤§äºç«åºæä½åºåæ°
			while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
			{
			xs--;
			if (orderDetail == null)
			{
			orderDetail = new Dt_CabinOrderDetail()
			{
			Reservoirarea = order.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = materielInfo.BoxQty,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OrderDetailStatus = "æ°å»º",
			Status = 0
			};
			materielInfo.Business_qty += materielInfo.BoxQty;
			}
			else
			{
			orderDetail.Order_qty += materielInfo.BoxQty;
			materielInfo.Business_qty += materielInfo.BoxQty;
			}
			}
			#endregion

			if (orderDetail != null) entityOrder.Details.Add(orderDetail);
			#endregion

			#region å©ä½æ´ä»¶å¥å¹³åº
			if (xs > 0)
			{
			orderDetail = new Dt_CabinOrderDetail()
			{
			Reservoirarea = order.warehouse_no,
			Goods_no = item.goods_no,
			Order_qty = materielInfo.BoxQty * xs,
			Batch_num = item.batch_num,
			Exp_date = item.exp_date,
			OrderDetailStatus = "æ°å»º",
			Status = 2
			};
			entityOrder.Details.Add(orderDetail);
			}
			#endregion
			}
			//_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
			_medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
			#endregion
			}
			_CabinOrders.Add(entityOrder);
			orderNos.Add(order.order_no);
			};
			BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();

			//å¨ä¸åç»wcs
			//var reslut= EdiIn(); //åç»ä¸æ¸¸
			//å¦æè¿ä¸ªæ¹æ³æåäºï¼é£ä¹å°±è°ç¨CompleteOrderæ¥å£ï¼ç¶åæ¹å
			//var reslut= EdiIn(); //åç»ä¸æ¸¸
			//å¦æè¿ä¸ªæ¹æ³æåäºï¼é£ä¹å°±è°ç¨CompleteOrderæ¥å£ï¼ç¶åæ¹å
			Db.Ado.CommitTran();
			return responseContent.OK("åæ¥å¥åºåæå");
			}
			@@ -264,7 +563,7 @@
			Console.WriteLine("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			return WebResponseContent.Instance.Error("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			}



			// 4. éåè®¢åï¼ç»è£ DTO å¹¶æ¨é
			foreach (var order in orders)
			@@ -333,10 +632,10 @@
			if (resp != null && resp.code == "0")
			{
			// æ´æ°è¡¨å¤´ç¶æ
			BaseDal.Db.Updateable<Dt_CabinOrder>()
			.SetColumns(o => new Dt_CabinOrder { OdrderStatus = "å¼å§" })
			.Where(o => o.Id == order.Id)
			.ExecuteCommand();
			BaseDal.Db.Updateable<Dt_CabinOrder>()
			.SetColumns(o => new Dt_CabinOrder { OdrderStatus = "å¼å§" })
			.Where(o => o.Id == order.Id)
			.ExecuteCommand();

			// æ´æ°æç»ç¶æä¸ºå·²åæ¥
			BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
			@@ -357,7 +656,7 @@
			}
			catch (Exception ex)
			{


			Console.WriteLine("EdiIn å¼å¸¸ï¼" + ex.Message);
			return new WebResponseContent { Status = false, Message = ex.Message };
			}
			@@ -444,7 +743,7 @@
			Exp_date = d.Exp_date,
			OrderDetailStatus = d.OrderDetailStatus,
			Status = d.Status,


			}).ToList();

			BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
			@@ -486,7 +785,7 @@
			}






			/// <summary>
			@@ -518,7 +817,7 @@







			}