CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs
@@ -70,7 +70,20 @@ return _IOA_DriverRecordDAL.GetModelByKeyid(keyid); } /// <summary> /// 获取全部合作客户 /// </summary> /// <param name="Keyid">主键id</param> /// <returns></returns> public OA_DriverRecord GetModelByTimeCarIDClockType(DateTime CreatTime, int CarID, int ClockType) { return _IOA_DriverRecordDAL.GetModelByTimeCarIDClockType(CreatTime, CarID, ClockType); } /// <summary> /// 查询合作客户分页列表 /// </summary> CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs
@@ -19,7 +19,15 @@ /// <returns></returns> OA_DriverRecord GetModelByKeyid(Guid keyid); /// <summary> /// 根据日期，车，和上下班类型查询记录 /// </summary> /// <param name="Keyid">编号</param> /// <returns></returns> OA_DriverRecord GetModelByTimeCarIDClockType(DateTime CreatTime,int CarID,int ClockType); } CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs
@@ -67,6 +67,12 @@ /// <summary> /// 创建时间 /// </summary> public string CreatTimeName { get; set; } /// <summary> /// 创建人的memberId /// </summary> public Guid? CreaterID { get; set; } @@ -165,9 +171,13 @@ set; } // 附件表 4是装货照片 5是车况 // 附件表 4是装货照片 5是车况 public OA_DriverRecord oA_DriverRecord { get; set; } #endregion Model #region Visiter CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
@@ -272,7 +272,7 @@ /// <returns></returns> public IEnumerable<Model.CoreCmsPlanOrder> GetModelByorderid(int orderid) { return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " orderkeyid = " + orderid + " order by Bianhao ") as IList<Model.CoreCmsPlanOrder>;//执行查询 return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " orderkeyid = " + orderid + " order by quxian,pianqu ") as IList<Model.CoreCmsPlanOrder>;//执行查询 }
@@ -28,8 +28,8 @@ " from [OA_DriverRecord] od " + " left join [OA_CarManage] ocar on od.[CarID] = ocar.Keyid " + " where 0=0 "; " where ClockType = 1 "; const string FROMSOUCEEND = ") as t "; /// <summary> /// 分页默认排序字段 @@ -102,6 +102,36 @@ /// <summary> /// 根据编号获得信息 /// </summary> /// <param name="Keyid">编号</param> /// <returns></returns> public OA_DriverRecord GetModelByTimeCarIDClockType(DateTime CreatTime, int CarID, int ClockType) { try { string condition = " "; condition = " CarID='" + CarID + "' and ClockType = 2 "; condition += " and DATEDIFF(DAY,'"+ CreatTime.ToString("yyyy-MM-dd") + "',[CreatTime])=0 "; // return null;//错误数据返会空 IList<OA_DriverRecord> result = _dataBase.SelectModel<OA_DriverRecord>("*", "OA_DriverRecord", condition) as IList<OA_DriverRecord>;//执行查询 return (null == result || result.Count == 0) ? null : result[0];//返回结果 } catch (Exception ex) { throw ex; } } /// <summary> /// 全部查询 /// </summary> /// <param name="query"></param> CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -333,7 +333,7 @@ { condition += " and a.DepartmentId = '" + DepartmentId + "'"; } return _dataBase.SelectModelPage<Model.OA_Staff>(pagination, " a.*,b.Name as DepartmentName ", " dbo.OA_Staff AS a LEFT JOIN dbo.OA_Department AS b ON a.DepartmentId = b.Keyid ", "a.Status DESC,a.DepartmentId ASC ", " Status DESC,DepartmentId ASC ", condition); return _dataBase.SelectModelPage<Model.OA_Staff>(pagination, " a.*,b.Name as DepartmentName ", " dbo.OA_Staff AS a LEFT JOIN dbo.OA_Department AS b ON a.DepartmentId = b.Keyid ", "a.Status DESC,a.DepartmentId ASC ,a.SM_Post DESC", " Status DESC,DepartmentId ASC,SM_Post DESC ", condition); } catch (Exception ex) { CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
@@ -364,7 +364,7 @@ <td > <input id="txtCreatTimestart" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtCreatTimeend" type="text" runat="server" class='date w80px' maxlength='10' /> </td> <td class="ali03"> <%-- <td class="ali03"> 打卡类型： </td> <td > @@ -374,7 +374,7 @@ <option value="2">下班</option> <option value="3">草稿</option> </select> </td> </td>--%> <td class="ali03"> 车辆： </td> @@ -389,13 +389,13 @@ <input id='txtCreater' runat="server" maxlength='50' /> </td> </tr> <%-- </tr> <tr> <tr>--%> <td colspan="8"> <td <%--colspan="8"--%>> <asp:button id="btn_Search" text="查询" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' /> @@ -428,34 +428,54 @@ 驾驶员 </th> <th width="85"> 打卡时间 上班打卡时间 </th> <th width="60"> 打卡类型 </th> <th style="text-align: center;"width="200"> 未装货情况 </th> <th style="text-align: center;"width="200"> 车况 </th> <th style="text-align: center;"width="200"> 备注 </th> <th width="60"> 里程(公里) </th> <th width="60"> 里程图片 </th> <th width="60"> 装货图片 </th> <th width="60"> 车况图片 </th> <th style="text-align: center;"width="50"> 车况 </th> <th width="85"> 下班打卡时间 </th> <th width="60"> 里程(公里) </th> <th width="60"> 里程图片 </th> <th width="60"> 装货图片 </th> <th style="text-align: center;"width="50"> 未装货情况 </th> <th style="text-align: center;"width="50"> 备注 </th> </tr> </thead> @@ -477,34 +497,52 @@ <td> <%#Eval("CreatTime", "{0:yyyy-MM-dd HH:mm:dd}")%> </td> <td> <%#Eval("ClockTypeName")%> </td> <td> <%#Eval("EmptyCause")%> </td> <td> <%#Eval("CarCondition")%> </td> <td> <%#Eval("Remark")%> </td> <td> <%#Eval("Mileage")%> </td> <td> <a title='里程图片' class='a_under' href="<%#Eval("MileageImg").ToString() %>" target="view_window" > <%#Eval("MileageImgName")%> </a> <a title='里程图片' class='a_under' href="<%#Eval("MileageImg") %>" target="view_window" > <%#Eval("MileageImgName")%> </a> </td> <td> <a href='javascript:void(0)' title='装货图片' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","4")'> <%#Eval("ZhuangcheImg")%> </a> </td> <td> <a href='javascript:void(0)' title='车况图片' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","5")'> <%#Eval("CarConditionImg")%> </a> <a href='javascript:void(0)' title='车况图片' class='a_under' onclick='onViewuplod("<%#Eval("oA_DriverRecord.Id")%>","5")'> <%#Eval("oA_DriverRecord.CarConditionImg")%> </a> </td> <td> <%#Eval("CarCondition")%> <%#Eval("oA_DriverRecord.CarCondition")%> </td> <td> <%#Eval("oA_DriverRecord.CreatTimeName")%> </td> <td> <%#Eval("oA_DriverRecord.Mileage")%> </td> <td> <a title='里程图片' class='a_under' href="<%#Eval("oA_DriverRecord.MileageImg") %>" target="view_window" > <%#Eval("oA_DriverRecord.MileageImgName")%> </a> </td> <td> <a href='javascript:void(0)' title='装货图片' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","4")'> <%#Eval("ZhuangcheImg")%> </a> <a href='javascript:void(0)' title='装货图片' class='a_under' onclick='onViewuplod("<%#Eval("oA_DriverRecord.Id")%>","4")'> <%#Eval("oA_DriverRecord.ZhuangcheImg")%> </a> </td> <td> <%#Eval("EmptyCause")%> <%#Eval("oA_DriverRecord.EmptyCause")%> </td> <td> <%#Eval("Remark")%> <%#Eval("oA_DriverRecord.Remark")%> </td> </tr> </itemtemplate> CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs
@@ -118,7 +118,7 @@ this.txtCreatTimeend.Value, this.selCarId.Value, this.txtCreater.Value, this.selClockType.Value "" ); Database DC = new Database(); @@ -128,6 +128,104 @@ List<OA_CorporateClientsContract> fileDataList = null; foreach (var oA_DriverRecord in oA_DriverRecords) { var oA_DriverRecord1 = _oA_DriverRecordBLL.GetModelByTimeCarIDClockType(oA_DriverRecord.CreatTime, oA_DriverRecord.CarID, 2); if (oA_DriverRecord1 != null) { oA_DriverRecord1.CreatTimeName = oA_DriverRecord1.CreatTime.ToString("yyyy-MM-dd HH:mm:ss"); if (string.IsNullOrEmpty(oA_DriverRecord1.MileageImg)) { oA_DriverRecord1.MileageImgName = ""; } else { oA_DriverRecord1.MileageImgName = "<img src=\"" + oA_DriverRecord1.MileageImg + "\" width=\"20\" height=\"20\" >"; } string sqlStr1 = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=4 order by [CreateTime] ", oA_DriverRecord1.Id); SqlCommand myCmd1 = new SqlCommand(sqlStr1, DC.Connection); //SqlDataAdapter myDa = new SqlDataAdapter(myCmd); var a1 = myCmd1.ExecuteReader(); //myDa.Dispose(); fileDataList = new List<OA_CorporateClientsContract>(); OA_CorporateClientsContract Contract1; var j = 1; while (a1.Read()) { //注意如何将每次读取到的记录添加到listbox1中（因为第一次做时出错了，嘿嘿） Contract1 = new OA_CorporateClientsContract(); // Contract.Keyid = a.GetInt32(0); //Contract.CorporateClientsid = a.GetGuid(1); //Contract.CorporateClientsName = a.GetString(4); Contract1.FileName = a1[4].ToString(); Contract1.PageCode = j; Contract1.FilePath = a1.GetString(2); // Contract.Remark = a.GetString(6); j += 1; fileDataList.Add(Contract1); } a1.Close(); //关闭sqldatareader if (fileDataList.Count > 0) { oA_DriverRecord1.ZhuangcheImg = "<img src=\"" + fileDataList[0].FilePath + "\" width=\"20\" height=\"20\" >"; } else { oA_DriverRecord1.ZhuangcheImg = ""; } sqlStr1 = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=5 order by [CreateTime] ", oA_DriverRecord1.Id); myCmd1 = new SqlCommand(sqlStr1, DC.Connection); //SqlDataAdapter myDa = new SqlDataAdapter(myCmd); a1 = myCmd1.ExecuteReader(); //myDa.Dispose(); fileDataList = new List<OA_CorporateClientsContract>(); j = 1; while (a1.Read()) { //注意如何将每次读取到的记录添加到listbox1中（因为第一次做时出错了，嘿嘿） Contract1 = new OA_CorporateClientsContract(); // Contract.Keyid = a.GetInt32(0); //Contract.CorporateClientsid = a.GetGuid(1); //Contract.CorporateClientsName = a.GetString(4); Contract1.FileName = a1[4].ToString(); Contract1.PageCode = j; Contract1.FilePath = a1.GetString(2); // Contract.Remark = a.GetString(6); j += 1; fileDataList.Add(Contract1); } a1.Close(); //关闭sqldatareader if (fileDataList.Count > 0) { oA_DriverRecord1.CarConditionImg = "<img src=\"" + fileDataList[0].FilePath + "\" width=\"20\" height=\"20\" >"; } else { oA_DriverRecord1.CarConditionImg = ""; } oA_DriverRecord.oA_DriverRecord = oA_DriverRecord1; } else { oA_DriverRecord.oA_DriverRecord = new OA_DriverRecord(); } if (string.IsNullOrEmpty(oA_DriverRecord.MileageImg)) { oA_DriverRecord.MileageImgName = ""; @@ -272,7 +370,7 @@ this.txtCreatTimeend.Value, this.selCarId.Value, this.txtCreater.Value, this.selClockType.Value "" ); // 创建工作簿 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs
@@ -60,15 +60,6 @@ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatTimeend; /// <summary> /// selClockType 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlSelect selClockType; /// <summary> /// selCarId 控件。 /// </summary> /// <remarks> CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
@@ -103,10 +103,12 @@ </td> <td> <select id="selstatus" keepdefaultstyle='true' runat="server" > <option selected="selected" value="">全部</option> <option value="">全部</option> <option value="4" selected="selected" >未完成</option> <option value="0">未配送</option> <option value="1">配送中</option> <option value="2">已配送</option> <option value="1">部分配送</option> <option value="2">已完成</option> </select> </td>
@@ -41,7 +41,7 @@ { BindList("diyici"); BindList(); } } @@ -136,7 +136,15 @@ { if (cmsPlanOrderItem.nums - LessNumber - Number > 0) { 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>"; 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 { @@ -241,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); } } } } @@ -260,7 +291,15 @@ var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber); if ((nums - LessNumber - Number) > 0) { biaowei += " <td style=\"color: grey;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 { CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
@@ -129,7 +129,7 @@ <%=charu %> <tr id="tr1" runat = "server"> <td colspan="2" style="font-size: 16px;"> <span style="font-weight: bold; font-size: 18px; color: Black;">主题词：</span><span id="spanDM_ThemeWords" runat="server"></span> <span style="font-weight: bold; font-size: 18px; color: Black;font-family:宋体">主题词：</span><span id="spanDM_ThemeWords" runat="server"></span> </td> </tr> <tr id="tr2" runat = "server"> @@ -140,7 +140,7 @@ </tr> <tr id="tr3" runat = "server"> <td colspan="2" style="font-size: 16px;"> <span style="font-weight: bold; font-size: 18px; color: Black;">抄 送：</span><span id="spanDM_CCUnit" runat="server"></span> <span style="font-weight: bold; font-size: 18px; color: Black;font-family:宋体">抄 送：</span><span id="spanDM_CCUnit" runat="server"></span> </td> </tr> <tr id="tr4" runat = "server">
