送货费用

username@email.com

昨天 eb07d0be014b11568d4263b470d46b5cd427fe9b

送货费用

 CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs

@@ -101,6 +101,11 @@
        /// 取货电话
        /// </summary>
        public string FetchPhoneNum { get; set; }

        /// <summary>
        /// 收货联系人
        /// </summary>
        public decimal? SonghuoJine { get; set; }
        #endregion Model

    }

 CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs

@@ -113,6 +113,12 @@
                this.FetchPhoneNum = isChange ? MyConvert.ConvertToString(value) : FetchPhoneNum;
                theValue = this.FetchPhoneNum;
            }
            else if ("SonghuoJine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
            {
                this.SonghuoJine = isChange ? MyConvert.ConvertToDecimal(value) : SonghuoJine;
                theValue = this.SonghuoJine;
            }
            
            return theValue;
        }
        #endregion

 CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs

@@ -652,6 +652,11 @@
        /// </summary>
        public string Shejicountneiyename { get; set; }

        /// <summary>
        /// 送货金额
        /// </summary>
        public decimal? SonghuoJine { get; set; }

        #endregion

        #region Visiter
@@ -1190,6 +1195,12 @@
                this.Shejicountneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye;
                theValue = this.Shejicountneiye;
            }
            else if ("SonghuoJine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 122)
            {
                this.SonghuoJine = isChange ? MyConvert.ConvertToDecimal(value) : this.SonghuoJine;
                theValue = this.SonghuoJine;
            }
            

            #endregion


 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -1761,6 +1761,44 @@
            }
        }




        /// <summary>
        /// 修改订单送货金额
        /// </summary>
        /// <param name="orderOperate">订单操作</param>
        /// <returns></returns>
        internal bool UpdateOrderSonghuoJine(int OrderId,decimal? SonghuoJine)
        {
           
            
            _eC_OrderOperateDAL = null == _eC_OrderOperateDAL ? new EC_OrderOperateDAL(_dataBase) : _eC_OrderOperateDAL;
            try
            {

                bool isWin = false;
               

                IList<SqlParameter> sqlParms = new List<SqlParameter>()
                    {
                            new SqlParameter("@orderId",OrderId),
                            new SqlParameter("@SonghuoJine",SonghuoJine.HasValue?SonghuoJine.Value:0),
                            
                    };
                string sql = "Update [EC_OrderExtend] Set [SonghuoJine]=@SonghuoJine  where [Keyid] =@orderId ";

               
                    _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
   
                return true;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 根据新增订单操作，并修改订单状态
        /// </summary>
@@ -2626,7 +2664,8 @@
                        new SqlParameter(){ParameterName="@AppointCourierCompany",Value=awbInfo.AppointCourierCompany,SqlDbType=SqlDbType.VarChar,Size=50},
                        new SqlParameter(){ParameterName="@FetchAddress",Value=awbInfo.FetchAddress,SqlDbType=SqlDbType.VarChar,Size=200},
                        new SqlParameter(){ParameterName="@FetchContacts",Value=awbInfo.FetchContacts,SqlDbType=SqlDbType.VarChar,Size=50},
                        new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20}
                        new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20},
                         new SqlParameter(){ParameterName="@SonghuoJine",Value=awbInfo.SonghuoJine.HasValue?awbInfo.SonghuoJine.Value:0,SqlDbType=SqlDbType.Money}
                    };
                    _dataBase.Query("sp_EC_AwbInfo_DeliverPresswork", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
                    isWin = 1.Equals(sqlParms[0].Value);
@@ -2647,6 +2686,17 @@
                            return false;
                        else
                            ;

                        if(awbInfo.Operate.OperateType == 5)
                            isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, awbInfo.SonghuoJine);//修改订单状态
                        else
                        {
                            isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, 0);//修改订单状态
                        }
                        if (!isWin)
                            return false;
                        else
                            ;
                    }
                    else
                    {

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx

@@ -53,6 +53,7 @@
             <tr><td class="ali03">货运单号：</td><td colspan="3"><asp:TextBox ID="txtTheAwb" runat="server"></asp:TextBox></td></tr>
            <tr><td class="ali03">送货人：</td><td colspan="3"><asp:TextBox ID="txtDeliverPerson" runat="server"></asp:TextBox></td></tr>
            <tr><td class="ali03">送货时间：</td><td colspan="3"><asp:TextBox ID="txtDeliverTime" runat="server" CssClass="date req"></asp:TextBox></td></tr>
              <tr><td class="ali03">送货费用：</td><td colspan="3"> <input id='txtSonghuoJine' runat="server" maxlength='9' class='float' /></td></tr>
            <tr><td class="ali03">收货方式：</td><td colspan="3"><asp:DropDownList ID="ddlAcceptType" runat="server" keepdefaultstyle='true' ></asp:DropDownList></td></tr>
            <tr class="show1"><td class="ali03">货运公司：</td><td><asp:TextBox ID="txtAppointCourierCompany" runat="server" Width="257px"></asp:TextBox></td><td class="ali03">联系人：</td><td><asp:TextBox ID="txtFetchContacts" runat="server"></asp:TextBox></td></tr>
            <tr class="show1"><td class="ali03">取货地址：</td><td><asp:TextBox ID="txtFetchAddress" runat="server" Width="257px"></asp:TextBox></td><td class="ali03">联系人电话：</td><td><asp:TextBox ID="txtFetchPhoneNum" runat="server"></asp:TextBox></td></tr>

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs

@@ -63,6 +63,7 @@
                        this.txtDeliverPerson.Text = model.DeliverPerson;
                        if (model.DeliverTime.HasValue)
                            this.txtDeliverTime.Text = model.DeliverTime.Value.ToShortDateString();
                    this.txtSonghuoJine.Value = model.SonghuoJine.HasValue? model.SonghuoJine.Value.ToString("0.0000"):"0";
                        this.txtRemark.Text = model.Remark;
                        this.ddlAcceptType.SelectedValue = model.AcceptTypeId.ToString();
                        switch (model.AcceptTypeId)
@@ -141,7 +142,7 @@
                eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
                if (this.txtDeliverTime.Text != string.Empty)
                    eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();

                eC_AwbInfo.SonghuoJine = this.txtSonghuoJine.Value.ToDecimal2();
                eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
                switch (eC_AwbInfo.AcceptTypeId)
                {

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs

@@ -78,6 +78,15 @@
        protected global::System.Web.UI.WebControls.TextBox txtDeliverTime;

        /// <summary>
        /// txtSonghuoJine 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSonghuoJine;

        /// <summary>
        /// ddlAcceptType 控件。
        /// </summary>
        /// <remarks>

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx

@@ -491,6 +491,9 @@
                        <th width="26" menu_member_case_id="case_DeliverWork" menu_member_case_name="送货">
                            送货
                        </th>
                         <th width="26">
                            送货费用
                        </th>
                        <th width="26" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="撤单">
                            撤单
                        </th>
@@ -626,6 +629,9 @@
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"送货")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货")?"title='已送货'":"title='送货'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "√" : Eval("Shifoubiaohongsonghuo")%></span>
                                </td>
                                 <td>
                                    <%#Eval("SonghuoJine","{0:F}")%>
                                </td>
                                <td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="撤单">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"撤单")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "撤单")?"title='已撤单'":"title='撤单'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'撤单管理' })">
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "撤单") ? "√" : "撤单"%></span>

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs

@@ -882,6 +882,7 @@
                headerRow.CreateCell(12).SetCellValue("金额");
                headerRow.CreateCell(13).SetCellValue("已收款");
                headerRow.CreateCell(14).SetCellValue("未付款");
                headerRow.CreateCell(15).SetCellValue("送货金额");

                // 添加数据
                int rowIndex = 1;
@@ -903,6 +904,7 @@
                    row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
                    row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
                    row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
                    row.CreateCell(15).SetCellValue(order.SonghuoJine.HasValue ? order.SonghuoJine.Value.ToDouble2().Value : 0);


                }