ZhongRui/ALDbanyunxiangmu.git

			@@ -108,6 +108,7 @@
			_outStockLockInfoService = outStockLockInfoService;
			}


			/// <summary>
			///
			/// </summary>
			@@ -252,6 +253,7 @@
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()
			@@ -265,8 +267,8 @@
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.lineNo,
			// warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
			warehouseCode= "1072",
			warehouseCode = group.Key.WarehouseCode ,
			// warehouseCode= "1072",
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			{
			@@ -349,7 +351,7 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
			Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode ).First();
			if (stockInfo == null)
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑搴撳瓨淇℃伅");
			@@ -361,8 +363,7 @@
			return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
			}

			// _stockRepository.Db.Deleteable(stockInfo);


			int beforeStatus = locationInfo.LocationStatus;

			locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			@@ -373,6 +374,7 @@
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
			_stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
			_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();

			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);

			@@ -389,8 +391,7 @@


			/// <summary>
			/// 鍥炲簱瀹屾垚鍥炶皟 - AGV灏嗘墭鐩樻斁鍥炶揣浣嶅悗璋冪敤
			/// </summary>
			/// 鍥炲簱瀹屾垚鍥炶皟
			public async Task<WebResponseContent> BackToStockComplete(Dt_Task task)
			{
			try