~dengjunjie/TaiYuanTaiZhong.git

			@@ -116,7 +116,8 @@
			Operator = "admin",
			stationCode = task.agv_toaddress,
			area = station.area,
			jobID = mes_Work.workOrder,
			jobID = mes_Work.jobID,
			workOrder = mes_Work.workOrder,
			ID = Guid.NewGuid()
			};
			inventorys.Add(inventory);
			@@ -163,15 +164,15 @@
			{
			VOLContext context = new VOLContext();
			Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
			var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress);
			var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress);

			if (task.agv_taskstate == AGVTaskStateEnum.Complete1.ToString())
			{
			var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress);
			if (station2 == null) throw new Exception("æªæ¾å°ç»ç¹å°åï¼");
			////ç©ºæä»»å¡éä¿®æ¹é»è¾
			if (station2.stationCode.Contains("X"))
			station2.quantity = 0;// task.agv_tasktype.Contains("TaskType_EmptyPallet") ? 0 : task.agv_qty; //task.agv_qty;
			else if (station2.area == "10" \|\| station2.area == "11" \|\| (station2.stationCode.Contains("C") && task.agv_tasktype == "TaskType_EmptyPallet")) //å¥åºç©ºæä»»å¡
			else if (station2.area == "10" \|\| station2.area == "11" \|\| (station2.stationCode.Contains("C") && task.agv_tasktype == "TaskType_EmptyPallet") \|\| station2.stationCode.Contains("DD")) //å¥åºç©ºæä»»å¡
			station2.quantity = station2.quantity + task.agv_qty;
			else
			station2.quantity = task.agv_qty;
			@@ -187,6 +188,8 @@
			}
			else if (task.agv_taskstate == AGVTaskStateEnum.Complete.ToString())
			{
			var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress);
			if (station1 == null) throw new Exception("æªæ¾å°èµ·ç¹å°åï¼");
			#region MyRegion
			//if (station1.stationCode.Contains("S"))
			// station1.quantity = 0;
			@@ -198,8 +201,14 @@
			//else
			// station1.quantity = 0;
			#endregion

			if (station1.area == "10" \|\| station1.area == "11" \|\| (station1.stationCode.Contains("C") && task.agv_tasktype == "TaskType_EmptyPallet")) //åºåºç©ºæä»»å¡
			if (station1.stationCode.Contains("DD"))//å çåºä½
			{
			station1.quantity = station1.quantity - task.agv_qty;
			station1.location_state = LocationStateEnum.Stroge.ToString();
			}
			else if (station1.area == "10" \|\| station1.area == "11"
			\|\| ((station1.stationCode.Contains("C") \|\| station1.stationCode.Contains("B"))
			&& task.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())) //åºåºç©ºæä»»å¡
			{
			station1.location_state = LocationStateEnum.Stroge.ToString();
			station1.quantity = station1.quantity - 1;
			@@ -220,7 +229,8 @@
			//if (!station1.stationCode.Contains("X") && !station1.stationCode.Contains("S") && !station1.stationCode.Contains("W01001004") && !station1.stationCode.Contains("W01001005"))
			// station1.tray_type = string.Empty;
			}
			station1.lastUpdateTime = DateTime.Now;
			if (!station1.stationCode.Contains("DD"))
			station1.lastUpdateTime = DateTime.Now;
			stationinfoRepository.Update(station1, true);
			}
			}