From a1e963756360f8bd3938aa560b661d0400165c06 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 四月 2026 11:01:43 +0800
Subject: [PATCH] 排版修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 282 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 8f2cd53..e4b40ed 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -13,6 +13,7 @@
using CY.BLL.OA;
using CY.Infrastructure.Query;
using CY.WebForm.Pages.common;
+using CY.BLL.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -27,10 +28,12 @@
OA_InventoryBLL bll_OA_InventoryBLL = null;
OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
public Guid targetid = Guid.Empty;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ OA_ShebeiManageBLL bll_oA_ShebeiManageBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
-
-
-
+
+
EC_CuttingPaperSpecBLL bll_EC_CuttingPaperSpecBLL = null;
public string PressesDeskHtml = "";
public string SpecificationsSheetHtml = "";
@@ -45,7 +48,9 @@
public string[] Lenth = new string[7];
public string xialapr = "";
-
+ AfterParameterInfoBLL _afterParameterInfoBLL = null;
+ public string shebeilist = "";
+ public List<OA_ShebeiManage> oA_ShebeiManages = new List<OA_ShebeiManage>();
//鍒濆鍖�
public AgMergerOrderEdit()
{
@@ -57,6 +62,10 @@
bll_OA_InventoryBLL = new OA_InventoryBLL();
bll_OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
+ _afterParameterInfoBLL = new AfterParameterInfoBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ bll_oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
}
//椤甸潰鍔犺浇
@@ -85,6 +94,13 @@
List<EC_MemberDictionary> m_EC_MemberDictionaryList_filmSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫鑿叉灄瑙勬牸") as List<EC_MemberDictionary>;
List<EC_MemberDictionary> m_EC_MemberDictionaryList_ctpSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鑷甫CTP瑙勬牸") as List<EC_MemberDictionary>;
+ //鍒濆鍖栬澶囧垪琛�
+ var a_ShebeiCate = bll_oA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId).Where(x=>x.Name == "鐢熶骇璁惧" || x.Name == "鍗板埛璁惧" || x.Name == "瑁呰璁惧").ToList();
+ if (a_ShebeiCate != null && a_ShebeiCate.Count > 0)
+ {
+ oA_ShebeiManages = bll_oA_ShebeiManageBLL.GetDataByCate(CurrentUser.MemberId, a_ShebeiCate[0].Keyid + "," + a_ShebeiCate[1].Keyid + "," + a_ShebeiCate[2].Keyid, true, 2).ToList();
+ shebeilist = JsonHelper.GetJsonStringByObject(oA_ShebeiManages);
+ }
Pagination pa = new Pagination();
pa.PageSize = 15;
pa.PageIndex = 1;
@@ -185,7 +201,7 @@
}
keyidstr = m_EC_MergerSingle.Keyid.ToString2();
EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
-
+ var shuliang = 0;
List<EC_OrderBasic> mEC_OrderBasicList = new List<EC_OrderBasic>();
foreach (var item in orderId)
{
@@ -204,7 +220,6 @@
}
else
{
- EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(item.ToInt32().Value);
InquiryCommonModel _inquiryCommonModel = null;
if (null == _eC_OrderPrintParameter)
@@ -249,6 +264,7 @@
_eC_OrderBasic.PrintSizeName = _inquiryCommonModel.PrintSizeName;
}
}
+ shuliang += (_eC_OrderBasic.OrderExtend.SurplusPrintNum??0);
mEC_OrderBasicList.Add(_eC_OrderBasic);
}
#endregion
@@ -304,6 +320,172 @@
}
this.Repeater1.DataSource = m_EC_MergerForumsList;
this.Repeater1.DataBind();
+
+
+ List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
+ if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count == 0)
+ {
+ m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
+ EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
+ m_EC_MergerHoudaos.PSF_Shuliang = shuliang.ToString() ;
+ m_EC_MergerHoudaos.PSF_Beishu = "1";
+ m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
+
+ }
+
+ List<int> houdaolist = new List<int>();
+ List<string> houdaostringlist = new List<string>();
+ List<string> houdaosssss = new List<string>();
+ houdaosssss.Add("鎶橀〉");
+ houdaosssss.Add("楠戦┈閽�");
+ houdaosssss.Add("鑳惰");
+ houdaosssss.Add("鍘嬬棔");
+ houdaosssss.Add("鐑噾");
+ houdaosssss.Add("绮樹俊灏�");
+ houdaosssss.Add("绮橀〉");
+ foreach (var eC_OrderBasic in mEC_OrderBasicList)
+ {
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(eC_OrderBasic.Keyid.ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+ var ssssss = _inquiryCommonModel.AfterWorkList;
+ var inquiryInsideModels = _inquiryCommonModel.InquiryInsideList;
+ if (ssssss != null && ssssss.Count > 0)
+ {
+ foreach (var aaaaa in ssssss)
+ {
+ houdaolist.Add(aaaaa);
+ }
+ }
+
+
+ if (inquiryInsideModels != null && inquiryInsideModels.Count > 0)
+ {
+ foreach (var inquiryInsideModel in inquiryInsideModels)
+ {
+ var afterWorkList = inquiryInsideModel.AfterWorkList;
+ if (afterWorkList != null && afterWorkList.Count > 0)
+ {
+ foreach (var aaaaa in afterWorkList)
+ {
+ houdaolist.Add(aaaaa);
+ }
+ }
+ }
+ }
+
+ if (eC_OrderBasic.PrintTypeId == 29 || eC_OrderBasic.PrintTypeId == 27)
+ {
+ if(houdaostringlist.Count(x=>x == _inquiryCommonModel.JTWZ) <= 0)
+ {
+ houdaostringlist.Add(_inquiryCommonModel.JTWZ);
+ }
+ if(eC_OrderBasic.PrintTypeId == 27)
+ {
+ houdaolist = new List<int>();
+ }
+ }
+ }
+
+
+
+
+ foreach (var c_MergerHoudaos in m_EC_MergerHoudaosList)
+ {
+
+ string select = "<option value=''>鏃�</option>";
+
+
+
+ var sysInquiry_Afters = _afterParameterInfoBLL.GetModelList().Where(x => houdaolist.Contains(x.KeyId)).ToList();
+ if (sysInquiry_Afters != null && sysInquiry_Afters.Count > 0)
+ {
+ foreach (var item in sysInquiry_Afters)
+ {
+ if (item.ParameterName == c_MergerHoudaos.PSF_Houdaogongxu)
+ {
+ select += "<option value='" + item.ParameterName + "' selected=\"selected\" >" + item.ParameterName + "</option>";
+ }
+ else
+ {
+ select += "<option value='" + item.ParameterName + "'>" + item.ParameterName + "</option>";
+ }
+
+ }
+ }
+
+ foreach(var str in houdaostringlist)
+ {
+ if (sysInquiry_Afters.Count(x => x.ParameterName == str) <= 0)
+ {
+ if (str == c_MergerHoudaos.PSF_Houdaogongxu)
+ {
+ select += "<option value='" + str + "' selected=\"selected\" >" + str + "</option>";
+ }
+ else
+ {
+ select += "<option value='" + str + "' >" + str + "</option>";
+ }
+ }
+
+ }
+
+ foreach (var houdao in houdaosssss)
+ {
+ if (sysInquiry_Afters.Count(x => x.ParameterName == houdao) <= 0)
+ {
+
+ if (houdao == c_MergerHoudaos.PSF_Houdaogongxu)
+ {
+ select += "<option value='" + houdao + "' selected=\"selected\" >" + houdao + "</option>";
+ }
+ else
+ {
+ select += "<option value='" + houdao + "' >" + houdao + "</option>";
+ }
+ }
+
+
+ }
+
+ string houdaoduibi = c_MergerHoudaos.PSF_Houdaogongxu;
+ c_MergerHoudaos.PSF_Houdaogongxu = select;
+
+
+ //鏈洪暱閫夐」
+ string selectjizhang = "<option value='0'>璇烽�夋嫨</option>";
+ if (!string.IsNullOrEmpty(houdaoduibi))
+ {
+ var oA_ShebeiManageshoudao = oA_ShebeiManages.Where(x => x.Name.Contains(houdaoduibi));
+ foreach (var a_ShebeiManage in oA_ShebeiManageshoudao)
+ {
+ if (a_ShebeiManage.Zerenren == c_MergerHoudaos.PSF_JichangId)
+ {
+ selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' selected=\"selected\" >" + a_ShebeiManage.ZerenrenName + "</option>";
+ }
+ else
+ {
+ selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' >" + a_ShebeiManage.ZerenrenName + "</option>";
+ }
+ }
+ }
+
+
+
+ c_MergerHoudaos.PSF_Jichang = selectjizhang;
+
+ }
+
+ this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
+ this.RepeaterHoudaoList.DataBind();
+
//鑾峰彇寮�鏂欏昂瀵�
EC_CuttingPaperSpec model = new EC_CuttingPaperSpec();
@@ -419,6 +601,7 @@
string[] PSF_PrintedColorRear = Request["PSF_PrintedColorRear"].ToString2().Split(',');
string[] PSF_Typesetting = Request["PSF_Typesetting"].ToString2().Split(',');
string[] PSF_Typesettinghide = Request["PSF_Typesettinghide"].ToString2().Split(',');
+ string[] PSF_Fabantaoshu = Request["PSF_Fabantaoshu"].ToString2().Split(',');
string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
@@ -454,6 +637,13 @@
string[] oldPSF_PaperId = Request["oldPSF_PaperId"].ToString2().Split(',');
string[] oldPSF_BigPaperCount = Request["oldPSF_BigPaperCount"].ToString2().Split(',');
+
+
+ string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
+ string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
+ string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
+ string[] selJichang = Request["selJichang"].ToString2().Split(',');
+ string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');
int? keyid = Request["keyid"].ToInt32();
@@ -682,6 +872,7 @@
List<EC_MergerForums> m_EC_MergerForumsList = new List<EC_MergerForums>();
List<OA_Inventory> m_OA_InventoryList = new List<OA_Inventory>();
List<OA_OutOfStorage> m_OA_OutOfStorageList = new List<OA_OutOfStorage>();
+ List<EC_MergerHoudaos> m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
for (int i = 0; i < PSF_Forumsid.Length; i++)
{
@@ -706,7 +897,7 @@
{
m_EC_MergerForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
}
-
+ m_EC_MergerForums.PSF_Fabantaoshu = PSF_Fabantaoshu[i];
if (PSF_PrintedCount[i].ToInt32() == null)
{
@@ -821,6 +1012,16 @@
m_EC_MergerForums.PSF_CTPSpecType = selFilmSpec[i].ToString2().Replace("锛�+-+锛�", ",");
m_EC_MergerForums.PSF_CTPCount = 0;
}
+ m_EC_MergerForums.PSF_CTPSpecType = CTPSpecName[i].ToString2().Replace("锛�+-+锛�", ",");
+
+ if (CTPCount[i].ToInt32() == null)
+ {
+ m_EC_MergerForums.PSF_CTPCount = 0;
+ }
+ else
+ {
+ m_EC_MergerForums.PSF_CTPCount = CTPCount[i].ToInt32();
+ }
m_EC_MergerForums.PSF_FilmType = "";
m_EC_MergerForums.PSF_PSSpec = PSF_PSBan[i].ToString2().Replace("锛�+-+锛�", ",");
if (PSCount[i].ToInt32() == null)
@@ -867,7 +1068,7 @@
m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
m_OA_OutOfStorageOld.CargoSpaceId = 0;
m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
- m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
m_OA_OutOfStorageOld.SuppliersId = 0;
m_OA_OutOfStorageOld.Price = 0;
m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -879,7 +1080,10 @@
m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
}
}
}
@@ -893,7 +1097,7 @@
m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
m_OA_OutOfStorage.CargoSpaceId = 0;
m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
- m_OA_OutOfStorage.InfoType = "纭鍑哄簱";
+ m_OA_OutOfStorage.InfoType = "鍑哄簱";
m_OA_OutOfStorage.SuppliersId = 0;
m_OA_OutOfStorage.Price = 0;
if (j == 0)
@@ -916,18 +1120,84 @@
m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
+ m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
+ m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
+ m_OA_InventoryList.Add(m_OA_Inventory);
}
+ }
+ }
+
+ var CTPSpecNamei = CTPSpecName[i];
+ var CTPCounti = CTPCount[i];
+ var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
+ if (!string.IsNullOrEmpty(CTPCounti))
+ {
+ OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "鏉挎潗", "", CTPSpecNamei).FirstOrDefault();
+ if (m_OA_InventoryOld != null)
+ {
+ OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
+ m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
+ m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
+ m_OA_OutOfStorageOld.CargoSpaceId = 0;
+ m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
+ m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
+ m_OA_OutOfStorageOld.SuppliersId = 0;
+ m_OA_OutOfStorageOld.Price = 0;
+ m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
+ if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
+ {
+ m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
+ }
+ m_OA_OutOfStorageOld.AllMoney = 0;
+ m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
+ m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
+ m_OA_OutOfStorageOld.Remark = "";
+ m_OA_OutOfStorageOld.TanPrice = 0;
+ m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
+ m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
+ m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+ m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
+ m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+ m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+ m_OA_InventoryList.Add(m_OA_InventoryOld);
}
}
}
}
-
+
+ for (int i = 0; i < selHoudaogongxu.Length; i++)
+ {
+ EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
+ m_EC_MergerHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace("锛�+-+锛�", ",");
+ m_EC_MergerHoudaos.PSF_Shuliang = txtShuliang[i];
+ m_EC_MergerHoudaos.PSF_Beishu = txtBeishu[i];
+ m_EC_MergerHoudaos.PSF_JichangId = selJichang[i].ToInt32();
+ if(m_EC_MergerHoudaos.PSF_JichangId.HasValue && m_EC_MergerHoudaos.PSF_JichangId.Value > 0)
+ {
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_EC_MergerHoudaos.PSF_JichangId);
+ if (oA_Staff != null)
+ {
+ m_EC_MergerHoudaos.PSF_Jichang = oA_Staff.Name;
+ }
+ }
+ else
+ {
+ m_EC_MergerHoudaos.PSF_Jichang = "";
+ }
+
+ m_EC_MergerHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
+ if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu))
+ {
+ m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
+ }
+ }
+
if (m_EC_MergerSingle.Keyid != null)
{
- if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList))
+ if (bll_EC_MergerSingleBLL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList, m_EC_MergerHoudaosList))
{
JavaScript.MessageBox("淇敼鎴愬姛", this, true, true);
}
@@ -975,7 +1245,7 @@
orderId = null;
}
- if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList))
+ if (bll_EC_MergerSingleBLL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, m_EC_OrderBasicNew, m_EC_AcceptWayByOrder, m_EC_OrderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList, m_EC_MergerHoudaosList))
{
//JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
//btn_submit.Enabled = false;
--
Gitblit v1.9.1