ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -101,7 +101,7 @@
			{
			return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "è¯·æ±åæ°æ æ" };
			}

			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			// 2ï¸â£ å¼å¯äºå¡
			BaseDal.Db.Ado.BeginTran();
			foreach (var detail in request.details)
			@@ -122,9 +122,60 @@
			case "1": //å¥åº
			{
			#region å¤çå¥åºè®¢å
			var reslut = WarehouseEnum.ç«åº.ObjToInt().ToString("000");

			Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no ==reslut).Includes(x => x.Details).First();
			//Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no == "001").Includes(x => x.Details).First();
			#region å¤ææ¯å¦ä¸ºççå¥åºå
			if (cabinOrder.Order_type == "5")
			{
			foreach (var item in cabinOrder.Details)
			{
			Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
			.First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
			var qty = inventoryInfo.SupplyQuantity - inventoryInfo.StockQuantity;
			if (orderQty != qty)
			throw new Exception($"ççå¥åºæ°éä¸ä¸è´,ä¸ä¼ æ°éã{orderQty}ã,åºåççæ°éã{qty}ã");
			inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
			inventoryInfo.SupplyQuantity = 0;
			inventoryInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			#region æ·»å ççå¥åºä»»å¡
			Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			OperateType = OperateTypeEnum.èªå¨å®æ.ToString(),
			InsertTime = DateTime.Now,
			TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = cabinOrder.Order_no,
			StockQuantity = orderQty,
			SupplyQuantity = 0,
			Remark = "ççå¥åº"
			};
			#endregion
			var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
			.First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
			inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
			inventory_Batch.SupplyQuantity = 0;
			item.OrderDetailStatus = "å·²å®æ";
			BaseDal.Db.Updateable(item).ExecuteCommand();
			BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
			BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
			BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
			}
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
			if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "å·²å®æ").Any())
			cabinOrder.OdrderStatus = "å·²å®æ";
			BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
			}
			#endregion
			else
			{
			if (cabinOrder == null \|\| cabinOrder.OdrderStatus == "å·²å®æ")
			throw new Exception($"å¥åºåå·²å®æ");
			Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo && x.Status == 1).First();
			@@ -226,7 +277,7 @@
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskType = TaskTypeEnum.InPick.ObjToInt(),
			TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventoryInfo.LocationCode,
			@@ -237,14 +288,64 @@
			};
			BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
			#endregion

			//UpdateInboundOrderDetailStatus(request.orderNo, detail.batchNo, detail.productCode);
			}
			}
			break;
			case "2":
			{
			Dt_DeliveryOrder cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.orderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
			if (cabinOrder.Out_type == "6")
			{
			foreach (var item in cabinOrder.Details)
			{
			Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
			.First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
			var qty = inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity;
			if (orderQty != qty)
			throw new Exception($"çäºåºåºæ°éä¸ä¸è´,ä¸ä¼ æ°éã{orderQty}ã,åºåçäºæ°éã{qty}ã");
			inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
			inventoryInfo.SupplyQuantity = 0;
			inventoryInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			#region æ·»å çäºåºåºä»»å¡
			Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
			{
			WarehouseCode = inventoryInfo.WarehouseCode,
			OperateType = OperateTypeEnum.èªå¨å®æ.ToString(),
			InsertTime = DateTime.Now,
			TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
			BatchNo = inventoryInfo.BatchNo,
			MaterielName = inventoryInfo.MaterielName,
			MaterielCode = inventoryInfo.MaterielCode,
			MaterielSpec = inventoryInfo.MaterielSpec,
			TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
			CreateDate = DateTime.Now,
			Creater = App.User.UserName,
			LocationCode = inventoryInfo.LocationCode,
			OrderNo = cabinOrder.Out_no,
			StockQuantity = orderQty,
			SupplyQuantity = 0,
			Remark = "çäºåºåº"
			};
			#endregion
			var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
			.First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
			inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
			inventory_Batch.SupplyQuantity = 0;
			item.OotDetailStatus = "å·²å®æ";
			BaseDal.Db.Updateable(item).ExecuteCommand();
			BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
			BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
			BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
			}
			var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
			if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "å·²å®æ").Any())
			cabinOrder.OutStatus = "å·²å®æ";
			BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
			}
			else
			{
			#region æ¾åºåºä»»å¡
			Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == WarehouseEnum.ç«åº.ObjToInt().ToString("000") && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
			Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == reslut && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
			if (supplyTask == null) throw new Exception($"æªæ¾å°è®¢åå·ã{request.orderNo}ãç©æç¼å·ã{detail.productCode}ãçåºåºä»»å¡");
			if (supplyTask.StockQuantity != orderQty) throw new Exception($"è®¢åå·ã{request.orderNo}ãç©æç¼å·ã{detail.productCode}ãçåºåºæ°éä¸åºåºä»»å¡æ°éä¸ç¸ç");
			#endregion
			@@ -253,6 +354,7 @@
			_deliveryOrderServices.OutTaskFinish(supplyTask);
			#endregion
			}
			}
			break;
			case "3": // çç¹
			{