ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -33,7 +33,7 @@

			namespace WIDESEA_SquareCabinServices
			{
			public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
			public partial class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
			{
			private readonly IMedicineGoodsServices _medicineGoodsServices;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			@@ -199,6 +199,21 @@
			Creater = App.User.UserName,
			CreateDate = DateTime.Now,
			};
			switch (inventoryInfo.WarehouseCode)
			{
			case "001":
			inventoryInfo.Remark = "æºè½ç«åº";
			break;
			case "002":
			inventoryInfo.Remark = "å¤§ä»¶åº";
			break;
			case "003":
			inventoryInfo.Remark = "éº»ç²¾åº";
			break;
			case "010":
			inventoryInfo.Remark = "å·å»åº";
			break;
			}
			_inventoryInfoService.AddData(inventoryInfo);
			}
			#endregion
			@@ -328,11 +343,13 @@
			}).ToList()
			};
			dt_CabinOrders.Add(entityOrder);
			webResponseContent.OK(data: dt_CabinOrders);
			BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			//webResponseContent.OK(data: dt_CabinOrders);
			}
			#endregion
			else
			{
			#region åå»ºå¥åºåå¤´è¡¨ãå¤§ä»¶åºåç«åº
			var entityOrder = new Dt_CabinOrder//å¤§ä»¶åºè®¢å
			{
			Order_no = order.order_no,
			@@ -355,12 +372,16 @@
			Warehouse_no = WarehouseEnum.ç«åº.ObjToInt().ToString("000"),
			Details = new List<Dt_CabinOrderDetail>()
			};
			#endregion

			List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => order.details.Select(x => x.goods_no).Contains(x.MaterielCode));
			List<Dt_MaterielInfo> materielInfosUp = new List<Dt_MaterielInfo>();
			foreach (var item in order.details)
			{
			// å°ä¸æ¸¸å¥åºæ°éè½¬ä¸ºæ£æ°
			item.order_qty = Math.Abs(item.order_qty);
			#region æ ¹æ®ç©æç¼ç æ¥è¯¢ç©æä¿¡æ¯
			Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
			Dt_MaterielInfo? materielInfo = materielInfos.Where(x => x.MaterielCode == item.goods_no).FirstOrDefault();
			if (materielInfo == null) throw new Exception($"æªæ¾å°è¯åç¼ç ã{item.goods_no}ãçä¿¡æ¯");
			if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
			throw new Exception($"è¯·è®¾ç½®è¯åç¼å·ã{item.goods_no}ãçå±æ§åç±»");
			@@ -449,16 +470,22 @@
			entityOrder.Details.Add(orderDetail);
			}
			#endregion
			materielInfosUp.Add(materielInfo);
			}
			_materielInfoService.UpdateData(materielInfo);
			//_materielInfoService.UpdateData(materielInfo);
			}
			_unitOfWorkManage.BeginTran();
			if (materielInfosUp.Count > 0) _materielInfoService.UpdateData(materielInfosUp);
			if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
			if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
			webResponseContent.OK(data: dt_CabinOrders);
			if (dt_CabinOrders.Count > 0) BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			//webResponseContent.OK(data: dt_CabinOrders);
			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			webResponseContent.Error(ex.Message);
			}
			return webResponseContent;
			@@ -473,18 +500,25 @@
			{
			string WareCodeMJ = WarehouseEnum.éº»ç²¾åº.ObjToInt().ToString("000");
			string WareCodeLD = WarehouseEnum.å·å»åº.ObjToInt().ToString("000");
			List<Dt_SupplyTask_Hty> supplyTask_Hties = new List<Dt_SupplyTask_Hty>();
			List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
			List<Dt_InventoryInfo> infosUp = new List<Dt_InventoryInfo>();
			var codes = order.details.Select(x => x.goods_no).ToList();
			#region ç¹æ®åºæ¿
			if (order.warehouse_no == WareCodeMJ \|\| order.warehouse_no == WareCodeLD)
			{

			List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
			List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
			#region åºåãåºåæ¹æ¬¡å¹³è´¦
			foreach (var item in order.details)
			{
			//æ¾åºåæ¹æ¬¡ä¿¡æ¯
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
			Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
			var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
			if (Qty != item.order_qty) throw new Exception($"ççå¥åºåã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçççæ°éæè¯¯");
			//æ¾ææåºå
			List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
			List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
			foreach (var inventoryInfo in inventoryInfos)
			{
			#region æ·»å ççå¥åºä»»å¡
			@@ -509,17 +543,20 @@
			SupplyQuantity = 0,
			Remark = "ççå¥åº"
			};
			_supplyTaskHtyService.AddData(supplyTask_Hty);
			//_supplyTaskHtyService.AddData(supplyTask_Hty);
			supplyTask_Hties.Add(supplyTask_Hty);
			}
			#endregion
			inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
			inventoryInfo.SupplyQuantity = 0;
			inventoryInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			infosUp.AddRange(inventoryInfos);
			inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
			inventory_Batch.SupplyQuantity = 0;
			_inventoryInfoService.UpdateData(inventoryInfos);
			_inventory_BatchServices.UpdateData(inventory_Batch);
			batchesUp.Add(inventory_Batch);
			//_inventoryInfoService.UpdateData(inventoryInfos);
			//_inventory_BatchServices.UpdateData(inventory_Batch);
			}
			#endregion

			@@ -545,24 +582,31 @@
			Status = 2,
			}).ToList()
			};
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			_unitOfWorkManage.BeginTran();
			_supplyTaskHtyService.AddData(supplyTask_Hties);
			_inventoryInfoService.UpdateData(infosUp);
			_inventory_BatchServices.UpdateData(batchesUp);
			BaseDal.Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			//Repository.AddData(entityOrder);
			#endregion
			}
			#endregion
			else
			{
			List<Dt_CabinOrder> cabinOrdersAdd = new List<Dt_CabinOrder>();
			string WareCodeLK = WarehouseEnum.ç«åº.ObjToInt().ToString("000");
			string WareCodeDJ = WarehouseEnum.å¤§ä»¶åº.ObjToInt().ToString("000");

			List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
			List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
			foreach (var item in order.details)
			{
			//æ¾åºåæ¹æ¬¡ä¿¡æ¯
			Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
			Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
			var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
			if (Qty != item.order_qty) throw new Exception($"ççå¥åºåã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçççæ°éæè¯¯");
			//æ¾ææåºå
			List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
			List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
			//è·åç«åºçç¹å·®å¼æ°
			var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
			var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
			@@ -597,17 +641,20 @@
			SupplyQuantity = 0,
			Remark = "ççå¥åº"
			};
			_supplyTaskHtyService.AddData(supplyTask_Hty);
			//_supplyTaskHtyService.AddData(supplyTask_Hty);
			supplyTask_Hties.Add(supplyTask_Hty);
			}
			#endregion
			inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
			inventoryInfo.SupplyQuantity = 0;
			inventoryInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			_inventoryInfoService.UpdateData(inventoryInfos);
			//_inventoryInfoService.UpdateData(inventoryInfos);
			infosUp.AddRange(inventoryInfos);
			inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
			inventory_Batch.SupplyQuantity = 0;
			_inventory_BatchServices.UpdateData(inventory_Batch);
			//_inventory_BatchServices.UpdateData(inventory_Batch);
			batchesUp.Add(inventory_Batch);
			#endregion

			#region åå»ºå¤§ä»¶åºçç¹å
			@@ -633,8 +680,8 @@
			}).ToList()
			};
			//Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();

			//Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			cabinOrdersAdd.Add(entityOrder);
			#endregion
			}
			else
			@@ -665,14 +712,16 @@
			SupplyQuantity = 0,
			Remark = "ççå¥åº"
			};
			_supplyTaskHtyService.AddData(supplyTask_Hty);
			//_supplyTaskHtyService.AddData(supplyTask_Hty);
			supplyTask_Hties.Add(supplyTask_Hty);
			}
			#endregion
			inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
			inventoryInfo.SupplyQuantity = 0;
			inventoryInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			_inventoryInfoService.UpdateData(inventoryInfos);
			//_inventoryInfoService.UpdateData(inventoryInfos);
			infosUp.AddRange(inventoryInfos);
			#endregion

			#region åå»ºå¤§ä»¶åºçç¹å
			@@ -700,8 +749,8 @@
			}).ToList()
			};
			//Repository.AddData(cabinOrder);
			Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();

			//Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
			cabinOrdersAdd.Add(cabinOrder);
			}
			#endregion

			@@ -727,14 +776,22 @@
			}).ToList()
			};
			//Repository.AddData(entityOrder);
			Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			//Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
			cabinOrdersAdd.Add(entityOrder);
			#endregion
			}
			}
			_unitOfWorkManage.BeginTran();
			_supplyTaskHtyService.AddData(supplyTask_Hties);
			_inventoryInfoService.UpdateData(infosUp);
			_inventory_BatchServices.UpdateData(batchesUp);
			BaseDal.Db.InsertNav(cabinOrdersAdd).Include(it => it.Details).ExecuteCommand();
			_unitOfWorkManage.CommitTran();
			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			//_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, "åå»ºççå¥åºå", ex.Message);
			content.Error(ex.Message);
			}
			@@ -755,20 +812,20 @@
			{
			Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
			List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//æ¾åºææåºåºåå·ç¸åçåºåºå
			_unitOfWorkManage.BeginTran();

			List<Dt_CabinOrderDetail> cabinOrderDetails = new List<Dt_CabinOrderDetail>();
			foreach (var item in cabinOrders)
			{
			if (item.Details != null)
			_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.äººå·¥å®æ);
			if (item.Details != null) cabinOrderDetails.AddRange(cabinOrderDetails);
			item.Modifier = App.User.UserName;
			item.ModifyDate = DateTime.Now;
			item.Details = null;
			}
			BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.äººå·¥å®æ);

			if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			_unitOfWorkManage.CommitTran();
			{
			_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetails, OperateTypeEnum.äººå·¥å®æ);
			BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.äººå·¥å®æ);
			}
			else
			{
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			@@ -780,13 +837,14 @@
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response == null) throw new Exception("ä¸æ¥ERPå¥åºåå®æå¤±è´¥ï¼");
			if (response.resultCode != "0") throw new Exception(response.resultMsg);
			_unitOfWorkManage.CommitTran();

			_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetails, OperateTypeEnum.äººå·¥å®æ);
			BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.äººå·¥å®æ);
			}
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;