LA24030-LuLI_PackageLine.git

			@@ -31,7 +31,7 @@
			{
			if (SystemValue.isStartedModel)
			{


			var rgvLocation = StationLocationEnum.BZ21.ToString();
			/*
			* 1ãä»æ°æ®åºä¸å¤ææ¯å¦é½å¥
			@@ -84,47 +84,63 @@
			continue;
			}
			//string upi = "LS070700101B0001GS";
			////è°ç¨åºçº¸æºæ¥å£
			//var res =new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode="+upi, Guid.NewGuid(),10000);
			//if (res.iState == 0)
			//{
			// var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
			// if (papertable != null)
			// {
			// papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
			// papertable.ApiMessage = res.message;
			// papertable.PushNum++;
			// }
			// else
			// {
			// var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			// papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			// papercut.ApiMessage = res.message;
			// papercut.PushNum = 0;
			// papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
			// wmsDB.mes_push_papercut.Add(papercut);
			// }
			//}
			//else
			//{
			// var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
			// if (papertable != null)
			// {
			// papertable.PushStatus = (int)PushStatusEnum.PushFail;
			// papertable.ApiMessage = res.message;
			// papertable.PushNum++;
			// }
			// else
			// {
			// var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			// papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			// papercut.ApiMessage = res.message;
			// papercut.PushNum = 0;
			// papercut.PushStatus = (int)PushStatusEnum.PushFail;
			// wmsDB.mes_push_papercut.Add(papercut);
			// }
			// continue;
			//}
			//è°ç¨åºçº¸æºæ¥å£
			var res = new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode=" + upiObj.PackageCode, Guid.NewGuid(), 10000);
			if (res.iState == 0)
			{
			/*
			var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
			if (papertable != null)
			{
			papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
			papertable.ApiMessage = res.message;
			papertable.PushNum++;
			}
			else
			{
			var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			papercut.ApiMessage = res.message;
			papercut.PushNum = 1;
			papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
			wmsDB.mes_push_papercut.Add(papercut);
			}
			//*/
			var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			papercut.ApiMessage = res.message;
			papercut.PushNum = 1;
			papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
			wmsDB.mes_push_papercut.Add(papercut);
			}
			else
			{
			/*
			var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
			if (papertable != null)
			{
			papertable.PushStatus = (int)PushStatusEnum.PushFail;
			papertable.ApiMessage = res.message;
			papertable.PushNum++;
			}
			else
			{
			var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			papercut.ApiMessage = res.message;
			papercut.PushNum = 1;
			papercut.PushStatus = (int)PushStatusEnum.PushFail;
			wmsDB.mes_push_papercut.Add(papercut);
			}
			//*/
			var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
			papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			papercut.ApiMessage = res.message;
			papercut.PushNum = 1;
			papercut.PushStatus = (int)PushStatusEnum.PushFail;
			wmsDB.mes_push_papercut.Add(papercut);
			continue;
			}
			//æ´æ°è¡¨
			var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
			if (mesgather != null)
			@@ -132,9 +148,9 @@
			mesgather.AreaCode = (int)AreaCodeEnum.ååè£ååº;
			mesgather.UpiStatus = (int)UpiStatusEnum.å·²åå;
			}
			var upilist=wmsDB.mes_batchOrderUPI_new.Where(x=>x.PackageCode==upiObj.PackageCode).ToList();
			var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
			var upilength = upilist.Max(x => x.Length);
			var upiwidth= upilist.Max(x => x.Width);
			var upiwidth = upilist.Max(x => x.Width);
			cartonhigh = (short)upiObj.Info3;
			cartonwidth = (short)upiObj.Info2;
			upiObj.UpiStatus = (int)UpiStatusEnum.å·²åå;
			@@ -185,15 +201,15 @@
			PlaceCode = place
			};
			//æ°å¢æå°è¡¨
			var printid= Yitter.IdGenerator.YitIdHelper.NextId();
			var printid = Yitter.IdGenerator.YitIdHelper.NextId();
			var print = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
			print.Id = printid;
			print.PrintType = (int)PrintTypeEnum.åè£æ¡ç ;
			print.PrintSource = (int)PrintSourceEnum.åè£æ¡ç æå°;
			print.PrintSheetNum = 1;
			print.PrintNum= 0;
			print.PrintNum = 0;
			print.PrintStatus = (int)PrintStatuEnum.æªæå°;
			print.IsAllowPrint= true;
			print.IsAllowPrint = true;
			print.CreateTime = print.UpdateTime = DateTime.Now;
			wmsDB.wms_record_print.Add(print);
			var printtwo = ClassHelper.RotationMapping<wms_record_print, mes_batchOrderUPI_new>(upiObj);
			@@ -204,11 +220,11 @@
			printtwo.PrintStatus = (int)PrintStatuEnum.æªæå°;
			printtwo.IsAllowPrint = true;
			printtwo.CreateTime = print.UpdateTime = DateTime.Now;
			printtwo.Id= Yitter.IdGenerator.YitIdHelper.NextId();
			printtwo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
			wmsDB.wms_record_print.Add(printtwo);

			wmsDB.mes_package_linequeue.Add(mesinequeue);
			wmsDB.wms_rbline_task.Add(task);
			wmsDB.wms_rbline_task.Add(task);
			wmsDB.mes_push_packagecode.Add(putpakegecode);

			//å¤çè¡¨ mes_order_gather
			@@ -274,7 +290,7 @@
			{
			value.PushStatus = (int)PushStatusEnum.Pushing;
			value.PushNum++;
			value.ApiMessage+= res.message;
			value.ApiMessage += res.message;
			if (value.PushNum == 3)
			{
			value.PushStatus = (int)PushStatusEnum.PushFail;