From 389b4da5feedfc0b49d7c6540bc836267d7bbee0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 九月 2025 08:46:15 +0800
Subject: [PATCH] 作业本送货 加上客户单位 完成 订单状态默认未送货 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs | 167 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 21 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
index 2310166..5dc68a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
@@ -171,6 +171,16 @@
this.SelShejirenyuanneiye6.Value = _eC_OrderBasic.Shejirenyuanneiye.HasValue ? _eC_OrderBasic.Shejirenyuanneiye.Value.ToString() : "";
this.SelShejileixingneiye6.Value = _eC_OrderBasic.Shejileixingneiye.HasValue ? _eC_OrderBasic.Shejileixingneiye.Value.ToString() : "";
this.txtShejiyaoqiuneiye6.Value = _eC_OrderBasic.Shejiyaoqiuneiye;
+
+
+ this.SelShejirenyuanneiye61.Value = _eC_OrderBasic.Shejirenyuanneiye1.HasValue ? _eC_OrderBasic.Shejirenyuanneiye1.Value.ToString() : "";
+ this.SelShejileixingneiye61.Value = _eC_OrderBasic.Shejileixingneiye1.HasValue ? _eC_OrderBasic.Shejileixingneiye1.Value.ToString() : "";
+ this.txtShejiyaoqiuneiye61.Value = _eC_OrderBasic.Shejiyaoqiuneiye1;
+
+
+ this.SelShejirenyuanneiye62.Value = _eC_OrderBasic.Shejirenyuanneiye2.HasValue ? _eC_OrderBasic.Shejirenyuanneiye2.Value.ToString() : "";
+ this.SelShejileixingneiye62.Value = _eC_OrderBasic.Shejileixingneiye2.HasValue ? _eC_OrderBasic.Shejileixingneiye2.Value.ToString() : "";
+ this.txtShejiyaoqiuneiye62.Value = _eC_OrderBasic.Shejiyaoqiuneiye2;
}
else if(_eC_OrderBasic.PrintTypeId == 15)
{
@@ -265,6 +275,7 @@
{
this.SelShejirenyuan1111.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
this.txtShejiyaoqiu1111.Value = _eC_OrderBasic.Shejiyaoqiu;
+ this.txtShejiSumPrice1111.Value = _eC_OrderBasic.ShejiSumPrice.HasValue ? _eC_OrderBasic.ShejiSumPrice.Value.ToString("F2") : "";
}
#endregion
@@ -307,7 +318,7 @@
this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).Where(x=> x.KeyId != 37 && x.KeyId != 31).OrderBy(x=>x.orderNumHome);
this.selPrintTypes.DataBind();
this.selPrintTypes.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
- //this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+ this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
this.selExigencyDegree.DataSource = _sys_DictionaryBLL.GetDataByType("OA_绱ф�ョ▼搴�");
this.selExigencyDegree.DataBind();
@@ -354,6 +365,25 @@
{
var StaffId = CurrentUser.StaffId;
this.SelShejirenyuanneiye6.Value = StaffId.ToString();
+ }
+
+
+ this.SelShejirenyuanneiye61.DataSource = oA_Staffs;
+ this.SelShejirenyuanneiye61.DataBind();
+ if (string.IsNullOrEmpty(ToUpSetData))
+ {
+ var StaffId = CurrentUser.StaffId;
+ this.SelShejirenyuanneiye61.Value = StaffId.ToString();
+ }
+
+
+
+ this.SelShejirenyuanneiye62.DataSource = oA_Staffs;
+ this.SelShejirenyuanneiye62.DataBind();
+ if (string.IsNullOrEmpty(ToUpSetData))
+ {
+ var StaffId = CurrentUser.StaffId;
+ this.SelShejirenyuanneiye62.Value = StaffId.ToString();
}
this.SelShejirenyuan15.DataSource = oA_Staffs;
@@ -483,7 +513,6 @@
var StaffId = CurrentUser.StaffId;
this.SelShejirenyuan1111.Value = StaffId.ToString();
}
-
}
}
@@ -786,7 +815,7 @@
decimal bakai = 370 * 260;
decimal sanshierkai = 130 * 185;
-
+ decimal dasanshierkai = 140 * 210;
var txtFirstSize = Request["txtFirstSize"].ToDecimal2()??0;
var txtSecondSize = Request["txtSecondSize"].ToDecimal2() ?? 0;
@@ -799,7 +828,7 @@
{
gongjia = new decimal(1.3);
}
- else if (chicun == sanshierkai)
+ else if (chicun >= sanshierkai && chicun <= dasanshierkai)
{
gongjia = new decimal(0.7);
}
@@ -833,7 +862,15 @@
var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(),"", eC_OrderExtend.Shejileixing.ToString(),null).FirstOrDefault();
if (shejijijian != null)
{
- eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia;
+ if(eC_OrderExtend.Danshuangmian == "鍙岄潰涓嶅悓")
+ {
+ eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia * 2;
+ }
+ else
+ {
+ eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia;
+ }
+
if (eC_OrderExtend.ShejiUnitPrice.HasValue)
{
eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
@@ -883,15 +920,11 @@
int insidePageNum = 1;
if (Request["hidInsidePageNum"] != null)
insidePageNum = Request["hidInsidePageNum"].ToString().ToInt32().Value;
- int PageNumneiye = 0;
- for (int i = 1; i <= insidePageNum; i++)
- {
- if (Request["pageNum" + i] != null)
- PageNumneiye += Request["pageNum" + i].ToInt32().HasValue ? Request["pageNum" + i].ToInt32().Value : 0;
- }
+
+ int PageNumneiye = Request["pageNum" + 1].ToInt32().HasValue ? Request["pageNum" + 1].ToInt32().Value : 0;
eC_OrderExtend.Shejicountneiye = PageNumneiye;// Request["printCount"].ToString().ToInt32();
eC_OrderExtend.Shejileixingneiye = this.SelShejileixingneiye6.Value.ToInt32();
if (eC_OrderExtend.Shejileixingneiye != 8)
@@ -926,7 +959,95 @@
eC_OrderExtend.ShejileixingNameneiye = this.shejileixing(eC_OrderExtend.Shejileixingneiye.Value.ToString());
eC_OrderExtend.Shejiyaoqiuneiye = this.txtShejiyaoqiuneiye6.Value;
-
+
+
+
+ if (insidePageNum > 1)
+ {
+ PageNumneiye = Request["pageNum" + 2].ToInt32().HasValue ? Request["pageNum" + 2].ToInt32().Value : 0;
+ eC_OrderExtend.Shejicountneiye1 = PageNumneiye;// Request["printCount"].ToString().ToInt32();
+ eC_OrderExtend.Shejileixingneiye1 = this.SelShejileixingneiye61.Value.ToInt32();
+ if (eC_OrderExtend.Shejileixingneiye1 != 8)
+ {
+ eC_OrderExtend.Shejirenyuanneiye1 = this.SelShejirenyuanneiye61.Value.ToInt32();
+ var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye1);
+ if (oA_Staff1 != null)
+ {
+ eC_OrderExtend.ShejirenyuanNameneiye1 = oA_Staff1.Name;
+ }
+
+ var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye1.ToString(), null).FirstOrDefault();
+ if (shejijijian1 != null)
+ {
+ eC_OrderExtend.ShejiUnitPriceneiye1 = shejijijian1.Shejilemoney * gongjia;
+ if (eC_OrderExtend.ShejiUnitPriceneiye1.HasValue)
+ {
+ eC_OrderExtend.ShejiSumPriceneiye1 = eC_OrderExtend.ShejiUnitPriceneiye1 * eC_OrderExtend.Shejicountneiye1;
+ }
+ }
+ }
+ else
+ {
+ eC_OrderExtend.Shejirenyuanneiye1 = 0;
+ eC_OrderExtend.ShejirenyuanNameneiye1 = "";
+ eC_OrderExtend.ShejiUnitPriceneiye1 = 0;
+ eC_OrderExtend.ShejiSumPriceneiye1 = 0;
+ }
+
+
+
+ eC_OrderExtend.ShejileixingNameneiye1 = this.shejileixing(eC_OrderExtend.Shejileixingneiye1.Value.ToString());
+ eC_OrderExtend.Shejiyaoqiuneiye1 = this.txtShejiyaoqiuneiye61.Value;
+ }
+
+
+
+
+
+
+
+
+ if (insidePageNum > 2)
+ {
+ PageNumneiye = Request["pageNum" + 3].ToInt32().HasValue ? Request["pageNum" + 3].ToInt32().Value : 0;
+ eC_OrderExtend.Shejicountneiye2 = PageNumneiye;// Request["printCount"].ToString().ToInt32();
+ eC_OrderExtend.Shejileixingneiye2 = this.SelShejileixingneiye62.Value.ToInt32();
+ if (eC_OrderExtend.Shejileixingneiye2 != 8)
+ {
+ eC_OrderExtend.Shejirenyuanneiye2 = this.SelShejirenyuanneiye62.Value.ToInt32();
+ var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye2);
+ if (oA_Staff1 != null)
+ {
+ eC_OrderExtend.ShejirenyuanNameneiye2 = oA_Staff1.Name;
+ }
+
+ var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye2.ToString(), null).FirstOrDefault();
+ if (shejijijian1 != null)
+ {
+ eC_OrderExtend.ShejiUnitPriceneiye2 = shejijijian1.Shejilemoney * gongjia;
+ if (eC_OrderExtend.ShejiUnitPriceneiye2.HasValue)
+ {
+ eC_OrderExtend.ShejiSumPriceneiye2 = eC_OrderExtend.ShejiUnitPriceneiye2 * eC_OrderExtend.Shejicountneiye2;
+ }
+ }
+ }
+ else
+ {
+ eC_OrderExtend.Shejirenyuanneiye2 = 0;
+ eC_OrderExtend.ShejirenyuanNameneiye2 = "";
+ eC_OrderExtend.ShejiUnitPriceneiye2 = 0;
+ eC_OrderExtend.ShejiSumPriceneiye2 = 0;
+ }
+
+
+
+ eC_OrderExtend.ShejileixingNameneiye2 = this.shejileixing(eC_OrderExtend.Shejileixingneiye2.Value.ToString());
+ eC_OrderExtend.Shejiyaoqiuneiye2 = this.txtShejiyaoqiuneiye62.Value;
+ }
+
+
+
+
}
else if (PrintTypeId == 15)
{
@@ -1334,15 +1455,19 @@
eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu1111.Value;
eC_OrderExtend.ShejiStatus = 2;
- var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
- if (shejijijian != null)
- {
- eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
- if (eC_OrderExtend.ShejiUnitPrice.HasValue)
- {
- eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
- }
- }
+ //var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
+ //if (shejijijian != null)
+ //{
+ // eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
+ // if (eC_OrderExtend.ShejiUnitPrice.HasValue)
+ // {
+ // eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
+ // }
+ //}
+
+ var sss = this.txtShejiSumPrice1111.Value.ToDecimal2();
+ eC_OrderExtend.ShejiSumPrice = sss.HasValue?sss.Value:0;
+ eC_OrderExtend.ShejiUnitPrice = eC_OrderExtend.ShejiSumPrice;
}
#endregion
--
Gitblit v1.9.1