ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -36,6 +36,8 @@
			{
			supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
			if (supplyTasks.Count > 0) throw new Exception($"ç©æç¼å·ã{item.MaterielCode}ãæ¹æ¬¡å·ã{item.BatchNo}ãå·²åå¨çç¹ä»»å¡ï¼è¯·åå®æå½åçç¹ä»»å¡");
			supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).ToList();
			if (supplyTasks.Count > 0) throw new Exception($"ç©æç¼å·ã{item.MaterielCode}ãæ¹æ¬¡å·ã{item.BatchNo}ãå·²åå¨åºåºä»»å¡ï¼è¯·åå®æå½ååºåºä»»å¡");
			List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => item.MaterielCode == x.MaterielCode && x.BatchNo == item.BatchNo);
			if (inventoryInfos.Count > 0)
			{
			@@ -226,7 +228,7 @@
			if (materielInfo == null) return WebResponseContent.Instance.Error($"è¯·ç»´æ¤ç©æç¼å·ã{cabinOrderDetail.Goods_no}ãçç©æä¿¡æ¯");
			cabinOrderDetail.Order_Outqty += supplyTask.SupplyQuantity;
			#region å¹³åºçç¹åªè½åºç°æ´ç®±å·®å¼
			if (supplyTask.WarehouseCode == WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString())
			if (supplyTask.WarehouseCode == WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString("000"))
			{
			var Qty = supplyTask.SupplyQuantity % materielInfo.BoxQty;
			if (Qty != 0) return WebResponseContent.Instance.Error($"å¤§ä»¶åºåºåä¸ºæ´ç®±ï¼çç¹æ°éä¸è½åå¨æ£ä»¶");
			@@ -291,6 +293,7 @@

			#region åºåæ¹æ¬¡
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
			//å¦æçç¹æ°åæ¹æ¬¡æ»æ°å¯¹ä¸äºï¼çç¹æ°èµå¼ä¸º0ï¼èµå¼å°±æ·»å çç¹æ°
			if (SupplyQuantitys == inventory_Batch.StockQuantity)
			{
			foreach (var item in inventoryInfos)