ZhongRui/ALDbanyunxiangmu.git

			@@ -168,7 +168,9 @@
			inboundOrderDetail.BarcodeUnit = item.BarcodeUnit;
			inboundOrderDetail.BarcodeQty = item.BarcodeQty;
			inboundOrderDetail.OrderQuantity = item.OrderQuantity;

			var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);
			inboundOrderDetail.Unit = purchaseToStockResult.Unit;
			inboundOrderDetail.OrderQuantity = purchaseToStockResult.Quantity;

			updateInboundOrderDetails.Add(inboundOrderDetail);
			detailIds.Add(inboundOrderDetail.Id);
			@@ -186,7 +188,8 @@
			_unitOfWorkManage.BeginTran();
			foreach (var item in deletePurchaseOrderDetails)
			{
			_inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.èªå¨å é¤);
			_inboundOrderDetailRepository.DeleteData(item);
			//_inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.èªå¨å é¤);
			}

			_inboundOrderDetailRepository.UpdateData(updateInboundOrderDetails);
			@@ -223,11 +226,13 @@
			}
			//Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
			_unitOfWorkManage.BeginTran();
			BaseDal.DeleteAndMoveIntoHty(inboundOrder, OperateTypeEnum.èªå¨å é¤);
			//BaseDal.DeleteAndMoveIntoHty(inboundOrder, OperateTypeEnum.èªå¨å é¤);
			foreach (var item in inboundOrder.Details)
			{
			_inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.èªå¨å é¤);
			_inboundOrderDetailRepository.DeleteData(item);
			//_inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.èªå¨å é¤);
			}
			BaseDal.DeleteData(inboundOrder);
			_unitOfWorkManage.CommitTran();
			}
			return WebResponseContent.Instance.OK();
			@@ -422,12 +427,12 @@

			WebResponseContent content = new WebResponseContent();
			try
			{
			{
			(bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);
			if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);

			var code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Code == materielGroupDTO.WarehouseCode).Select(x => x.Code).First();
			if (string.IsNullOrEmpty(code))
			bool code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Id == materielGroupDTO.WarehouseCode).Any();
			if (!code)
			{
			return content = WebResponseContent.Instance.Error($"ä»åºä¸æ²¡æè¯¥{materielGroupDTO.WarehouseCode}ç¼å·ã");
			}
			@@ -451,13 +456,14 @@
			{
			if (stockInfo == null)
			{
			stockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.ç»çæå.ObjToInt(), PalletCode = materielGroupDTO.PalletCode,LocationType=1 };
			stockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.ç»çæå.ObjToInt(), PalletCode = materielGroupDTO.PalletCode,LocationType= materielGroupDTO.WarehouseCode.ObjToInt() };
			stockInfo.Details = new List<Dt_StockInfoDetail>();
			}
			else
			{
			stockInfo.PalletType = PalletTypeEnum.Empty.ObjToInt();
			stockInfo.StockStatus = StockStatusEmun.ç»çæå.ObjToInt();
			stockInfo.LocationType = materielGroupDTO.WarehouseCode.ObjToInt();
			}

			_unitOfWorkManage.BeginTran();