From f0c21ec9c1e9c7cd5db58caeb760c7d7ca6df002 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 16 十二月 2025 08:47:56 +0800
Subject: [PATCH] 公文管理中，“主题词”和“抄送”的字体改为粗宋 完成
---
CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs | 10 +
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs | 9 -
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 45 ++++++
CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs | 15 ++
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx | 116 +++++++++++-----
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs | 102 ++++++++++++++
CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs | 14 +
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs | 34 ++++
12 files changed, 295 insertions(+), 66 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs
index 3c90782..ff0cd7c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs
index 218373c..2a6f11f 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs
+++ b/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);
+
+
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs
index bfc6b23..1fd1ff8 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs
+++ b/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
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
index d6dcc43..be18df0 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
+++ b/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>;//鎵ц鏌ヨ
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs
index 086bb3d..59e2d81 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs
@@ -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>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 6c36f3f..1063f94 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/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)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
index c837d2b..d431338 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs
index b9c634d..575a35e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs
+++ b/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
+ ""
);
// 鍒涘缓宸ヤ綔绨�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs
index ee83766..7bb942d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
index 588fdd8..d311f7b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 04feac1..7a4ad04 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -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
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
index 0125a38..4b97cdb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
+++ b/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">
--
Gitblit v1.9.1