MeiRuiAn/HuaiAn.git

			@@ -98,6 +98,8 @@
			Dt_PurchaseOrderDetail purchaseOrderDetail = new Dt_PurchaseOrderDetail()
			{
			MaterielCode = item.MCode,
			MaterielName = materielInfo.MaterielName,
			MaterielSpec = materielInfo.MaterielSpec,
			PurchaseDetailQuantity = item.Qty,
			PurchaseDetailReceiveQty = 0,
			PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
			@@ -133,7 +135,7 @@
			{
			try
			{
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().First(x => x.PurchaseOrderNo == model.OrderNo);
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.OrderNo).Includes(x => x.Details).First();
			if (purchaseOrder == null)
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
			@@ -225,7 +227,7 @@
			{
			try
			{
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().First(x => x.PurchaseOrderNo == model.OrderNo);
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.OrderNo).Includes(x => x.Details).First();
			if (purchaseOrder == null)
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
			@@ -247,7 +249,7 @@
			{
			try
			{
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().First(x => x.PurchaseOrderNo == model.OrderNo);
			Dt_PurchaseOrder purchaseOrder = Db.Queryable<Dt_PurchaseOrder>().Where(x=>x.PurchaseOrderNo== model.OrderNo).Includes(x=>x.Details).First();
			if (purchaseOrder == null)
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟淇℃伅");
			@@ -256,12 +258,15 @@
			{
			return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
			}

			purchaseOrder.PurchaseOrderStatus = PurchaseOrderStatusEnum.Closed.ObjToInt();
			_unitOfWorkManage.BeginTran();
			BaseDal.DeleteAndMoveIntoHty(purchaseOrder, OperateTypeEnum.鍏抽棴);
			BaseDal.UpdateData(purchaseOrder);
			//BaseDal.DeleteAndMoveIntoHty(purchaseOrder, OperateTypeEnum.鍏抽棴);
			foreach (var item in purchaseOrder.Details)
			{
			_purchaseOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鍏抽棴);
			item.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.Closed.ObjToInt();
			//_purchaseOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鍏抽棴);
			_purchaseOrderDetailRepository.UpdateData(item);
			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();