From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +0800
Subject: [PATCH] 送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚才打印打了两张送货单，他都打印的是两页， 相当于说跳了一行一行空白的第二页，第二页是白字的嘛，中间空的太多，中间不空那么多。 好，第三，那个左右的页边距，你们可能只有。
---
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 98 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index fca4f88..af96671 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -48,6 +48,7 @@
OA_CarManageBll bll_OA_CarManageBll = null;
OA_PropertyCateBLL bll_OA_PropertyCateBLL = null;
OA_PropertyManageBLL bll_OA_PropertyManageBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
OA_StaffPostBLL bll_OA_StaffPostBLL = null;
OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
@@ -59,6 +60,10 @@
OA_WageManageBLL bll_OA_WageManageBLL = null;
OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
OA_CustomerAccessRecordBLL bll_OA_CustomerAccessRecordBLL = null;
+ OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
+ OA_GongzuoneirongBLL bll_OA_GongzuoneirongBLL = null;
+
+ OA_GongzuoneirongCateBLL bll_OA_GongzuoneirongCateBLL = null;
public string old_province = "";
public string old_city = "";
@@ -90,6 +95,7 @@
bll_OA_CarManageBll = new OA_CarManageBll();
bll_OA_PropertyCateBLL = new OA_PropertyCateBLL();
bll_OA_PropertyManageBLL = new OA_PropertyManageBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
bll_OA_StaffPostBLL = new OA_StaffPostBLL();
bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
@@ -101,6 +107,9 @@
bll_OA_WageManageBLL = new OA_WageManageBLL();
bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
bll_OA_CustomerAccessRecordBLL = new OA_CustomerAccessRecordBLL();
+ bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
+ bll_OA_GongzuoneirongCateBLL = new OA_GongzuoneirongCateBLL();
+ bll_OA_GongzuoneirongBLL = new OA_GongzuoneirongBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -238,9 +247,41 @@
{
Response.Write(IsExitsPropertyCateName(Request["name"], Request["keyid"]));
}
+ else if (Request["dateType"] == "GongzuoneirongCatecheckname")
+ {
+ Response.Write(IsExitsGongzuoneirongCatecheckName(Request["name"], Request["keyid"]));
+ }
else if (Request["dateType"] == "propertyNamecheckname")
{
Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "shebeiNamecheckname")
+ {
+ Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "Gongzuozhizeckname")
+ {
+ if (string.IsNullOrEmpty(Request["name"]))
+ {
+ Response.Write(1);
+ }
+ else
+ {
+ Response.Write(IsExitsGongzuozhizeName(Request["name"], Request["keyid"]));
+ }
+
+ }
+ else if (Request["dateType"] == "Gongzuoneirongckname")
+ {
+ if (string.IsNullOrEmpty(Request["name"]))
+ {
+ Response.Write(1);
+ }
+ else
+ {
+ Response.Write(IsExitsGongzuoneirongName(Request["name"], Request["keyid"],Request["neirong"]));
+ }
+
}
else if (Request["dateType"] == "resumeCateChange")
{
@@ -1282,7 +1323,7 @@
{
try
{
- if (CurrentUser.MemberType == "绠＄悊鍛�")
+ if (CurrentUser.MemberType == "绠＄悊鍛�" || !CurrentUser.StaffId.HasValue || CurrentUser.StaffId.Value == 0)
{
return "";
}
@@ -1407,6 +1448,18 @@
return bll_OA_PropertyCateBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
}
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佸垎绫绘槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsGongzuoneirongCatecheckName(string Name, string Keyid)
+ {
+ return bll_OA_GongzuoneirongCateBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
#endregion
#region 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
@@ -1420,6 +1473,46 @@
public int IsExitsPropertyNameCateName(string Name, string Keyid)
{
return bll_OA_PropertyManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
+ #endregion
+
+
+ #region 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsShebeiNameCateName(string Name, string Keyid)
+ {
+ return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsGongzuozhizeName(string Name, string Keyid)
+ {
+ return bll_OA_GongzuozhizeBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32());
+ }
+
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsGongzuoneirongName(string Name, string Keyid,string txtCarNumbera)
+ {
+ return bll_OA_GongzuoneirongBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32(), txtCarNumbera);
}
#endregion
@@ -1684,12 +1777,11 @@
OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
DateTime? calculateTimeStart = (calculateTimeString.Replace("骞�", "-").Replace("鏈�", "-") + "1").ToDateTime2();
DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
-
//濂栧姳鍜岀綒娆�
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
- List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
+ List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
{
m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;
--
Gitblit v1.9.1