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/AgMergerOrderList.aspx.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
index 7c9e641..115a290 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
@@ -11,6 +11,7 @@
using CY.BLL.Sys;
using System.Data;
using CY.BLL.OA;
+using CY.BLL.EC;
namespace CY.WebForm.Pages.business
{
@@ -20,12 +21,15 @@
{
EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+
//鍒濆鍖�
public AgMergerOrderList()
{
bll_EC_MergerSingleBLL = new EC_MergerSingleBLL();
bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
}
//椤甸潰鍔犺浇
@@ -52,6 +56,51 @@
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
}
+ if (Request["chedan"] != null)
+ {
+ EC_MergerSingle model = bll_EC_MergerSingleBLL.GetModelByKeyid(Request["chedan"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ var strOrderIdTemp = model.PMS_OldId.ToString2();
+ var strOrderId = strOrderIdTemp.Replace("<br/>", ",");
+ var orderId = strOrderId.Trim(',').Split(',');
+ foreach (var item in orderId)
+ {
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ if (null == _eC_OrderBasic)
+ {
+
+ }
+ else
+ {
+ //淇敼璁㈠崟鐘舵��
+ List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+ oprates.Add(new EC_OrderOperate()
+ {
+ OperateType = 2,
+ OrderId = _eC_OrderBasic.Keyid,
+ Operator = CurrentUser.ShortName,
+ Remark = ""
+ });
+ _eC_OrderBasicBLL.UpdateOrderState(oprates[0]);
+ //淇敼璁㈠崟鏁伴噺
+ _eC_OrderBasicBLL.UpSurplusPrintNum(_eC_OrderBasic.Keyid, _eC_OrderBasic.OrderExtend.PrintNum, CurrentUser.ShortName);
+
+
+
+ }
+ }
+
+ bll_EC_MergerSingleBLL.DeleteModel(model);
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
+ Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
+ }
+ }
+
}
//缁戝畾澶栧崗鍘傚晢
--
Gitblit v1.9.1