ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -35,18 +35,19 @@
			public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
			{
			private readonly ICabinOrderServices _cabinOrderServices;
			private readonly IBasicService _basicService;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			private readonly ILocationInfoService _locationInfoService;
			private readonly IInventoryInfoService _inventoryInfoService;
			private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
			private readonly ISupplyTaskService _supplyTaskService;
			private readonly ISupplyTaskHtyService _supplyTaskHtyService;
			private readonly ITacticsService _tacticsService;
			private readonly IMaterielInfoService _materielInfoService;
			private readonly IMessageInfoService _messageInfoService;
			public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
			public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
			public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
			{
			_basicService = basicService;
			_unitOfWorkManage = unitOfWorkManage;
			_deliveryOrderDetailServices = deliveryOrderDetailServices;
			_supplyTaskService = supplyTaskService;
			@@ -55,6 +56,9 @@
			_cabinOrderServices = cabinOrderServices;
			_tacticsService = tacticsService;
			_supplyTaskHtyService = supplyTaskHtyService;
			_messageInfoService = messageInfoService;
			_materielInfoService = materielInfoService;
			_locationInfoService = locationInfoService;
			}
			#region åå»ºåºåºå
			/// <summary>
			@@ -67,6 +71,7 @@
			WebResponseContent webResponseContent = new WebResponseContent();
			try
			{
			_unitOfWorkManage.BeginTran();
			Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "åºåºçç¥");
			#region ç¹æ®åºæ¿åºåº
			string WareCodeMJ = WarehouseEnum.éº»ç²¾åº.ObjToInt().ToString("000");
			@@ -94,7 +99,7 @@
			Status = 2, // padå¹³åºï¼æ éåæ¥
			}).ToList()
			};
			BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			#endregion
			#region å¤çåºåãåºåæ¹æ¬¡ãæ·»å åºåºä»»å¡
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			@@ -221,11 +226,10 @@
			#endregion
			var Order_qty = Math.Abs(detail.order_qty);//åºåºåæ°é
			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);
			Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);
			if (materielInfo == null) throw new Exception($"æªæ¾å°è¯åç¼ç ã{detail.goods_no}ãçä¿¡æ¯");
			if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
			throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{detail.goods_no}ãçå±æ§åç±»");
			if (materielInfo.BoxQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{detail.goods_no}ãçç®±è§æ°é");
			#endregion
			#region å¤§ä»¶
			if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//å¦æç©ææ¯å¤§ä»¶
			@@ -307,6 +311,7 @@
			#endregion
			else
			{
			if (materielInfo.BoxQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{detail.goods_no}ãçç®±è§æ°é");
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			Dt_DeliveryOrderDetail orderDetail = null;
			Dt_DeliveryOrderDetail orderDetailLK = null;
			@@ -444,14 +449,17 @@
			}
			}
			if (entityOrder.Details.Count > 0)
			BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
			if (entityOrderLK.Details.Count > 0)
			BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
			BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
			#endregion
			}
			_unitOfWorkManage.CommitTran();
			webResponseContent.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			webResponseContent.Error(ex.Message);
			}
			return webResponseContent;
			@@ -464,6 +472,7 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			_unitOfWorkManage.BeginTran();
			string WareCodeMJ = WarehouseEnum.éº»ç²¾åº.ObjToInt().ToString("000");
			string WareCodeLD = WarehouseEnum.å·å»åº.ObjToInt().ToString("000");
			#region ç¹æ®åºæ¿
			@@ -555,7 +564,7 @@
			if (Qty != item.order_qty) throw new Exception($"ççå¥åºåã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçççæ°éæè¯¯");
			//æ¾ææåºå
			List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
			//è·åç«åºçç¹å·®å¼æ°
			//è·åç«åºçç¹å·®å¼æ°.ãããããããããããã
			var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
			var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
			//è·åå¤§ä»¶åºçç¹å·®å¼æ°
			@@ -624,7 +633,8 @@
			Status = 2,
			}).ToList()
			};
			Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			//Repository.AddData(entityOrder);
			#endregion
			}
			else
			@@ -653,7 +663,7 @@
			OrderNo = order.order_no,
			StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
			SupplyQuantity = 0,
			Remark = "ççå¥åº"
			Remark = "çäºåºåº"
			};
			_supplyTaskHtyService.AddData(supplyTask_Hty);
			}
			@@ -689,7 +699,8 @@
			Status = 2,
			}).ToList()
			};
			Repository.AddData(cabinOrder);
			//Repository.AddData(cabinOrder);
			Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
			}
			#endregion

			@@ -714,15 +725,20 @@
			Status = 0,
			}).ToList()
			};
			Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			//Repository.AddData(entityOrder);
			#endregion
			}
			//return WebResponseContent.Instance.OK("æå");
			}
			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK("æå");
			}
			catch (Exception e)
			catch (Exception ex)
			{
			content.Error(e.Message);
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			@@ -736,7 +752,7 @@
			try
			{
			// 1ï¸â£ æ¥æ¾æå®æ¹æ¬¡ä¸ç©æçåºåä¿¡æ¯
			var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
			var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()
			.Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
			.First();

			@@ -848,6 +864,12 @@
			return content;
			}


			/// <summary>
			/// padåºåºå®æ
			/// </summary>
			/// <param name="saveModel"></param>
			/// <returns></returns>
			public WebResponseContent OutFinish(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			@@ -872,12 +894,12 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_DeliveryOrder? cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
			Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
			if (cabinOrder == null) return WebResponseContent.Instance.Error($"åºåºåå·²å®æ");

			Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();
			if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"åºåºåæç»å·²å®æ");
			Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
			Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
			if (materielInfo == null) return WebResponseContent.Instance.Error($"è¯·ç»´æ¤ç©æç¼å·ã{cabinOrderDetail.Goods_no}ãçç©æä¿¡æ¯");
			cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
			if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
			@@ -896,7 +918,7 @@
			//_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.èªå¨å®æ);
			}
			_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
			var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
			if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "å·²å®æ").Any())
			cabinOrder.OutStatus = "å·²å®æ";
			Repository.UpdateData(cabinOrder);
			@@ -916,7 +938,7 @@
			#region è´§ä½
			if (supplyTask.WarehouseCode != WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			{
			var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
			var location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
			if (location == null)
			return WebResponseContent.Instance.Error($"è¯·ç»´æ¤è´§ä½ç¼å·ã{supplyTask.LocationCode}ãçè´§ä½ä¿¡æ¯");
			//if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
			@@ -925,7 +947,7 @@
			if (inventoryInfo1 == null)
			{
			location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			_locationInfoService.UpdateData(location);
			}
			}
			#endregion
			@@ -935,24 +957,27 @@
			supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
			_supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.äººå·¥å®æ);

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
			if (inventory_Batch != null)
			#region åºåæ¹æ¬¡ å¦æä»»å¡ç±»åæ¯è°æ¨åºåºä»»å¡ï¼8ï¼å°±ä¸ä¿®æ¹æ¹æ¬¡åºå
			if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())
			{
			inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
			inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
			if (inventory_Batch.StockQuantity <= 0)
			_inventory_BatchServices.DeleteData(inventory_Batch);
			else
			_inventory_BatchServices.UpdateData(inventory_Batch);
			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 -= supplyTask.StockQuantity;
			inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
			if (inventory_Batch.StockQuantity <= 0)
			_inventory_BatchServices.DeleteData(inventory_Batch);
			else
			_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			}
			#endregion
			if (supplyTask.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			{
			materielInfo.Business_qty -= supplyTask.StockQuantity;
			_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
			//if (materielInfo.Business_qty < materielInfo.MinQty)
			// CreateAllocatInOut(materielInfo);//åå»ºè°æ¨ä»»å¡
			_materielInfoService.UpdateData(materielInfo);
			if (materielInfo.Business_qty < materielInfo.MinQty)
			CreateAllocatInOut(materielInfo);//åå»ºè°æ¨ä»»å¡
			}
			_unitOfWorkManage.CommitTran();
			#endregion
			@@ -964,5 +989,54 @@
			}
			return content;
			}

			/// <summary>
			/// äººå·¥å¨åºåºåä¸ç¹å»å®ææé®å®ç°ä¸æ¥
			/// </summary>
			/// <param name="key">id</param>
			/// <returns></returns>
			public WebResponseContent FinishOutOrder(int key)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
			List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//æ¾åºææåºåºåå·ç¸åçåºåºå
			_unitOfWorkManage.BeginTran();

			foreach (var item in deliveryOrders)
			{
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.äººå·¥å®æ);
			item.Modifier = App.User.UserName;
			item.ModifyDate = DateTime.Now;
			item.Details = null;
			}
			BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.äººå·¥å®æ);
			if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
			_unitOfWorkManage.CommitTran();
			else
			{
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";

			var requestDate = new
			{
			order_no = deliveryOrder.Out_no
			};
			var result = HttpHelper.Post(url, requestDate.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response == null) throw new Exception("ä¸æ¥ERPåºåºåå®æå¤±è´¥ï¼");
			if (response.resultCode != "0") throw new Exception(response.resultMsg);
			_unitOfWorkManage.CommitTran();
			}
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			}
			}