ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -4,7 +4,9 @@
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			@@ -28,9 +30,12 @@
			{
			List<Dt_DeliveryOrder> deliveryOrders = new List<Dt_DeliveryOrder>();
			List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
			List<Dt_InventoryInfo> _InventoryInfos = new List<Dt_InventoryInfo>();
			List<Dt_Inventory_Batch> inventory_Batches = _inventory_BatchServices.Repository.QueryData(x => keys.Contains(x.Id));
			foreach (var item in inventory_Batches)
			{
			supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
			if (supplyTasks.Count > 0) throw new Exception($"ç©æç¼å·ã{item.MaterielCode}ãæ¹æ¬¡å·ã{item.BatchNo}ãå·²åå¨çç¹ä»»å¡ï¼è¯·åå®æå½åçç¹ä»»å¡");
			List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => item.MaterielCode == x.MaterielCode && x.BatchNo == item.BatchNo);
			if (inventoryInfos.Count > 0)
			{
			@@ -39,7 +44,7 @@
			Dt_DeliveryOrder deliveryOrder = new Dt_DeliveryOrder()
			{
			Out_no = item.MaterielCode + "_" + item.BatchNo,
			Out_type = "3",
			Out_type = "20",
			OutStatus = "æ°å»º",
			Warehouse_no = items.Key,
			Details = new List<Dt_DeliveryOrderDetail>()
			@@ -60,35 +65,41 @@
			deliveryOrder.Details.Add(deliveryOrderDetail);
			deliveryOrders.Add(deliveryOrder);
			#region åå»ºçç¹ä»»å¡
			if (items.Key != "001")// éç«åºåºåéè¦åå»ºçç¹ä»»å¡
			//if (items.Key != "001")// éç«åºåºåéè¦åå»ºçç¹ä»»å¡
			//{
			foreach (var inventory in items)
			{
			foreach (var inventory in items)
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			{
			WarehouseCode = inventory.WarehouseCode,
			TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
			BatchNo = inventory.BatchNo,
			MaterielName = inventory.MaterielName,
			MaterielCode = inventory.MaterielCode,
			MaterielSpec = inventory.MaterielSpec,
			TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventory.LocationCode,
			OrderNo = deliveryOrder.Out_no,
			StockQuantity = inventory.StockQuantity,
			SupplyQuantity = 0,
			Remark = "çç¹"
			};
			supplyTasks.Add(supplyTask);
			}
			WarehouseCode = inventory.WarehouseCode,
			TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
			BatchNo = inventory.BatchNo,
			MaterielName = inventory.MaterielName,
			MaterielCode = inventory.MaterielCode,
			MaterielSpec = inventory.MaterielSpec,
			TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventory.LocationCode,
			OrderNo = deliveryOrder.Out_no,
			StockQuantity = inventory.StockQuantity,
			SupplyQuantity = 0,
			Remark = "çç¹"
			};
			supplyTasks.Add(supplyTask);
			_InventoryInfos.Add(inventory);
			}
			//}
			#endregion
			}
			}
			}
			_InventoryInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.çç¹éå®.ObjToInt();
			});
			_unitOfWorkManage.BeginTran();
			_inventoryInfoService.UpdateData(_InventoryInfos);
			_supplyTaskService.AddData(supplyTasks);
			BaseDal.Db.InsertNav(deliveryOrders)
			.Include(x => x.Details)
			@@ -104,9 +115,6 @@
			return content;
			}
			#endregion




			#region æ¥è¯¢çç¹åä¿¡æ¯
			/// <summary>
			@@ -125,11 +133,11 @@
			List<Dt_DeliveryOrder> dt_ReceiveOrders = new List<Dt_DeliveryOrder>();
			if (string.IsNullOrEmpty(orderNo))
			{
			dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "æ°å»º" \|\| x.OutStatus == "å¼å§") && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
			dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "æ°å»º" \|\| x.OutStatus == "å¼å§") && x.Warehouse_no == warehouseCode && x.Out_type == "20").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
			}
			else
			{
			dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) \|\| x.Client_no.Contains(orderNo)) && (x.OutStatus == "æ°å»º" \|\| x.OutStatus == "å¼å§") && x.Out_type == "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
			dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) \|\| x.Client_no.Contains(orderNo)) && (x.OutStatus == "æ°å»º" \|\| x.OutStatus == "å¼å§") && x.Out_type == "20" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
			}

			content.OK(data: dt_ReceiveOrders);
			@@ -142,6 +150,7 @@
			return content;
			}
			#endregion

			#region æ¥æ¾çç¹/åºåºä»»å¡
			/// <summary>
			/// æ¥æ¾çç¹/åºåºä»»å¡
			@@ -163,11 +172,11 @@
			if (string.IsNullOrEmpty(LocationCode))
			{
			supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode).ToPageList(pageNo, 5);
			}
			}
			else
			{
			supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode && x.LocationCode.Contains(LocationCode)).ToPageList(pageNo, 5);
			}
			}
			content.OK(data: supplyTasks);
			}
			catch (Exception ex)
			@@ -178,6 +187,7 @@
			}

			#endregion

			#region å®æçç¹ä»»å¡
			public WebResponseContent CheckFinish(SaveModel saveModel)
			{
			@@ -191,64 +201,118 @@
			if (supplyTask == null) throw new Exception("å½åçç¹ä»»å¡å·²å®æ");
			if (supplyTask.LocationCode != LocationCode) throw new Exception($"å½åçç¹è´§ä½ã{LocationCode}ãä¸ä»»å¡åéè´§ä½ä¸å¹é");
			supplyTask.SupplyQuantity = qty;
			content = CheckTaskFinish(supplyTask, LocationCode);
			}
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			return content;
			}
			#endregion

			#region çç¹ä»»å¡å®æ,å¹³åºåç«åº
			public WebResponseContent CheckTaskFinish(Dt_SupplyTask supplyTask, string LocationCode = null)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			supplyTask.TaskStatus = SupplyStatusEnum.CheckFinish.ObjToInt();
			Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type == "3").Includes(x => x.Details).First();
			Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type == "20").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).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_Outqty += supplyTask.SupplyQuantity;
			if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
			return WebResponseContent.Instance.Error($"å®çæ°éä¸å¯è¶åºè´¦é¢æ°é");
			#region å¹³åºçç¹åªè½åºç°æ´ç®±å·®å¼
			if (supplyTask.WarehouseCode == WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString())
			{
			var Qty = supplyTask.SupplyQuantity % materielInfo.BoxQty;
			if (Qty != 0) return WebResponseContent.Instance.Error($"å¤§ä»¶åºåºåä¸ºæ´ç®±ï¼çç¹æ°éä¸è½åå¨æ£ä»¶");
			}
			#endregion
			//if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
			// return WebResponseContent.Instance.Error($"å®çæ°éä¸å¯è¶åºè´¦é¢æ°é");

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

			#region åºåºå
			#region ä¿®æ¹çç¹å
			cabinOrder.OutStatus = "å¼å§";
			cabinOrderDetail.OotDetailStatus = "å¼å§";
			if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
			{
			cabinOrderDetail.OotDetailStatus = "å·²å®æ";
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.èªå¨å®æ);
			}
			else
			{
			_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			}
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type == "3").Includes(x => x.Details).First();
			if (cabinOrder1.Details == null \|\| cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "å·²å®æ";
			if (cabinOrder.OutStatus == "å·²å®æ")
			Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.èªå¨å®æ);
			else
			Repository.UpdateData(cabinOrder);
			Repository.UpdateData(cabinOrder);
			_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
			#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) return WebResponseContent.Instance.Error($"æªæ¾å°è´§ä½ã{LocationCode}ãçåºåä¿¡æ¯");
			inventoryInfo.StockQuantity = supplyTask.SupplyQuantity;
			Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo();
			if (supplyTask.WarehouseCode != WarehouseEnum.ç«åº.ObjToInt().ToString("000"))
			{
			inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode && x.LocationCode == supplyTask.LocationCode);
			if (inventoryInfo == null) return WebResponseContent.Instance.Error($"æªæ¾å°è´§ä½ã{LocationCode}ãçåºåä¿¡æ¯");
			}
			else
			{
			inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode);
			}
			inventoryInfo.SupplyQuantity = supplyTask.SupplyQuantity;
			_inventoryInfoService.UpdateData(inventoryInfo);
			#endregion

			#region ä»»å¡è®°å½
			_supplyTaskService.UpdateData(supplyTask);
			//_supplyTaskService.UpdateData(supplyTask);
			_supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.èªå¨å®æ);
			#endregion

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
			if (inventory_Batch != null)
			#region å¤æå½åç©ææ¹æ¬¡ççç¹ä»»å¡æ¯å¦å¨é¨å®æ
			List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt() && x.WarehouseCode == supplyTask.WarehouseCode).ToList();
			if (supplyTasks.Count < 1)
			{
			inventory_Batch.SupplyQuantity += supplyTask.SupplyQuantity;
			_inventory_BatchServices.UpdateData(inventory_Batch);
			#region å®æçç¹å
			cabinOrder.OutStatus = "å·²å®æ";
			cabinOrder.Details.ForEach(x =>
			{
			x.OotDetailStatus = "å·²å®æ";
			});
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrder.Details, OperateTypeEnum.èªå¨å®æ);
			cabinOrder.Details = null;
			Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.èªå¨å®æ);

			#endregion
			}
			#endregion
			supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
			if (supplyTasks.Count < 1)
			{
			#region æ¥æ¾åºå
			var inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
			var SupplyQuantitys = inventoryInfos.Select(x => x.SupplyQuantity).ToList().Sum();
			#endregion

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
			if (SupplyQuantitys == inventory_Batch.StockQuantity)
			{
			foreach (var item in inventoryInfos)
			{
			item.StockQuantity = item.SupplyQuantity;
			item.SupplyQuantity = 0;
			item.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			_inventoryInfoService.UpdateData(inventoryInfos);
			}
			else
			{
			inventory_Batch.SupplyQuantity = SupplyQuantitys;
			_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			#endregion
			}

			_unitOfWorkManage.CommitTran();
			#endregion

			content.OK();
			#endregion
			}
			catch (Exception ex)
			{