From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs | 119 ++++++++++-------------------------------------------------
1 files changed, 21 insertions(+), 98 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
index 71fc301..c014709 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
@@ -71,6 +71,11 @@
void btnSubmit_ServerClick(object sender, EventArgs e)
{
string orderIds = Request["ids"];
+ if (string.IsNullOrEmpty(this.txtFapiaohao.Value.Trim()))
+ {
+ JavaScript.MessageBox("璇疯緭鍏ュ彂绁ㄥ彿锛�", this);
+ return;
+ }
bool isWin = false;
OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
@@ -81,12 +86,21 @@
oA_Kaipiaoshenqing.Kaipiaoshenqing = 3;
oA_Kaipiaoshenqing.KaipiaoquerenCreater = CurrentUser.TrueMemberId;
oA_Kaipiaoshenqing.KaipiaoquerenTime = DateTime.Now;
+ oA_Kaipiaoshenqing.Fapiaohao = this.txtFapiaohao.Value.Trim();
isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ if(oA_Kaipiaoshenqing.Shenqingleixing == "璁㈠崟寮�绁�")
+ {
+ EC_OrderExtend model = new EC_OrderExtend();
+ model.KaipiaoshenqingId = oA_Kaipiaoshenqing.Keyid;
+ model.KaipiaoshenqingTime = oA_Kaipiaoshenqing.KaipiaoquerenTime;
+ model.Kaipiaoshenqing = 3;
+ model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
-
-
+ isWin = _eC_OrderBLL.NewUpdateKaipiaoshenqings(model);
+ }
+
if (isWin)
{
@@ -129,70 +143,15 @@
this.txtBusinessManager.InnerText = oA_Staff.Name;
}
this.txtkaipiaoshijian.InnerText = DateTime.Now.ToString("yyyy-MM-dd");
- this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ //this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
- Dictionary<int, object> searchParam = new Dictionary<int, object>();
- SetParamValue(searchParam, 1, CurrentUser.MemberId);
- SetParamValue(searchParam, 2, "");
- SetParamValue(searchParam, 3, "");
- SetParamValue(searchParam, 4, "");
- SetParamValue(searchParam, 5, "");
- SetParamValue(searchParam, 6, "");
- SetParamValue(searchParam, 7, "");
- SetParamValue(searchParam, 8, "");
- SetParamValue(searchParam, 9, "");
- SetParamValue(searchParam, 10, "");
- SetParamValue(searchParam, 11, "");
- SetParamValue(searchParam, 12, "");
- SetParamValue(searchParam, 13, "");
- SetParamValue(searchParam, 14, "");
- SetParamValue(searchParam, 15, "");
- SetParamValue(searchParam, 16, "");
- SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
- SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
- SetParamValue(searchParam, 20, CurrentUser.StaffId);
- SetParamValue(searchParam, 21, CurrentUser.TrueName);
- SetParamValue(searchParam, 22, "");
- SetParamValue(searchParam, 23, "");
- SetParamValue(searchParam, 24, "");
- SetParamValue(searchParam, 25, "");
- SetParamValue(searchParam, 26, orderIds.ToGuid2());
- SearchParam = searchParam;
-
-
- /// UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
- //鍐嶆鏌ヨ
- // AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
- Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
- {
- PageSize = 1000,// UCPager1.AspNetPager.PageSize,
- PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
- };
- IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, searchParam);//.Where(x=>x.Quchudingdan == 2);
-
- decimal shoukuanmoney = 0;
- this.txtshuliang.InnerText = result.ToList().Count.ToString();
-
-
-
-
- foreach (EC_OrderBasic eC_OrderBasic in result)
- {
-
-
-
-
- shoukuanmoney += eC_OrderBasic.SumPrice.Value;
-
-
-
- }
- this.txtjine.InnerText = String.Format("{0:F}", shoukuanmoney);
+ this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.kpmoney + oA_Kaipiaoshenqing.Zengjianmoney);
}
@@ -204,44 +163,8 @@
}
- /// <summary>
- /// 璁剧疆鏌ヨ鍙傛暟鏂规硶
- /// </summary>
- /// <param name="target">璁剧疆鐩爣</param>
- /// <param name="key">閿�</param>
- /// <param name="value">鍊�</param>
- private static void SetParamValue(Dictionary<int, object> target, int key, object value)
- {
- if (string.IsNullOrEmpty(string.Format("{0}", value)))
- return;
- else
- {
- }
-
- if (target.ContainsKey(key))
- {
- target[key] = value;
- }
- else
- {
- target.Add(key, value);
- }
- }
-
- /// <summary>
- /// 鏌ヨ鍙傛暟
- /// </summary>
- private Dictionary<int, object> SearchParam
- {
- get
- {
- return ViewState["SearchParam"] as Dictionary<int, object>;
- }
- set
- {
- ViewState["SearchParam"] = value;
- }
- }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1