ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -35,7 +35,6 @@
			{
			public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
			{
			private readonly IBasicService _basicService;
			private readonly IMedicineGoodsServices _medicineGoodsServices;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			@@ -43,11 +42,13 @@
			private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
			private readonly ISupplyTaskService _supplyTaskService;
			private readonly ISupplyTaskHtyService _supplyTaskHtyService;
			private readonly ILocationInfoService _locationInfoService;
			private readonly IMaterielInfoService _materielInfoService;
			private readonly IMessageInfoService _messageInfoService;
			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, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
			public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
			{
			_basicService = basicService;
			_medicineGoodsServices = medicineGoodsServices;
			_unitOfWorkManage = unitOfWorkManage;
			_inventory_BatchServices = inventory_BatchServices;
			@@ -55,12 +56,15 @@
			_cabinOrderDetailServices = cabinOrderDetailServices;
			_supplyTaskService = supplyTaskService;
			_supplyTaskHtyService = supplyTaskHtyService;
			_messageInfoService = messageInfoService;
			_materielInfoService = materielInfoService;
			_locationInfoService = locationInfoService;
			}



			/// <summary>
			/// pdaæ¥è¯¢åºåºåä¿¡æ¯
			/// pdaæ¥è¯¢å¥åºåä¿¡æ¯
			/// </summary>
			/// <param name="saveModel"></param>
			/// <returns></returns>
			@@ -130,7 +134,7 @@
			Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();
			if (cabinOrderDetail == null \|\| cabinOrderDetail.OrderDetailStatus == "å·²å®æ")
			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_Inqty += Inqty;
			if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
			@@ -153,7 +157,7 @@
			#endregion

			#region è´§ä½
			var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
			var location = _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}ãå·²ç¦ç¨ï¼è¯·æ¢å¤æ£å¸¸åä½¿ç¨");
			@@ -162,7 +166,7 @@
			if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
			{
			location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			_locationInfoService.UpdateData(location);
			}
			#endregion

			@@ -195,6 +199,21 @@
			Creater = App.User.UserName,
			CreateDate = DateTime.Now,
			};
			switch (inventoryInfo.WarehouseCode)
			{
			case "001":
			inventoryInfo.Remark = "æºè½ç«åº";
			break;
			case "002":
			inventoryInfo.Remark = "å¤§ä»¶åº";
			break;
			case "003":
			inventoryInfo.Remark = "éº»ç²¾åº";
			break;
			case "010":
			inventoryInfo.Remark = "å·å»åº";
			break;
			}
			_inventoryInfoService.AddData(inventoryInfo);
			}
			#endregion
			@@ -268,7 +287,7 @@
			Status = false,
			StockQuantity = inventoryInfo.StockQuantity,
			AvailableQuantity = inventoryInfo.StockQuantity,
			ValidityPeriod = inventoryInfo.ValidityPeriod,
			ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
			SupplyQuantity = inventoryInfo.SupplyQuantity,
			};
			_inventory_BatchServices.AddData(inventory_Batch);
			@@ -314,6 +333,7 @@
			Warehouse_no = order.warehouse_no,
			Details = order.details.Select(d => new Dt_CabinOrderDetail
			{
			Reservoirarea = order.warehouse_no,
			Goods_no = d.goods_no,
			Order_qty = Math.Abs(d.order_qty),
			Batch_num = d.batch_num,
			@@ -355,12 +375,10 @@
			// å°ä¸æ¸¸å¥åºæ°éè½¬ä¸ºæ£æ°
			item.order_qty = Math.Abs(item.order_qty);
			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
			Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
			if (materielInfo == null) throw new Exception($"æªæ¾å°è¯åç¼ç ã{item.goods_no}ãçä¿¡æ¯");
			if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
			throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçå±æ§åç±»");
			if (materielInfo.BoxQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçç®±è§æ°é");
			if (materielInfo.MinQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçç«åºæä½åºåæ°");
			#endregion
			#region å¤§ä»¶
			if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//å¦æç©ææ¯å¤§ä»¶
			@@ -380,6 +398,8 @@
			#endregion
			else
			{
			if (materielInfo.BoxQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçç®±è§æ°é");
			if (materielInfo.MinQty < 1) throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçç«åºæä½åºåæ°");
			Dt_CabinOrderDetail orderDetail = null;
			var ys = item.order_qty % materielInfo.BoxQty; //ä¸è½æ´é¤ç®±è§çæ£ä»¶æ°
			var xs = (int)(item.order_qty / materielInfo.BoxQty);//ä¿çæ´æ°
			@@ -445,7 +465,7 @@
			}
			#endregion
			}
			_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
			_materielInfoService.UpdateData(materielInfo);
			}
			if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
			if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
			@@ -540,7 +560,8 @@
			Status = 2,
			}).ToList()
			};
			Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			//Repository.AddData(entityOrder);
			#endregion
			}
			#endregion
			@@ -626,7 +647,9 @@
			Status = 2,
			}).ToList()
			};
			Repository.AddData(entityOrder);
			//Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();

			#endregion
			}
			else
			@@ -691,7 +714,9 @@
			Status = 2,
			}).ToList()
			};
			Repository.AddData(cabinOrder);
			//Repository.AddData(cabinOrder);
			Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();

			}
			#endregion

			@@ -716,7 +741,8 @@
			Status = 0,
			}).ToList()
			};
			Repository.AddData(entityOrder);
			//Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			#endregion
			}
			}
			@@ -724,10 +750,61 @@
			}
			catch (Exception ex)
			{
			//_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, "åå»ºççå¥åºå", ex.Message);
			content.Error(ex.Message);
			}
			return content;
			}
			#endregion


			/// <summary>
			/// äººå·¥å¥åºå®æ
			/// </summary>
			/// <param name="key"></param>
			/// <returns></returns>
			public WebResponseContent FinishInOrder(int key)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
			List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//æ¾åºææåºåºåå·ç¸åçåºåºå
			_unitOfWorkManage.BeginTran();

			foreach (var item in cabinOrders)
			{
			if (item.Details != null)
			_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.äººå·¥å®æ);
			item.Modifier = App.User.UserName;
			item.ModifyDate = DateTime.Now;
			item.Details = null;
			}
			BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.äººå·¥å®æ);

			if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			_unitOfWorkManage.CommitTran();
			else
			{
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{
			order_no = cabinOrder.Order_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;
			}
			}
			}