ZhongRui/ALDbanyunxiangmu.git

			@@ -549,7 +549,7 @@
			private List<Dt_StockInfo> BuildStockQueryWithInfo(MaterielOutboundCalculationDTO materielCalc, string factoryArea)
			{
			// åºç¡æ¥è¯¢æ¡ä»¶ï¼ç©æç¼å·ãæ¹æ¬¡å·ï¼å¦ææä¾ï¼ãåºåæ°é>0
			ISugarQueryable<Dt_StockInfoDetail> stockDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.MaterielCode == materielCalc.MaterielCode && x.StockQuantity > 0);
			ISugarQueryable<Dt_StockInfoDetail> stockDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.MaterielCode == materielCalc.MaterielCode && x.StockQuantity > 0 && (x.Status == (int)StockStatusEmun.å¥åºå®æ \|\| x.Status == (int)StockStatusEmun.æå¨è§£é));

			// æ ¹æ®æ¡ä»¶æ·»å ä¾åºåç¼å·å¹éï¼ä¸ä¸ºç©ºæ¶æéè¦å¹éï¼
			if (!string.IsNullOrEmpty(materielCalc.SupplyCode))
			@@ -1435,7 +1435,7 @@
			List<Barcodes> barcodesList = new List<Barcodes>();
			Barcodes barcodes = new Barcodes
			{
			Barcode = newBarcode,
			Barcode = isUnpacked ? newBarcode : stockDetail?.Barcode,
			Qty = barcodeQuantity,
			SupplyCode = stockDetail?.SupplyCode ?? "",
			BatchNo = stockDetail?.BatchNo ?? "",
			@@ -1920,13 +1920,13 @@

			var newTask = new Dt_Task()
			{
			CurrentAddress = stations[station],
			CurrentAddress = stations.GetValueOrDefault(station) ?? "",
			Grade = 0,
			PalletCode = palletCode,
			NextAddress = "",
			OrderNo = OrderNo,
			Roadway = newLocation.RoadwayNo,
			SourceAddress = stations[station],
			SourceAddress = stations.GetValueOrDefault(station) ?? "",
			TargetAddress = newLocation.LocationCode,
			TaskStatus = (int)TaskStatusEnum.New,
			TaskType = stock.Details.Count > 0 ? (int)TaskTypeEnum.InPick : (int)TaskTypeEnum.InEmpty,
			@@ -1936,11 +1936,11 @@
			_stockInfoRepository.UpdateData(stock);
			_taskRepository.AddData(newTask);

			//var moveResult = await _eSSApiService.MoveContainerAsync(new MoveContainerRequest
			//{
			// slotCode = movestations[station],
			// containerCode = palletCode
			//});
			var moveResult = await _eSSApiService.MoveContainerAsync(new MoveContainerRequest
			{
			slotCode = movestations[station],
			containerCode = palletCode
			});
			return content.OK();

			}