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/AgOutsourcSingleAllList.aspx.cs | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
index 282b1e5..2a4ea7c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -9,6 +9,8 @@
using CY.Model;
using CY.BLL.EC;
using CY.Infrastructure.Query;
+using System.Transactions;
+using CY.BLL.Sys;
namespace CY.WebForm.Pages.business
{
@@ -35,12 +37,66 @@
if (_eC_OrderBasic.BuyerId == CurrentUser.MemberId)
{
if (bll_EC_OrderBasicBLL.DeleteOutOrder(Request["delete"].ToInt32().Value))
- Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx");
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this, "window.location='/Pages/business/AgOutsourcSingleAllList.aspx'");
else
- Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx");
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
else
- Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx");
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+
+ if (!string.IsNullOrEmpty(Request["chexiao"]))
+ {
+ EC_OrderBasic _eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(Request["chexiao"].ToInt32().Value);
+ if(_eC_OrderBasic.SellerName != "鍏朵粬")
+ {
+ JavaScript.MessageBox("宸茬粡纭渚涘簲鍟嗕笉鑳芥挙鍗曪紒", this);
+ }
+ if (_eC_OrderBasic.BuyerId == CurrentUser.MemberId)
+ {
+ var res = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+ res = bll_EC_OrderBasicBLL.UpdateOldOrderSurplusPrintNum(Request["chexiao"].ToInt32().Value);
+ res = bll_EC_OrderBasicBLL.DeleteOutOrder(Request["chexiao"].ToInt32().Value);
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+
+
+ if (res)
+ {
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this, "window.location='/Pages/business/AgOutsourcSingleAllList.aspx'");
+
+ }
+ else
+ {
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
+
+ }
+
+ }
+ else
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
}
UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
@@ -62,6 +118,11 @@
this.selOutFirm.DataValueField = "FirmId";
this.selOutFirm.DataBind();
this.selOutFirm.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
+ this.selPayStates.DataBind();
+ this.selPayStates.Items.Insert(0,new ListItem("鍏ㄩ儴", ""));
}
//缁戝畾鏁版嵁
@@ -70,7 +131,7 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4);
+ this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4,this.selPayStates.Value);
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
--
Gitblit v1.9.1