chuanyin-group-project.git

			@@ -47,7 +47,7 @@
			}

			//绑定数据
			private void BindList()
			private void BindList(string diyici="")
			{
			string orderIdStr = Request["orderId"];
			this.hideOrderId.Value = orderIdStr;
			@@ -102,7 +102,7 @@

			if (string.IsNullOrEmpty(biaotou))
			{
			string biaotou2 = " <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
			string biaotou2 = "<th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
			foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
			{
			biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
			@@ -136,11 +136,19 @@
			{
			if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
			{
			biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			if (LessNumber + Number > 0)
			{
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:pink;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			}
			else
			{
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			}

			}
			else
			{
			biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			}
			}
			else
			@@ -158,11 +166,40 @@

			if (string.IsNullOrEmpty(OrderState))
			{
			coreCmsPlanOrder.biaoge += biaoge;
			if(PlanOrderid.Count(x=>x == coreCmsPlanOrder.id) == 0)

			if (string.IsNullOrEmpty(diyici))
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			coreCmsPlanOrder.biaoge += biaoge;
			if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			}
			}
			else
			{
			var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
			var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
			var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
			var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
			if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
			{
			coreCmsPlanOrder.biaoge += biaoge;
			if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			}
			}
			else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
			{
			coreCmsPlanOrder.biaoge += biaoge;
			if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			}
			}
			}


			}
			else if (OrderState == "0")
			{
			@@ -212,6 +249,29 @@
			}
			}
			}
			else if (OrderState == "4")
			{
			var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
			var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
			var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
			var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
			if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
			{
			coreCmsPlanOrder.biaoge += biaoge;
			if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			}
			}
			else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
			{
			coreCmsPlanOrder.biaoge += biaoge;
			if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
			{
			PlanOrderid.Add(coreCmsPlanOrder.id);
			}
			}
			}


			}
			@@ -220,7 +280,7 @@



			biaowei = " <td style=\"text-align:center\"> 合计 </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
			biaowei = " <td></td> <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
			foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
			{
			var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
			@@ -231,11 +291,19 @@
			var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
			if ((nums - LessNumber - Number) > 0)
			{
			biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
			if(LessNumber + Number > 0)
			{
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:pink;\" >" + (nums - LessNumber - Number) + " </span></td>";
			}
			else
			{
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
			}

			}
			else
			{
			biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
			}