ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -1,4 +1,5 @@
			ï»¿using HslCommunication;
			using MailKit.Search;
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			@@ -604,7 +605,7 @@
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)use;
			inv.OutboundQuantity += use;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingPartial -= use;
			@@ -635,7 +636,7 @@
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)use;
			inv.OutboundQuantity += use;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingPartial -= use;
			@@ -678,7 +679,7 @@
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)useQty;
			inv.OutboundQuantity += useQty;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingFullBoxes -= useBoxes;
			@@ -713,7 +714,7 @@
			};
			entityOrder.Details.Add(detail);

			inv.OutboundQuantity += (float)useQty;
			inv.OutboundQuantity += useQty;
			BaseDal.Db.Updateable(inv).ExecuteCommand();

			remainingFullBoxes -= useBoxes;
			@@ -1074,7 +1075,7 @@
			}





			/// <summary>
			/// æ¨éå¼å¸¸ä¿¡æ¯ç»ä¸æ¸¸ç³»ç» 1.å¥åºåæ¥å£ï¼2.å¥åºåæ¥å®ææ¥å£ï¼3.åºåºåæ¥å£ï¼4.åºåºæ¥å®ææ¥å£ï¼5.è¯ååºç¡ä¿¡æ¯åæ¥æ¥å£ï¼6.ä¾åºåä¿¡æ¯æ¥å£ï¼7.å®¢æ·ä¿¡æ¯æ¥å£ï¼8.åºåæ¥è¯¢æ¥å£
			@@ -1103,33 +1104,6 @@
			}
			}

			public WebResponseContent GetPdDeliveryOrders(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_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);
			}
			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);
			}

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

			throw;
			}
			return content;
			}

			public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
			{
			@@ -1146,7 +1120,7 @@
			}
			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 != "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
			}

			content.OK(data: dt_ReceiveOrders);
			@@ -1158,7 +1132,13 @@
			}
			return content;
			}

			/// <summary>
			/// æ¥è¯¢åºåº/çç¹åè¯¦æ
			/// </summary>
			/// <param name="pageNo"></param>
			/// <param name="orderNo"></param>
			/// <param name="isPick"></param>
			/// <returns></returns>
			public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
			{
			WebResponseContent content = new WebResponseContent();
			@@ -1171,25 +1151,29 @@
			content.OK(data: cabinOrderDetails);
			return content;
			}
			public WebResponseContent MatPicking(SaveModel saveModel)
			public WebResponseContent OutFinish(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_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == orderNo && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).First();
			if (cabinOrder == null) return WebResponseContent.Instance.Error($"çç¹åå·²å®æ");
			Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
			if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"çç¹åæç»å·²å®æ");
			var LocationCode = saveModel.MainData["locationCode"].ToString();
			var TaskId = saveModel.MainData["taskId"].ObjToInt();
			Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
			if (supplyTask == null) throw new Exception("å½ååºåºä»»å¡å·²å®æ");
			if (supplyTask.LocationCode != LocationCode) throw new Exception($"å½ååºåºè´§ä½ã{LocationCode}ãä¸ä»»å¡åéè´§ä½ä¸å¹é");
			supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();

			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();
			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 += Inqty;
			cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
			if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
			return WebResponseContent.Instance.Error($"å®çæ°éä¸å¯è¶åºè´¦é¢æ°é");
			return WebResponseContent.Instance.Error($"åºåºæ°éä¸å¯è¶åºåæ®æ°é");


			#region å¤çåºåºåï¼è´§ä½ï¼åºåï¼åºåæ¹æ¬¡ä¿¡æ¯
			_unitOfWorkManage.BeginTran();
			@@ -1206,55 +1190,51 @@
			{
			_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();
			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);
			#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.SupplyQuantity += Inqty;
			_inventoryInfoService.UpdateData(inventoryInfo);
			inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
			if (inventoryInfo.StockQuantity <= 0)
			_inventoryInfoService.DeleteData(inventoryInfo);
			else
			_inventoryInfoService.UpdateData(inventoryInfo);
			#endregion

			#region ä»»å¡è®°å½
			Dt_SupplyTask supplyTask = new Dt_SupplyTask()
			#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}ãå·²ç¦ç¨ï¼è¯·æ¢å¤æ£å¸¸åä½¿ç¨");
			Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
			if (inventoryInfo1 == null)
			{
			WarehouseCode = cabinOrderDetail.Reservoirarea,
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
			TaskStatus = SupplyStatusEnum.CheckFinish.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = LocationCode,
			OrderNo = cabinOrder.Out_no,
			StockQuantity = inventoryInfo.StockQuantity,
			SupplyQuantity = Inqty,
			Remark = "çç¹"
			};
			_supplyTaskService.AddData(supplyTask);
			location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_basicService.LocationInfoService.UpdateData(location);
			}
			#endregion

			_supplyTaskService.UpdateData(supplyTask);

			#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.SupplyQuantity += Inqty;
			_inventory_BatchServices.UpdateData(inventory_Batch);
			inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
			if (inventory_Batch.StockQuantity <= 0)
			_inventory_BatchServices.DeleteData(inventory_Batch);
			else
			_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			#endregion

			_unitOfWorkManage.CommitTran();
			#endregion

			content.OK(cabinOrderDetail.Order_Outqty.ToString());
			content.OK();
			}
			catch (Exception ex)
			{
			@@ -1263,7 +1243,8 @@
			}
			return content;
			}
			public WebResponseContent FeedbackOut(SaveModel saveModel)

			public WebResponseContent MatPicking(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try