ZhongRui/YingMeiWMSXiangMu.git

			@@ -76,8 +76,11 @@
			{
			LocationType = 3;
			}
			Roadway = _locationInfoService.AccessingTunnel(dt_Warehouse.WarehouseId, LocationType);
			if (Roadway == "0") return apiResponse.Error($"WMSæªè½æ¥è¯¢éå¯¹åºå··éç¼å·ï¼ä»åºç¼ç ï¼{mES_In.warehouseNo}");
			var a = BaseDal.QueryData(x => x.WarehouseId == WarehouseId && x.PalletType == LocationType.ToString());
			var taskCount = BaseDal.QueryData(x => x.WarehouseId == WarehouseId && x.PalletType == LocationType.ToString()).Count();
			Roadway = _locationInfoService.AccessingTunnel(dt_Warehouse.WarehouseId, LocationType, taskCount);
			//if (Roadway == "0") return apiResponse.Error($"WMSæªè½æ¥è¯¢éå¯¹åºå··éç¼å·ï¼ä»åºç¼ç ï¼{mES_In.warehouseNo}");
			if (Roadway == "0") return apiResponse.Error($"å½åä»åºå·²ç»æ»¡ï¼{mES_In.warehouseNo}");
			//è·åå¯¹åºPLCç«å°ä¿¡æ¯
			Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(Roadway);
			NextAddress = _Roadwayinfo.InStationCode;
			@@ -360,7 +363,11 @@
			{
			if (string.IsNullOrWhiteSpace(mES_In.transNo)) return apiResponse.Error("åæ®ç¼å·ä¸è½ä¸ºç©º");
			Dt_Task dt_Task = BaseDal.QueryData(x => x.TaskNum == mES_In.transNo).FirstOrDefault();
			if (dt_Task == null) return apiResponse.Error($"WMSæªè½æ¥æ¾éå¯¹åºåæ®ä»»å¡ï¼æ¡ç ï¼{mES_In.transNo}");
			if (dt_Task == null) {
			WriteLog.Write_Log("MES_ä»»å¡åæ¶æ¥å£", $"ä»»å¡åæ¶æ¥å£", "æå", $"åæ®ç¼å·ï¼{mES_In.transNo}ï¼æ³¨æï¼ï¼WMSæªè½æ¥æ¾éå¯¹åºåæ®ä»»å¡");
			return apiResponse.OK();
			//return apiResponse.Error($"WMSæªè½æ¥æ¾éå¯¹åºåæ®ä»»å¡ï¼æ¡ç ï¼{mES_In.transNo}");
			}
			if(dt_Task.TaskStatus== (int)InTaskStatusEnum.InNew)
			{
			BaseDal.DeleteData(dt_Task);