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 |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 753bf2b..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;
@@ -856,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) //渚跨
                 {
@@ -1635,6 +1661,11 @@
                      {
                          if(model.PrintTypeId!=27)
                          afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+
+                        if (model.PrintTypeId == 39)
+                        {
+                            afterInfo.ParameterName = "鑳跺ご(" + model.pageNumsbs.ToString() + ")";
+                        }
                      }
                     if (afterInfo.ParameterName == "鑳跺乏")
                     {
@@ -1920,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