chuanyin-group-project.git

			@@ -65,7 +65,7 @@
			this.selBuyerName.DataValueField = "Keyid";
			this.selBuyerName.DataBind();
			//this.selBuyerName.Items.Insert(0, new ListItem("全部", ""));
			this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
			//this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
			var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId+ "BuyerName") as string;//从缓存中获取数据访问实现层程序集
			if (null != stringBuyerName)
			{
			@@ -113,8 +113,8 @@
			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> <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> ";
			biaotou2 += " <th style=\"text-align:center\" > 已送 </th> <th style=\"text-align:center\" > 未送 </th> ";
			biaotou += " <th style=\"text-align:center\" colspan=\"3\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
			biaotou2 += " <th style=\"text-align:center\" > 已送 </th> <th style=\"text-align:center\" > 未送 </th><th style=\"text-align:center\" > 节约 </th> ";


			}
			@@ -162,28 +162,39 @@
			var Number = coreDeliverOrderItems1.Sum(x => x.Number);
			var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);

			var coreDeliverOrderItem2 = coreDeliverOrderItems1.Where(x => x.OrderID == coreDeliverOrder.id).FirstOrDefault();
			var Numberbenci = 0;
			var LessNumberbenci = 0;
			if (coreDeliverOrderItem2 != null)
			{
			Numberbenci = coreDeliverOrderItem2.Number;
			LessNumberbenci = coreDeliverOrderItem2.LessNumber;
			}



			if (cmsPlanOrderItem.nums > 0)
			{
			if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
			{
			if (LessNumber + Number > 0)
			{
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </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>";
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
			}

			}
			else
			{
			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>";
			biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
			}
			}
			else
			{
			biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
			biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td>";
			}


			@@ -191,7 +202,7 @@
			}
			else
			{
			biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
			biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td><td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
			}


			@@ -221,17 +232,17 @@
			{
			if (LessNumber + Number > 0)
			{
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </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>";
			biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>";
			}

			}
			else
			{
			biaowei += " <td style=\"color: grey;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><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td> ";
			}