username@email.com
2025-11-12 e0c41d644ec4ec263bc299c0ceba9193ab435a15
20251111  设计订单需要看到设计要求和设计费的情况
3个文件已修改
322 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -137,6 +137,10 @@
            {
                _eC_OrderBasic.OrderExtend.NumPerBag = "";
            }
            if (_eC_OrderBasic.OrderExtend.BagNum == "NaN")
            {
                _eC_OrderBasic.OrderExtend.BagNum = "";
            }
            _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
            _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx
@@ -216,6 +216,216 @@
                             
                        </td>
                    </tr>
                      <tr <%#Eval("PrintTypeId").ToString() != "39" && Eval("PrintTypeId").ToString() != "-1"&& Eval("PrintTypeId").ToString() != "38"  ?"":"style=\"display:none;\"" %>  >
                           <td class='left'>
                            设计类型:
                        </td>
                        <td  >
                             <%#Eval("ShejileixingName")%>&nbsp;
                        </td>
                           <td class='left'>
                            <span <%#Eval("PrintTypeId").ToString() == "27" || Eval("PrintTypeId").ToString() == "21"|| Eval("PrintTypeId").ToString() == "7"|| Eval("PrintTypeId").ToString() == "20"|| Eval("PrintTypeId").ToString() == "16"|| Eval("PrintTypeId").ToString() == "22"|| Eval("PrintTypeId").ToString() == "23"|| Eval("PrintTypeId").ToString() == "25"|| Eval("PrintTypeId").ToString() == "26"?"style=\"display:none;\"":"" %>    >单双面:</span>
                        </td>
                        <td  >
                             <%#Eval("Danshuangmian")%>&nbsp;
                        </td>
                           <td class='left'>
                            设计人员:
                        </td>
                        <td  colspan="3" >
                             <%#Eval("ShejirenyuanName")%>&nbsp;
                        </td>
                          </tr>
                     <tr  <%#Eval("PrintTypeId").ToString() == "39" || Eval("PrintTypeId").ToString() == "-1" ?"":"style=\"display:none;\"" %> >
                           <td class='left'>
                            设计人员:
                        </td>
                        <td  colspan="7" >
                             <%#Eval("ShejirenyuanName")%>&nbsp;
                        </td>
                          </tr>
                     <tr>
                            <tr  <%#Eval("PrintTypeId").ToString() == "38" ?"":"style=\"display:none;\"" %> >
                           <td class='left'>
                            试卷照排:
                        </td>
                                <td class='left'>
                          <%#Eval("ShejirenyuanName")%>&nbsp;
                        </td>
                        <td  colspan="7" >
                              <%#Eval("ShejileixingName")%>P
                        </td>
                          </tr>
                     <tr>
                     <td class='left' >
                            设计要求:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label6" Text='<%#Eval("Shejiyaoqiu")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                           <tr  <%#Eval("PrintTypeId").ToString() == "38" ?"":"style=\"display:none;\"" %> >
                           <td class='left'>
                            答题卡照排:
                        </td>
                                <td class='left'>
                          <%#Eval("ShejirenyuanNameneiye")%>&nbsp;
                        </td>
                        <td  colspan="7" >
                              <%#Eval("ShejileixingNameneiye")%>科
                        </td>
                          </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "38" ?"":"style=\"display:none;\"" %>  >
                     <td class='left'  >
                            设计要求:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label1" Text='<%#Eval("Shejiyaoqiuneiye")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                    <tr <%#Eval("PrintTypeId").ToString() == "15"?"":"style=\"display:none;\"" %>  >
                           <td class='left'>
                            设计类型:
                        </td>
                        <td  >
                             <%#Eval("ShejileixingNameneiye")%>&nbsp;
                        </td>
                           <td class='left'>
                            内页设计:
                        </td>
                        <td  colspan="5" >
                             <%#Eval("ShejirenyuanNameneiye")%>&nbsp;
                        </td>
                          </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "15"?"":"style=\"display:none;\"" %>  >
                     <td class='left'>
                            设计要求:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label2" Text='<%#Eval("Shejiyaoqiuneiye")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6"?"":"style=\"display:none;\"" %>  >
                           <td class='left'>
                            设计类型1:
                        </td>
                        <td  >
                             <%#Eval("ShejileixingNameneiye")%>&nbsp;
                        </td>
                           <td class='left'>
                            内页设计1:
                        </td>
                        <td  colspan="5" >
                             <%#Eval("ShejirenyuanNameneiye")%>&nbsp;
                        </td>
                          </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6"?"":"style=\"display:none;\"" %>  >
                     <td class='left'>
                           设计要求1:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label3" Text='<%#Eval("Shejiyaoqiuneiye")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6" && neiyeshu  > 1 ?"":"style=\"display:none;\"" %>  >
                           <td class='left'>
                            设计类型2:
                        </td>
                        <td  >
                             <%#Eval("ShejileixingNameneiye1")%>&nbsp;
                        </td>
                           <td class='left'>
                            内页设计2:
                        </td>
                        <td  colspan="5" >
                             <%#Eval("ShejirenyuanNameneiye1")%>&nbsp;
                        </td>
                          </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6" && neiyeshu  > 1 ?"":"style=\"display:none;\"" %>  >
                     <td class='left'>
                           设计要求2:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label4" Text='<%#Eval("Shejiyaoqiuneiye1")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6" && neiyeshu  > 2 ?"":"style=\"display:none;\"" %>  >
                           <td class='left'>
                            设计类型3:
                        </td>
                        <td  >
                             <%#Eval("ShejileixingNameneiye2")%>&nbsp;
                        </td>
                           <td class='left'>
                            内页设计3:
                        </td>
                        <td  colspan="5" >
                             <%#Eval("ShejirenyuanNameneiye2")%>&nbsp;
                        </td>
                          </tr>
                     <tr <%#Eval("PrintTypeId").ToString() == "6" && neiyeshu  > 2 ?"":"style=\"display:none;\"" %>  >
                     <td class='left'>
                           设计要求3:
                        </td>
                        <td colspan='7'>
                           <asp:Label ID="Label5" Text='<%#Eval("Shejiyaoqiuneiye2")%>' runat="server" Width="650px"></asp:Label>
                        </td>
                     </tr>
                      <tr>
                          <td class='left'>
                            设计提成:
                        </td>
                        <td colspan="7">
                             <%#Eval("Shejiticheng")%>&nbsp;
                        </td>
                    </tr>
                </ItemTemplate>
            </asp:Repeater>
            <asp:Repeater ID='rptInquiryCommon' runat="server">
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderDeatil.aspx.cs
@@ -44,6 +44,8 @@
        Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
        public int ContractCount = 0;
        public string BuyerId = "";
        OA_StaffBLL bll_OA_StaffBLL = new OA_StaffBLL();
        public int neiyeshu = 1;
        /// <summary>
        /// 页面加载事件
        /// </summary>
@@ -106,8 +108,8 @@
                return false;
            }
            EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
            if (null == _eC_OrderBasic)
            EC_OrderBasic eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
            if (null == eC_OrderBasic)
            {
                CY.WebForm.BasePage.JavaScript.MessageBox("数据不存在!", this);
                return false;
@@ -125,8 +127,17 @@
                return false;
            }
            _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
            _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
            if (eC_OrderBasic.OrderExtend.NumPerBag == "NaN")
            {
                eC_OrderBasic.OrderExtend.NumPerBag = "";
            }
            if (eC_OrderBasic.OrderExtend.BagNum == "NaN")
            {
                eC_OrderBasic.OrderExtend.BagNum = "";
            }
            _eC_AcceptWayByOrder.NumPerBag = eC_OrderBasic.OrderExtend.NumPerBag;
            _eC_AcceptWayByOrder.BagNum = eC_OrderBasic.OrderExtend.BagNum;
            EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
@@ -150,15 +161,15 @@
            var sys_Dictionarie = _sys_DictionaryBLL.GetDataByType("印刷单位").FirstOrDefault(x=>x.MeanValue == _inquiryCommonModel.Unit);
            if (sys_Dictionarie != null)
            {
                _eC_OrderBasic.UnitName = sys_Dictionarie.Name;
                eC_OrderBasic.UnitName = sys_Dictionarie.Name;
            }
            BuyerId = _eC_OrderBasic.BuyerId.ToString();
            BuyerId = eC_OrderBasic.BuyerId.ToString();
            //查询客户是否有合同
            Database DC = new Database();
            try
            {
                string sqlStr = string.Format("select  count(*) from [dbo].[OA_CorporateClientContract] where CorporateClientsid='{0}'", _eC_OrderBasic.BuyerId);
                string sqlStr = string.Format("select  count(*) from [dbo].[OA_CorporateClientContract] where CorporateClientsid='{0}'", eC_OrderBasic.BuyerId);
                SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
                ContractCount = (int)myCmd.ExecuteScalar();
            }
@@ -174,15 +185,92 @@
            }
            rptOrder.DataSource = new List<EC_OrderBasic>() { _eC_OrderBasic };
            if (eC_OrderBasic.BusinessManagerId.HasValue && eC_OrderBasic.BusinessManagerId.Value > 0)
            {
                var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(eC_OrderBasic.BusinessManagerId);
                if (oA_Staff != null)
                {
                    eC_OrderBasic.BusinessManager = oA_Staff.Name;
                }
            }
            // PageAllMoney +=( eC_OrderBasic.ShejiSumPrice.Value + eC_OrderBasic.ShejiSumPriceneiye.Value);
            if (eC_OrderBasic.ShejiSumPrice.HasValue && eC_OrderBasic.ShejiSumPrice.Value > 0)
            {
                eC_OrderBasic.Shejiticheng = eC_OrderBasic.ShejirenyuanName + eC_OrderBasic.Shejicount + "*" + (eC_OrderBasic.ShejiUnitPrice.HasValue ? eC_OrderBasic.ShejiUnitPrice.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPrice.HasValue ? eC_OrderBasic.ShejiSumPrice.Value.ToString("G29") : "0");
            }
            if (eC_OrderBasic.PrintTypeId == 15 || eC_OrderBasic.PrintTypeId == 38)
            {
                if (eC_OrderBasic.ShejiSumPriceneiye.HasValue && eC_OrderBasic.ShejiSumPriceneiye.Value > 0)
                {
                    eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + (eC_OrderBasic.ShejiUnitPriceneiye.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye.HasValue ? eC_OrderBasic.ShejiSumPriceneiye.Value.ToString("G29") : "0");
                }
            }
            eC_OrderBasic.Shejicountneiyename = (eC_OrderBasic.Shejicountneiye.HasValue && eC_OrderBasic.Shejicountneiye.Value > 0) ? eC_OrderBasic.Shejicountneiye.Value.ToString() : "";
            if (eC_OrderBasic.PrintTypeId == 6)
            {
                if (eC_OrderBasic.ShejiSumPriceneiye.HasValue && eC_OrderBasic.ShejiSumPriceneiye.Value > 0)
                {
                    eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + (eC_OrderBasic.ShejiUnitPriceneiye.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye.HasValue ? eC_OrderBasic.ShejiSumPriceneiye.Value.ToString("G29") : "0");
                }
                if (!string.IsNullOrEmpty(eC_OrderBasic.ShejileixingNameneiye1))
                {
                    if (eC_OrderBasic.ShejiSumPriceneiye1.HasValue && eC_OrderBasic.ShejiSumPriceneiye1.Value > 0)
                    {
                        eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye1 + eC_OrderBasic.Shejicountneiye1 + "*" + (eC_OrderBasic.ShejiUnitPriceneiye1.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye1.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye1.HasValue ? eC_OrderBasic.ShejiSumPriceneiye1.Value.ToString("G29") : "0");
                    }
                }
                if (!string.IsNullOrEmpty(eC_OrderBasic.ShejileixingNameneiye2))
                {
                    if (eC_OrderBasic.ShejiSumPriceneiye2.HasValue && eC_OrderBasic.ShejiSumPriceneiye2.Value > 0)
                    {
                        eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye2 + eC_OrderBasic.Shejicountneiye2 + "*" + (eC_OrderBasic.ShejiUnitPriceneiye2.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye2.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye2.HasValue ? eC_OrderBasic.ShejiSumPriceneiye2.Value.ToString("G29") : "0");
                    }
                }
                int Shejicountneiyecount = 0;
                if (eC_OrderBasic.Shejicountneiye.HasValue)
                {
                    Shejicountneiyecount += eC_OrderBasic.Shejicountneiye.Value;
                }
                if (eC_OrderBasic.Shejicountneiye1.HasValue)
                {
                    Shejicountneiyecount += eC_OrderBasic.Shejicountneiye1.Value;
                }
                if (eC_OrderBasic.Shejicountneiye2.HasValue)
                {
                    Shejicountneiyecount += eC_OrderBasic.Shejicountneiye2.Value;
                }
                eC_OrderBasic.Shejicountneiyename = Shejicountneiyecount.ToString();
            }
            if(eC_OrderBasic.PrintTypeId == 6)
            {
                if (_inquiryCommonModel.InquiryInsideList != null)
                {
                    neiyeshu = _inquiryCommonModel.InquiryInsideList.Count;
                }
            }
            rptOrder.DataSource = new List<EC_OrderBasic>() { eC_OrderBasic };
            rptOrder.DataBind();
            rptAccpteWay.DataSource = "自提".Equals(_inquiryCommonModel.DeliveryModeName) ? null : new List<EC_AcceptWayByOrder>() { _eC_AcceptWayByOrder };
            rptAccpteWay.DataBind();
            rptInquiryCommon.DataSource = new List<InquiryCommonModel>() { _inquiryCommonModel };
            rptInquiryCommon.DataBind();
            this.lblRemark.Text = _eC_OrderBasic.Remark;
            this.lblPrintPackDeliveryRequir.Text = _eC_OrderBasic.PrintPackDeliveryRequir;
            this.lblRemark.Text = eC_OrderBasic.Remark;
            this.lblPrintPackDeliveryRequir.Text = eC_OrderBasic.PrintPackDeliveryRequir;
            return true;
        }