username@email.com
2025-11-06 91630884d699f90a8dec5348c2124468dc6f5324
很多修改
19个文件已修改
219 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -249,6 +249,17 @@
        /// <summary>
        /// 根据编号获取设计订单信息
        /// </summary>
        /// <param name="orderId">订单唯一编号</param>
        /// <returns></returns>
        public EC_OrderBasic SelectModelByxiadanId(int orderId)
        {
            return _eC_OrderBasicDAL.SelectModelByxiadanId(orderId);
        }
        /// <summary>
        /// 根据编号获取订单信息
        /// </summary>
        /// <param name="orderId">订单唯一编号</param>
@@ -591,9 +602,9 @@
        /// </summary>
        /// <param name="orderId"></param>
        /// <returns></returns>
        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator, int XiadanKeyid)
        {
            return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator);
            return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator, XiadanKeyid);
        }
        /// <summary>
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -151,6 +151,14 @@
        /// <returns></returns>
        EC_OrderBasic SelectModelById(int orderId);
        /// <summary>
        /// 根据编号获取订单信息
        /// </summary>
        /// <param name="orderId">订单唯一编号</param>
        /// <returns></returns>
        EC_OrderBasic SelectModelByxiadanId(int orderId);
        /// <summary>
        /// 根据订单编号获取订单 
        /// </summary>
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
@@ -44,7 +44,7 @@
        /// <param name="SurplusPrintNum"></param>
        /// <param name="Operator"></param>
        /// <returns></returns>
        bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator);
        bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator, int XiadanKeyid);
        /// <summary>
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -542,6 +542,15 @@
        }
        /// <summary>
        /// 设计订单下单返回XiadanKeyid
        /// </summary>
        public int? XiadanKeyid
        {
            get;
            set;
        }
        /// <summary>
        /// 是否结算 `1是2否
        /// </summary>
        public int? shifoujiesuan
@@ -1423,6 +1432,12 @@
                this.shifoujiesuan = isChange ? MyConvert.ConvertToInt32(value) : this.shifoujiesuan;
                theValue = this.shifoujiesuan;
            }
            else if ("XiadanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 142)
            {
                this.XiadanKeyid = isChange ? MyConvert.ConvertToInt32(value) : this.XiadanKeyid;
                theValue = this.XiadanKeyid;
            }
            #endregion
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -261,6 +261,15 @@
        }
        /// <summary>
        /// 设计订单下单返回XiadanKeyid
        /// </summary>
        public int? XiadanKeyid
        {
            get;
            set;
        }
        /// <summary>
        /// 是否结算 `1是2否
        /// </summary>
        public int? shifoujiesuan
@@ -949,6 +958,12 @@
                theValue = this.shifoujiesuan;
            }
            else if ("XiadanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 94)
            {
                this.XiadanKeyid = isChange ? MyConvert.ConvertToInt32(value) : this.XiadanKeyid;
                theValue = this.XiadanKeyid;
            }
            #endregion
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1747,6 +1747,46 @@
        /// <summary>
        /// 根据编号获取订单信息
        /// </summary>
        /// <param name="orderId">订单唯一编号</param>
        /// <returns></returns>
        public EC_OrderBasic SelectModelByxiadanId(int orderId)
        {
            if (0 >= orderId)
            {
                return null;
            }
            else
            {
            }
            string condition = "  ";
            if (orderId > 0)
            {
                condition = " b.[XiadanKeyid]=" + orderId + "";
            }
            else
            {
                return null;
            }
            try
            {
                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("a.*", " EC_OrderBasic a inner join   [EC_OrderExtend] b on a.[Keyid] = b.[Keyid] ", condition) as IList<EC_OrderBasic>;//执行查询
                return (null == result || result.Count == 0) ? null : result[0];//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        /// <summary>
        /// 根据订单编号获取订单 
        /// </summary>
        /// <param name="orderIds">订单编号</param>
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -476,12 +476,12 @@
        /// <param name="SurplusPrintNum"></param>
        /// <param name="Operator"></param>
        /// <returns></returns>
        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
        public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator, int XiadanKeyid)
        {
            try
            {
                var sqlStr = "UPDATE [EC_OrderExtend] SET [ShejiStatus]="+ ShejiStatus + "  WHERE Keyid=@Keyid ";
                var sqlStr = "UPDATE [EC_OrderExtend] SET [ShejiStatus]="+ ShejiStatus + " ,[XiadanKeyid]=" + XiadanKeyid + "  WHERE Keyid=@Keyid ";
                SqlParameter par = new SqlParameter("@Keyid", Keyid);
                _dataBase.ExecuteSql(sqlStr, par);
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs
@@ -81,7 +81,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
            if (string.IsNullOrEmpty(biaotou))
            {
                foreach (var inquiryWorkBookModel  in inquiryWorkBookModels)
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx
@@ -69,6 +69,21 @@
                });
            }
        }
        var reg222 = /^-[1-9]\d*|[0-9]/;
        $(".validateIntfushu").live("blur",
            function () {
                var defaultPrice = $(this).attr("defaultValue");
                var price = $(this).val();
                if (!reg222.test(price)) {
                    alertMsg("设置的值必须为整数");
                    //                        $(this).focus();
                    $(this).val(defaultPrice);
                }
            }
        );
        $(function () {
            $(".AlreadyReply").remove();
        });
@@ -131,7 +146,7 @@
                                未送货数量
                            </th>
                             <th style="text-align: center">
                                新增发货
                                发货数量(可负数)
                            </th>
                        </tr>
                </HeaderTemplate>
@@ -163,7 +178,7 @@
                           <%#Eval("weisonghuonums")%> 
                        </td>
                          <td style="text-align: center">
                          <input type="text"   name="fahuoCount"    style="height: 15px; line-height: 15px; width:80px;" class="validateInt req" defaultValue="0" value="0"/>
                          <input type="text"   name="fahuoCount"    style="height: 15px; line-height: 15px; width:80px;" class="validateIntfushu req" defaultValue="0" value="0"/>
                        </td>
                    </tr>
                </ItemTemplate>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -93,7 +93,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);
            var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
@@ -206,7 +206,7 @@
                for (int i = 0; i < fahuos.Length; i++)
                {
                    var fahuo = fahuos[i].ToInt32();
                    if (fahuo.HasValue && fahuo.Value > 0)
                    if (fahuo.HasValue && fahuo.Value != 0)
                    {
                        yanzheng = true;
                    }
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -44,7 +44,7 @@
        }
        //新增发货
        function onViewXinzengsonghuo(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "新增发货", Width: 1500, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "新增修改发货", Width: 1500, Height: 900 });
        }
        //库存盘点
        function onViewKucunpandian(keyid) {
@@ -221,7 +221,7 @@
                            <span   onclick="onDele('<%#Eval("Keyid")%>')">打印送货单</span>
                             <span   onclick="onViewCarInsurance('<%#Eval("Keyid")%>')">查看送货情况</span>
                             <span  menu_member_case_id="case_Xinzengsonghuo" menu_member_case_name="新增发货 "   onclick="onViewXinzengsonghuo('<%#Eval("Keyid")%>')">新增发货 </span>
                             <span  menu_member_case_id="case_Xinzengsonghuo" menu_member_case_name="新增修改发货 "   onclick="onViewXinzengsonghuo('<%#Eval("Keyid")%>')">新增修改发货 </span>
                             <span   menu_member_case_id="case_Kucunpandian" menu_member_case_name="库存盘点"  onclick="onViewKucunpandian('<%#Eval("Keyid")%>')">库存盘点</span>
                             <span   onclick="onViewfahuo('<%#Eval("Keyid")%>')">查看发货情况</span>
                           
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
@@ -94,7 +94,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);
            var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
@@ -141,7 +141,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);
            if (string.IsNullOrEmpty(biaotou))
            {
                int i = 1;
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -98,7 +98,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
          
            if (string.IsNullOrEmpty(biaotou))
            {
@@ -121,9 +121,16 @@
                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                if((nums - LessNumber - Number) > 0)
                {
                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }
                else
                {
                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }
                biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
            }
@@ -143,11 +150,19 @@
                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number)  + " </span></td>";
                        if(cmsPlanOrderItem.nums - LessNumber - Number > 0)
                        {
                            coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                        }
                        else
                        {
                            coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                        }
                    }
                    else
                    {
                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >0</span></td> ";
                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >0</span></td> ";
                    }
                   
                }
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -98,7 +98,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
          
            if (string.IsNullOrEmpty(biaotou))
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -46,6 +46,16 @@
            var t = (screen.availHeight - 300) / 2;
            window.open("/Pages/business/DeliverPlanWentiOrder.aspx?Orderid="+orderid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
        }
        //查看设计订单
        function Toshejiorder(orderid) {
            var l = (screen.availWidth - 500) / 2;
            var t = (screen.availHeight - 300) / 2;
            window.open("/Pages/business/ShejiOrderDeatil.aspx?orderId=" + orderid, '_blank', 'height=850,width=800,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
        }
        $(function () {
            $("#btnPrint").click(function () {
@@ -72,6 +82,7 @@
<%--                            <span onclick="onViewuplod('<%=BuyerId %>')"   <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>  >查看合同 </span>--%>
                            <input type="button"    <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>   value="查看合同" onclick="onViewuplod('<%=BuyerId %>')">&nbsp;&nbsp;&nbsp;
                             <input type="button"     value="问题反馈" onclick="ToAddorder('<%=OrderId %>')">
                            <input type="button"  <%=(string.IsNullOrEmpty(shejidingdanid))?"style=\"display:none;\"":"" %>   value="设计订单" onclick="Toshejiorder('<%=OrderId %>')">
                        </td>
                    </tr>
             </table>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -45,6 +45,7 @@
        public int ContractCount = 0;
        public string BuyerId = "";
        public int OrderId = 0;
        public string shejidingdanid = "";
        /// <summary>
        /// 页面加载事件
        /// </summary>
@@ -113,6 +114,13 @@
                CY.WebForm.BasePage.JavaScript.MessageBox("数据不存在!", this);
                return false;
            }
            EC_OrderBasic shejiorder = _eC_OrderBasicBLL.SelectModelByxiadanId(orderId.Value);
            if (shejiorder != null)
            {
                shejidingdanid = shejiorder.Keyid.ToString();
            }
            //if (CurrentUser.MemberId!=Guid.Parse(UtilConst.AdminFirmId)&&_eC_OrderBasic.BuyerId != CurrentUser.MemberId && _eC_OrderBasic.SellerId != CurrentUser.MemberId)
            //{
            //    CY.WebForm.BasePage.JavaScript.MessageBox("数据不存在!", this);
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs
@@ -573,22 +573,43 @@
                    }
                }
               // PageAllMoney +=( eC_OrderBasic.ShejiSumPrice.Value + eC_OrderBasic.ShejiSumPriceneiye.Value);
                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.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)
                {
                    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(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)
                {
                    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 (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))
                    {
                        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 (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))
                    {
                        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");
                        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");
                        }
                    }
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderxiadan.aspx.cs
@@ -58,10 +58,10 @@
                        //开始下单
                        foreach (var eC_OrderBasic in eC_OrderBasics)
                        {
                            var resul = _eC_OrderBasicBLL.UpShejiStatus(eC_OrderBasic.Keyid.Value, 1, CurrentUser.ShortName);
                            var ssssss = eC_OrderBasic.Keyid.Value;
                            if (resul)
                            {
                                var eC_OrderExtend = _eC_OrderBasicBLL.GetModelByKeyid(eC_OrderBasic.Keyid.Value);
                                eC_OrderExtend.ShejiStatus = eC_OrderBasic.Keyid.Value;
                                var acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(eC_OrderBasic.Keyid.Value);
@@ -78,7 +78,9 @@
                                var eC_OrderPrint = new EC_OrderPrintParameter();
                                eC_OrderPrint.PrintParameter = eC_OrderBasic.PrintParameter;
                                bool isWin = eC_OrderBLL.NewOrderpiliang(eC_OrderBasic, eC_OrderExtend, pay_TradingSingle, acceptWayByOrder, null, 0, 0, eC_OrderPrint);
                            }
                            var resul = _eC_OrderBasicBLL.UpShejiStatus(ssssss, 1, CurrentUser.ShortName, eC_OrderBasic.Keyid.Value);
                        }