From c4867cf5e5f78cfb924a3048bd0c4232d4a1e986 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 十二月 2024 08:33:44 +0800
Subject: [PATCH] 新增审批 付款申请 再付款申请中操作其他付款付款 生产管理里边点采购的供应商修改
---
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 242 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 235 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 08e6f35..b866916 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -117,6 +117,8 @@
int billMode = -1;
string remarks = string.Empty;
string paperMP = string.Empty;
+
+ string pageNumsbs = string.Empty;
int printBoxNumber = 0;
int printCountByBox = 0;
int cupType = 0;
@@ -187,6 +189,8 @@
remarks = request["remarks"].ToString();
if (request["pNameMP"] != null)
paperMP = request["pNameMP"].ToString();
+ if (request["pageNumsbs"] != null)
+ pageNumsbs = request["pageNumsbs"].ToString();
if (request["printBoxNumber"] != null)
printBoxNumber = request["printBoxNumber"].ToString().ToInt32().Value;
if (request["printCountByBox"] != null)
@@ -259,6 +263,7 @@
model.BillMode = billMode;
model.Remarks = remarks;
model.PaperMP = paperMP;
+ model.pageNumsbs = pageNumsbs;
model.PrintBoxNumber = printBoxNumber;
model.CupType = cupType;
model.PrintColor = printColor;
@@ -367,9 +372,11 @@
sizeName = paperSize.Name;
int index = sizeName.IndexOf('(');
sizeName = sizeName.Substring(0, index);
+ sizeName = "";
if (request["txtFirstSize"] != null && request["txtSecondSize"] != null)
{
- sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
+ sizeName += request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
+ //sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
model.firstSize = request["txtFirstSize"].ToString();
model.secondSize = request["txtSecondSize"].ToString();
}
@@ -491,9 +498,11 @@
sizeName = paperSize.Name;
int index = sizeName.IndexOf('(');
sizeName = sizeName.Substring(0, index);
+ sizeName = "";
if (request["txtFirstSize"] != null && request["txtSecondSize"] != null)
{
- sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
+ sizeName += request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
+ // sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
model.firstSize = request["txtFirstSize"].ToString();
model.secondSize = request["txtSecondSize"].ToString();
}
@@ -601,6 +610,185 @@
model.InquiryInsideList.SingleOrDefault<InquiryInsideModel>(p => p.InsideIndex == 1 && (p.PageNum += 4) == 1);
}
}
+ else if (model.PrintTypeId == 37) //涔﹀垔
+ {
+ int hidWorkBookPageNum = 0;
+ if (request["hidWorkBookPageNum"] != null)
+ hidWorkBookPageNum = request["hidWorkBookPageNum"].ToString().ToInt32().Value;
+ InquiryWorkBookModel inquiryWorkBookModel = null;
+ var workBookTypeBLL = new BLL.Inquiry.WorkBookTypeBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ var kaibens = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈紑鏈�");
+ var sys_Dictionaries = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ var fengmianzhizhang = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈢焊寮�");
+ var fengmianyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈠嵃鍒疯姹�");
+ var neixingzhizhang = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺焊寮�");
+ var neixingyaoqiu = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈唴鑺嵃鍒疯姹�");
+ for (int i = 0; i < hidWorkBookPageNum; i++)
+ {
+ if ( i != 0 )
+ {
+ printDemand += "锛� ";
+ }
+ printDemand += "浣滀笟鏈�" + +(i + 1);
+ inquiryWorkBookModel = new InquiryWorkBookModel();
+ if (request["WorkBookNamea" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookName = request["WorkBookNamea" + (i + 1)].ToString();
+
+ var workBookType = workBookTypeBLL.SelectModelByKey(int.Parse(inquiryWorkBookModel.WorkBookName));
+ if (workBookType != null)
+ {
+ inquiryWorkBookModel.WorkBookNameTxt = workBookType.PaperTypeName;
+ }
+ printDemand += "锛屽搧鍚嶏細" + inquiryWorkBookModel.WorkBookNameTxt + "";
+ }
+
+ if (request["WorkBookSizea" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookSize = request["WorkBookSizea" + (i + 1)].ToString();
+ if(inquiryWorkBookModel.WorkBookSize == "-1")
+ {
+ if (request["WorkBookFirstSizea" + (i + 1)] != null && request["WorkBookSecondSizea" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookSizeTxt = "(" + request["WorkBookFirstSizea" + (i + 1)].ToString() + "脳" + request["WorkBookSecondSizea" + (i + 1)].ToString() + ")";
+ inquiryWorkBookModel.WorkBookFirstSize = request["WorkBookFirstSizea" + (i + 1)].ToString();
+ inquiryWorkBookModel.WorkBookSecondSize = request["WorkBookSecondSizea" + (i + 1)].ToString();
+ }
+ }
+ else
+ {
+ var WorkBookSizeTxt = kaibens.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.WorkBookSize));
+ if (WorkBookSizeTxt != null)
+ {
+ inquiryWorkBookModel.WorkBookSizeTxt = WorkBookSizeTxt.Name;
+ }
+
+ }
+
+ if (i == 0)
+ {
+ model.firstSize = inquiryWorkBookModel.WorkBookFirstSize;
+ model.secondSize = inquiryWorkBookModel.WorkBookSecondSize;
+ model.PrintSizeName = inquiryWorkBookModel.WorkBookSizeTxt;
+ model.PrintSizeId = int.Parse(inquiryWorkBookModel.WorkBookSize);
+ }
+ printDemand += "锛屽紑鏈細" + inquiryWorkBookModel.WorkBookSizeTxt + "";
+ }
+
+ if (request["WorkBookCounta" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookCount = request["WorkBookCounta" + (i + 1)].ToString();
+ printDemand += "锛屾暟閲忥細" + inquiryWorkBookModel.WorkBookCount + "";
+ }
+
+ if (request["ysUnita" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.ysUnit = request["ysUnita" + (i + 1)].ToString();
+ var ysUnit = sys_Dictionaries.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.ysUnit));
+ if (ysUnit != null)
+ {
+ inquiryWorkBookModel.ysUnitTxt = ysUnit.Name;
+ }
+ if (i == 0)
+ {
+ model.Unit = int.Parse(inquiryWorkBookModel.ysUnit);
+ }
+ printDemand += "锛屽崟浣嶏細" + inquiryWorkBookModel.ysUnitTxt + "";
+ }
+ if (request["WorkBookPricea" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookPrice = request["WorkBookPricea" + (i + 1)].ToString();
+ printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
+ }
+
+ if (request["hidefengmiana" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.fengmian = request["hidefengmiana" + (i + 1)].ToString();
+
+ }
+ else
+ {
+ inquiryWorkBookModel.fengmian = "";
+ }
+
+ if (request["hideneiyea" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.neiye = request["hideneiyea" + (i + 1)].ToString();
+ }
+ else
+ {
+ inquiryWorkBookModel.neiye = "";
+ }
+
+ if (request["WorkBookMoneya" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookMoney = request["WorkBookMoneya" + (i + 1)].ToString();
+ printDemand += "锛岄噾棰濓細" + inquiryWorkBookModel.WorkBookMoney + "";
+ }
+ if (request["WorkBookFengMiana" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookFengMian = request["WorkBookFengMiana" + (i + 1)].ToString();
+ if (inquiryWorkBookModel.WorkBookFengMian == "-1")
+ {
+ if (request["ZiWorkBookFengMiana" + (i + 1)] != null )
+ {
+ inquiryWorkBookModel.WorkBookFengMianTxt = request["ZiWorkBookFengMiana" + (i + 1)].ToString();
+ inquiryWorkBookModel.ZiWorkBookFengMian = request["ZiWorkBookFengMiana" + (i + 1)].ToString();
+ }
+ }
+ else
+ {
+ var WorkBookFengMian = fengmianzhizhang.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.WorkBookFengMian));
+ if (WorkBookFengMian != null)
+ {
+ inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
+ }
+ }
+ printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
+ }
+
+ if (request["FengMianYaoqiua" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.FengMianYaoqiu = request["FengMianYaoqiua" + (i + 1)].ToString();
+ var FengMianYaoqiu = fengmianyaoqiu.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.FengMianYaoqiu));
+ if (FengMianYaoqiu != null)
+ {
+ inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
+ }
+ printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
+ }
+
+ if (request["WorkBookNeiXinga" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookNeiXing = request["WorkBookNeiXinga" + (i + 1)].ToString();
+ var WorkBookNeiXing = neixingzhizhang.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.WorkBookNeiXing));
+ if (WorkBookNeiXing != null)
+ {
+ inquiryWorkBookModel.WorkBookNeiXingTxt = WorkBookNeiXing.Name;
+ }
+ printDemand += "锛屽唴鑺焊寮狅細" + inquiryWorkBookModel.WorkBookNeiXingTxt + "";
+ }
+
+ if (request["NeiXingYaoqiua" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.NeiXingYaoqiu = request["NeiXingYaoqiua" + (i + 1)].ToString();
+ var NeiXingYaoqiu = neixingyaoqiu.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.NeiXingYaoqiu));
+ if (NeiXingYaoqiu != null)
+ {
+ inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
+ }
+ printDemand += "锛屽嵃鍒疯姹傦細" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
+ }
+
+ if (request["WorkBookpageNuma" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.WorkBookpageNum = request["WorkBookpageNuma" + (i + 1)].ToString();
+ printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
+ }
+ model.InquiryWorkBookList.Add(inquiryWorkBookModel);
+ }
+ }
else if (model.PrintTypeId == 31) //骞垮憡绾告澂
{
MultipleTypeInfoBLL _multipleTypeInfoBLL = new MultipleTypeInfoBLL();
@@ -673,6 +861,27 @@
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor;
+ }
+ else if (model.PrintTypeId == 39) //鍏枃绾�
+ {
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ var fengmianzhizhangs = _sys_DictionaryBLL.GetDataByType("鍏枃绾哥焊寮�").FirstOrDefault(x => x.MeanValue == model.PaperId);
+ model.PrintCountName = model.PrintCount.ToString();
+
+ if (model.PrintSizeId != -1)
+ {
+ SysInquiry_PaperSizeDetail paperSize = _paperSizeDetailBLL.GetPaperSizeDetail(model.PrintTypeId, model.PrintSizeId);
+ printDemand = paperSize.Name + "锛�";
+ model.PrintSizeName = paperSize.Name;
+ }
+ if (fengmianzhizhangs != null)
+ {
+ printDemand += fengmianzhizhangs.Name + "锛�";
+ }
+
+
+ printDemand += model.PrintColor;
}
else if (model.PrintTypeId == 22) //渚跨
{
@@ -945,9 +1154,10 @@
sizeName = paperSize.Name;
int index = sizeName.IndexOf('(');
sizeName = sizeName.Substring(0, index);
+ sizeName = "";
if (request["txtFirstSize"] != null && request["txtSecondSize"] != null)
{
- sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
+ sizeName += request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();// "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
model.firstSize = request["txtFirstSize"].ToString();
model.secondSize = request["txtSecondSize"].ToString();
}
@@ -1047,9 +1257,11 @@
sizeName = paperSize.Name;
int index = sizeName.IndexOf('(');
sizeName = sizeName.Substring(0, index);
+ sizeName = "";
if (request["txtFirstSize"] != null && request["txtSecondSize"] != null)
{
- sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
+ sizeName += request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
+ //sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
model.firstSize = request["txtFirstSize"].ToString();
model.secondSize = request["txtSecondSize"].ToString();
}
@@ -1148,9 +1360,11 @@
sizeName = paperSize.Name;
int index = sizeName.IndexOf('(');
sizeName = sizeName.Substring(0, index);
+ sizeName = "";
if (request["txtFirstSize"] != null && request["txtSecondSize"] != null)
{
- sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
+ sizeName += request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
+ //sizeName += "(" + request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString() + ")";
model.firstSize = request["txtFirstSize"].ToString();
model.secondSize = request["txtSecondSize"].ToString();
}
@@ -1262,7 +1476,7 @@
printDemand += model.Shape;
}
//鍒ゆ柇灏哄
- if (request["hidOrderId"].ToInt32() >= 0)
+ if (request["hidOrderId"].ToInt32() >= 0 && model.PrintTypeId != 37)
{
if (model.PrintSizeId ==-1)
{
@@ -1447,6 +1661,11 @@
{
if(model.PrintTypeId!=27)
afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+
+ if (model.PrintTypeId == 39)
+ {
+ afterInfo.ParameterName = "鑳跺ご(" + model.pageNumsbs.ToString() + ")";
+ }
}
if (afterInfo.ParameterName == "鑳跺乏")
{
@@ -1615,6 +1834,7 @@
if (Request["PaperSelect"] != null)
{
+ string PaperSelect = Request["PaperSelect"].ToString();
int printTypeId = Request["PrinttypeId"].ToString().ToInt32().Value;
int paperId=Request["PaperId"].ToString().ToInt32().Value;
IList<SysInquiry_BrandInfo> brandList = _paperInfoBLL.GetBrandInfoByPaper(paperId);
@@ -1731,7 +1951,15 @@
newSize = new SysInquiry_PaperSizeDetail();
newSize.KeyId = size.KeyId;
int index=size.Name.IndexOf('(');
- newSize.Name = size.Name.Substring(0, index);
+ if (index >= 0)
+ {
+ newSize.Name = size.Name.Substring(0, index);
+ }
+ else
+ {
+ newSize.Name = size.Name;
+ }
+
tempList = newSizeList.Where(p => p.Name == newSize.Name).ToList<SysInquiry_PaperSizeDetail>();
if (tempList == null || tempList.Count == 0)
{
--
Gitblit v1.9.1