修改售后跟单逻辑、修改申请打回退单逻辑

BizCom/Dao/CeErpTradeCell.cs

@@ -139,7 +139,7 @@ namespace BizCom
 
         private int _isReturn = 0;
         /// <summary>
-        ///打回类型1供应商打回2下单打回3申请打回
+        ///打回类型1供应商打回2下单打回3售后打回4申请打回
         /// </summary>
         [Property]
         public int IsReturn

SiteCore/Handler/sync.order.cs

@@ -4414,24 +4414,6 @@ namespace SiteCore.Handler
                             }
                         }
                     }
-                    /*if (isNeedUpdateCell2)
-                    {
-                        if (entity.MakeSupplier.IndexOf(",") != -1)
-                        {
-                            StringBuilder sql2 = new StringBuilder();
-                            sql2.AppendFormat("update ce_erptradecell2 WITH(ROWLOCK) set BackState='已打回',ReturnReason='{0}',IsReturn={2} where ID in (select top 2 ID from ce_erptradecell2 where ctid='{1}' order by ID desc) ", entity.ReturnReason, entity.ctid, returnTag);
-                            DbHelper.DbConn.ExecuteNonQuery(sql2.ToString());
-                        }
-                        else
-                        {
-                            StringBuilder sql2 = new StringBuilder();
-                            sql2.AppendFormat("update ce_erptradecell2 WITH(ROWLOCK) set BackState='已打回',ReturnReason='{0}',IsReturn={2} where ID in (select top 1 ID from ce_erptradecell2 where ctid='{1}' order by ID desc)", entity.ReturnReason, entity.ctid, returnTag);
-                            DbHelper.DbConn.ExecuteNonQuery(sql2.ToString());
-                        }
-                    }*/
-
-
-
                     returnSuccessMsg("操作成功！");
                     return;
                 }
@@ -7602,6 +7584,7 @@ namespace SiteCore.Handler
                             newentity.OutSid = "";
                             newentity.CheckOrderTime = null;
                             newentity.MemoOpt = 0;
+                            newentity.IsReturn = 0;
                             LogHelper.addLog(newentity.ctid, CurrentUser.UserID, "售后处理生成：" + newMemo, entity.OrderState, 1);
                         }
                         newentity.isAfterSaleOrder = 1;
@@ -14834,7 +14817,7 @@ namespace SiteCore.Handler
             }
             else if (CurrentUser.UserPost.Post.Code == "Place" || CurrentUser.UserPost.Post.Code == "PlaceMr")
             {
-
+                lw.Add("OrderState in (5,6) ");
             }
 
             lw.Add(string.Format("IsReturn = 4"));
@@ -14896,6 +14879,161 @@ namespace SiteCore.Handler
             returnErrorMsg("缺少必要的参数");
         }
 
+        public void passApplyBack()
+        {
+            if (UrlPostParmsCheck("ctid"))
+            {
+                string eid = GetPostString("ctid");
+                CeErpTradeCell entity = null;
+                if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
+                string userpost = CurrentUser.UserPost.Post.Code;
+                if (entity != null)
+                {
+                    string message = "操作成功！";
+                    string isDown = "";
+
+                    if (entity.OrderState == 6 || entity.IsHaveNewOrder == 2)
+                    {
+                        message = "订单有被点击下载。请注意沟通是否已下载完！";
+                        isDown = "被点击下载";
+                    }
+                    bool isPlace = false;
+                    if (entity.OrderState > 6)
+                    {
+                        returnErrorMsg("已发货无法打回！");
+                        return;
+                    }
+                    if (entity.OrderState == 6)
+                    {
+                        isPlace = true;
+                    }
+                    bool isNeedUpdateCell2 = false;
+                    if (entity.OrderState >= 6)
+                    {
+                        isNeedUpdateCell2 = true;
+                    }
+                    int returnTag = 2;
+                    if (userpost == "Supplier")
+                    {
+                        returnTag = 1;
+                    }
+
+                    int toType = GetPostInt("totype");
+                    string fromType = "3";
+                    if (entity.OrderState < 5)
+                    {
+                        fromType = "3";
+                    }
+                    else
+                    {
+                        fromType = "4";
+                    }
+                    if (entity.IsXianHuo == 0)
+                    {
+                        if (returnTag == 2)
+                        {
+                            if (toType == 1)
+                            {
+                                entity.OrderState = 0;
+                                entity.ReturnUserType = 1;
+                                string clearman = GetPostString("clearman");
+                                if (!string.IsNullOrEmpty(clearman))
+                                {
+                                    entity.DesignUserId = 0;
+                                }
+                            }
+                            else
+                            {
+                                entity.OrderState = 3;
+                                entity.ReturnUserType = 2;
+                            }
+
+                            entity.IsReadTag = 1;
+                        }
+                        else if (returnTag == 1)
+                        {
+                            entity.OrderState = 5;
+                        }
+                        entity.IsVerifyToSupplier = false;
+                    }
+                    if (entity.IsXianHuo == 1)
+                    {
+                        entity.OrderState = 5;
+                    }
+
+                    entity.IsVerifyToSupplier = false;
+                    entity.IsHaveNewOrder = 0;
+
+                    entity.UnusualTag = 0;
+                    entity.UnusualTime = null;
+                    entity.UnusualCon = "";
+                    entity.IsReturn = returnTag;
+                    entity.ReturnTime = DateTime.Now;
+                    entity.UpdateTime = DateTime.Now;
+                    entity.ReturnReason = GetPostString("returnreason");
+                    entity.Update();
+                    if (entity.OrderState == 3)
+                    {
+                        ApiVo apiVo = new ApiVo();
+                        apiVo.orderNumber = entity.ctid;
+                        apiVo.actionName = "rebutDesign";
+                        apiVo.orderRemarks = entity.ReturnReason;
+                        designHelper.API_WorkCore(apiVo);//rebutDesign
+                    }
+
+                    LogHelper.addLog(entity.ctid, CurrentUser.UserID, "退单：" + entity.ReturnReason + isDown, entity.OrderState);
+                    if (isPlace)
+                    {
+                        string sql = string.Format("select * from view_dataSendOrderInfo where ctid='{0}'", entity.ctid);
+                        DataTable dth = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                        if (dth != null && dth.Rows.Count > 0)
+                        {
+                            dataSendOrderBean dataSendOrderBean = null;
+                            foreach (DataRow item in dth.Rows)
+                            {
+                                try
+                                {
+                                    dataSendOrderBean = new dataSendOrderBean();
+                                    dataSendOrderBean.Date1723191218572 = item["pay_time"].ToString();
+                                    dataSendOrderBean.RelevanceForm1723191634028 = item["SupplierId"].ToString();
+                                    dataSendOrderBean.RelevanceForm1723191239149 = item["ShopId"].ToString();
+                                    dataSendOrderBean.Date1723193880305 = item["FinishDeliveryTime"].ToString();
+                                    dataSendOrderBean.Date1723193870660 = item["FinishPlaceTime"].ToString();
+                                    dataSendOrderBean.LongText1723542734262 = item["seller_memo"].ToString();
+                                    dataSendOrderBean.ShortText1723542735637 = item["OtherMemo"].ToString();
+                                    dataSendOrderBean.ShortText1723542736542 = item["address"].ToString();
+                                    dataSendOrderBean.ShortText1723193907492 = item["OutSid"].ToString();
+                                    dataSendOrderBean.Number1723193919446 = item["payment_cyt"].ToString();
+                                    dataSendOrderBean.ShortText1723707899761 = item["ctid"].ToString();
+                                    dataSendOrderBean.Radio1723534706288 = "打回";
+                                    dataResponseVo result = dataHelper.CreateBoFahuo(dataSendOrderBean);
+                                    if (result != null)
+                                    {
+                                        if ("0".Equals(result.errcode))
+                                        {
+                                            CeErpDataSendOrderInfo.updateAsync(item["ctid"].ToString(), JsonConvert.SerializeObject(dataSendOrderBean));
+                                        }
+                                        else
+                                        {
+                                            CeErpDataSendOrderInfo.updateError(item["ctid"].ToString(), result.errmsg, JsonConvert.SerializeObject(dataSendOrderBean));
+                                        }
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                }
+
+                            }
+                        }
+                    }
+                    returnSuccessMsg(message);
+                    return;
+                }
+
+                returnErrorMsg("找不到订单记录");
+            }
+        }
+
         public void getApplyBackCount()
         {
             string sql = string.Format("SELECT top 1 ctid FROM [dbo].[CE_ErpTradeCell]");

SiteCore/Handler/sync.orderReport.cs

@@ -1578,113 +1578,29 @@ namespace SiteCore.Handler
             }
             DateTime firstDay = commonHelper.FirstDayOfMonth(Convert.ToDateTime(date1));
             DateTime lastDay = commonHelper.LastDayOfMonth(Convert.ToDateTime(date1));
-            //if (date1.Length > 0 && DateTime.Now.ToShortDateString() != Convert.ToDateTime(date1).ToShortDateString())
-            //{
-            //    string orgStr = "";
-
-            //    if (org.Length > 0)
-            //    {
-            //        orgStr = " and OrgId=" + org;
-            //    }
-
-            //    StringBuilder sql = new StringBuilder();
-            //    sql.AppendFormat("select * from view_ErpDesignerFinishRate where datediff(day,'{0}',CTime)>=0  and datediff(day,'{1}',CTime)<=0" + orgStr, date1, date2);
-            //    DataTable dataDt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
-            //    DataTable dt = new DataTable();
-            //    dt.Columns.Add(new DataColumn("DesignerName", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("Amount", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("WaitDesign", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("Designing", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("DesignFinish", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("FinalizationRate", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("PayPrice", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("AvgRate", typeof(string)));
-            //    dt.Columns.Add(new DataColumn("Ctime", typeof(string)));
-            //    DataRow dr_he = dt.NewRow();
-            //    dr_he[0] = "合计";
-            //    dr_he[1] = 0;
-            //    dr_he[2] = 0;
-            //    dr_he[3] = 0;
-            //    dr_he[4] = 0;
-            //    dr_he[5] = 0;
-            //    dr_he[6] = 0;
-            //    dr_he[7] = 0;
-            //    dr_he[8] = 0;
-            //    dr_he[9] = null;
-            //    foreach (DataRow onedes in dataDt.Rows)
-            //    {
-            //        DataRow dr = dt.NewRow();
-            //        dr[0] = onedes["Name"].ToString();
-            //        dr[1] = onedes["Amount"].ToString();
-            //        dr[2] = onedes["AllOrder"].ToString();
-            //        dr[3] = onedes["WaitDesign"].ToString();
-            //        dr[4] = onedes["Designing"].ToString();
-            //        dr[5] = onedes["DesignFinish"].ToString();
-            //        dr[9] = onedes["CTime"].ToString();
-            //        decimal rate = 0;
-            //        if (onedes["AllOrder"].ToString() != "0")
-            //        {
-            //            rate = (decimal)(Convert.ToDecimal(onedes["DesignFinish"]) / Convert.ToDecimal(onedes["AllOrder"]));
-            //        }
-
-
-            //        dr_he[1] = Convert.ToDecimal(dr_he[1]) + Convert.ToDecimal(onedes["Amount"]);
-            //        dr_he[2] = Convert.ToDecimal(dr_he[2]) + Convert.ToDecimal(onedes["AllOrder"]);
-            //        dr_he[3] = Convert.ToDecimal(dr_he[3]) + Convert.ToDecimal(onedes["WaitDesign"]);
-            //        dr_he[4] = Convert.ToDecimal(dr_he[4]) + Convert.ToDecimal(onedes["Designing"]);
-            //        dr_he[5] = Convert.ToDecimal(dr_he[5]) + Convert.ToDecimal(onedes["DesignFinish"]);
-            //        dr_he[6] = Convert.ToDecimal(dr_he[6]) + Convert.ToDecimal(brate);
-            //        dr_he[7] = Convert.ToDecimal(dr_he[7]) + Convert.ToDecimal(payPrice);
-            //        dr_he[8] = Convert.ToDecimal(dr_he[8]) + Convert.ToDecimal(needPjDg);
-            //    }
-            //    dt.Rows.Add(dr_he);
-            //    DataView dv = new DataView(dt);
-            //    //dv.Sort = "AllOrder desc";
-            //    DataTable dtNew = dv.ToTable();
-            //    writeGridDataTableJson(dtNew.Rows.Count, dtNew);
-            //}
-            //else
-            //{
-            if (date1.Length <= 0) date1 = DateTime.Now.Date.ToString();
-            if (date2.Length <= 0) date2 = DateTime.Now.Date.ToString();
-            SqlParameter[] sqlParameter ={
-                        new SqlParameter("@sDisDate", SqlDbType.DateTime, 20),
-                        new SqlParameter("@eDisDate", SqlDbType.DateTime, 20),
-                        new SqlParameter("@res", SqlDbType.VarChar, 4000)
-                };
-            sqlParameter[0].Value = date1;
-            sqlParameter[1].Value = date2;
-            sqlParameter[2].Direction = ParameterDirection.Output;
 
-            //CeErpTradeCell.ExecuteNonQueryStore("sp_getdesigngather", sqlParameter);
-            DbHelper.DbConn.ExecuteNonQuery(CommandType.StoredProcedure, "sp_getplacegather", sqlParameter);
-            string res = sqlParameter[2].Value.ToString();
+            string sql = string.Format("SELECT COUNT ( * ) AS allorder, PlaceUserName  FROM view_ErpTradeCell WHERE FinishPlaceTime BETWEEN '{0}' AND '{1}' GROUP BY PlaceUserName", firstDay, lastDay);
+
+            DataTable dataTable = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
             DataTable dt = new DataTable();
             dt.Columns.Add(new DataColumn("DesignerName", typeof(string)));
             dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
-            string[] desList = res.Split('|');
-            foreach (string onedes in desList)
+            foreach (DataRow row in dataTable.Rows)
             {
-                if (onedes.Length > 0)
-                {
-                    string[] vlList = onedes.Split(',');
-                    DataRow dr = dt.NewRow();
-                    dr[0] = vlList[0];
-                    dr[1] = vlList[1];
-                    dt.Rows.Add(dr);
-                    dr_he[1] = Convert.ToDecimal(dr_he[1]) + Convert.ToDecimal(vlList[1]);
-                }
+
+                DataRow dr = dt.NewRow();
+                dr[0] = row["PlaceUserName"];
+                dr[1] = row["allorder"];
+                dt.Rows.Add(dr);
+                dr_he[1] = Convert.ToDecimal(dr_he[1]) + Convert.ToDecimal(dr[1]);
             }
             dt.Rows.Add(dr_he);
             DataView dv = new DataView(dt);
-            //dv.Sort = "AllOrder desc";
             DataTable dtNew = dv.ToTable();
             writeGridDataTableJson(dtNew.Rows.Count, dtNew);
-            //}
         }
 
 
@@ -2789,7 +2705,8 @@ namespace SiteCore.Handler
             DataTable dtNew = dv.ToTable();
             writeGridDataTableJson(dtNew.Rows.Count, dtNew);
 
-        }public void get_erp_aftersale_sup_product_gather()
+        }
+        public void get_erp_aftersale_sup_product_gather()
         {
             string date1 = GetPostString("date1");
             string date2 = GetPostString("date2");

SiteCore/taobao/commonHelper.cs

@@ -213,11 +213,13 @@ namespace SiteCore
                         ceErpTradeAfterSaleExtend = new CeErpTradeAfterSaleExtend();
                         ceErpTradeAfterSaleExtend.tid = tradeCtid;
                         ceErpTradeAfterSaleExtend.ExpressNo = cpCode + "-" + curUseWayBillCode;
+                        ceErpTradeAfterSaleExtend.AfterSalSend = 1;
                         ceErpTradeAfterSaleExtend.Create();
                     }
                     else
                     {
                         ceErpTradeAfterSaleExtend.ExpressNo = cpCode + "-" + curUseWayBillCode;
+                        ceErpTradeAfterSaleExtend.AfterSalSend = 1;
                         ceErpTradeAfterSaleExtend.Update();
                     }
                 }

Web/EDelivery/ApplyBack.aspx

@@ -58,6 +58,24 @@
             </tr>
         </table>
     </div>
+    <div id="returnsupplierreason_win" class="mini-window" title="退单" style="width: 700px; height: 400px; position: relative; display: none">
+        <input type="hidden" id="returnsupplierreason_id" />
+        <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+            <tr>
+                <td class="td1">原因</td>
+                <td class="td2" colspan="3">
+                    <textarea id="txtReturnSupplierreason" style="width: 96%; height: 60px;"></textarea></td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="saveReturnSupplierReasonFn">保存</a>&nbsp;
+                    <a class="mini-button" iconcls="icon-cancel" onclick="cancelReturnSupplierReason">取消</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
 
     <script> 
         function orderStatusRenderer(e) {
@@ -148,14 +166,28 @@
         }
         function agreeSupplierOrder(e) {
             var rec = rec = grid.getSelected();
-            $("#returnreason_id").val(e);
-            $("#selectTar").hide();
-            mini.get("returnreason_win").show();
+            $("#returnsupplierreason_id").val(e);
+            mini.get("returnsupplierreason_win").show();
+        }
+
+        function cancelReturnSupplierReason() {
+            mini.get("returnsupplierreason_win").hide()
+        }
+        function saveReturnSupplierReasonFn() {
+            let parms = {};
+            parms.ctid = $("#returnsupplierreason_id").val();
+            parms.returnreason = $("#txtReturnSupplierreason").val();
+
+            postAjax("ins_erp_returnreason", parms, function (data) {
+                $("#txtReturnSupplierreason").val("");
+                mini.get("returnsupplierreason_win").hide();
+                resultShow(data, "grid.reload();");
+            });
         }
+
         function agreeOrder(e) {
             var rec = rec = grid.getSelected();
             $("#returnreason_id").val(e);
-            $("#selectTar").show();
             mini.get("returnreason_win").show();
         }
 
@@ -163,19 +195,24 @@
             mini.get("returnreason_win").hide()
         }
 
+
+
         function saveReturnreasonFn() {
             let parms = {};
             parms.ctid = $("#returnreason_id").val();
             parms.returnreason = $("#txtReturnreason").val();
-            if (userPostCode != "Supplier") {
-                parms.totype = $("#selectTar select option:selected").val();
-            }
-            postAjax("ins_erp_returnreason", parms, function (data) {
+            parms.totype = $("#selectTar select option:selected").val();
+            postAjax("passApplyBack", parms, function (data) {
                 if ($("#selectReturnreason").is(':visible')) {
                     mini.get("selectReturnreason").setValue("");
                 }
                 $("#txtReturnreason").val("");
                 mini.get("returnreason_win").hide();
+                if (data != "操作成功！") {
+                    mini.confirm(data, "确定？",
+                        function (action) { }
+                    )
+                };
                 resultShow(data, "grid.reload();");
             });
         }

Web/js/index.js

@@ -7,6 +7,7 @@ var intervalTime = 50 * 1000;  //间隔时间
 var afterSaleVerifyIdx = 0;   //售后责任人剩余12 6小时 提醒
 var intervalAftersale = 360;
 var isTipedAfterSale = 0; //是否提示过售后审核
+let messageBoxId = null;
 
 function activeTab(item) {
     var tabs = mini.get("mainTabs");
@@ -190,6 +191,12 @@ function getMyTipOrder() {
             isTipedAfterSale = 0;
             afterSaleVerifyIdx = 0;
         }
+        if (mini.get(messageBoxId)) {
+            setTimeout(function () {
+                getMyTipOrder();
+            }, intervalTime);
+            return;
+        }
         //tip-content提示
         postAjax("get_erp_my_tiporder", "af=" + isTipedAfterSale, function (data) {
             var toOrderState = 0;
@@ -204,7 +211,8 @@ function getMyTipOrder() {
                             ids += ",";
                         }*/
                         ids = data[0]["ctid"];
-                        mini.showMessageBox({
+
+                        messageBoxId = mini.showMessageBox({
                             title: "提示",
                             iconCls: "mini-messagebox-question",
                             buttons: ["前往处理"],
@@ -214,9 +222,6 @@ function getMyTipOrder() {
                                     goToCheckOrder(ids);
 
                                 }
-                                setTimeout(function () {
-                                    getMyTipOrder();
-                                }, 3 * 60000);
                             }
                         });
                     } else {
@@ -236,7 +241,7 @@ function getMyTipOrder() {
                         }
                         if (tStr.length <= 0) return;
                         tStr += "  请及时查看处理！！";
-                        mini.showMessageBox({
+                        messageBoxId = mini.showMessageBox({
                             title: "提示",
                             iconCls: "mini-messagebox-question",
                             buttons: ["前往处理", "稍后提醒"],
@@ -249,9 +254,6 @@ function getMyTipOrder() {
                                 else if (action == "稍后提醒") {
                                     laterTipIdx = 30;
                                 }
-                                setTimeout(function () {
-                                    getMyTipOrder();
-                                }, intervalTime);
                             }
                         });
                     }
@@ -282,7 +284,7 @@ function getMyTipOrder() {
                     }
                     if (tStr.length <= 0) return;
                     tStr += "  请及时查看处理！！";
-                    mini.showMessageBox({
+                    messageBoxId = mini.showMessageBox({
                         title: "提示",
                         iconCls: "mini-messagebox-question",
                         buttons: ["前往处理", "稍后提醒"],
@@ -297,29 +299,17 @@ function getMyTipOrder() {
                                 laterTipIdx = 30;
 
                             }
-                            setTimeout(function () {
-                                getMyTipOrder();
-                            }, intervalTime);
                         }
                     });
                 }
             }
-            else {
-                setTimeout(function () {
-                    getMyTipOrder();
-                }, intervalTime);
-            }
-        }, function (data) { }, false);
-
-        postAjax("back_supplier_audit", "", function (data) {
-
         }, function (data) { }, false);
 
         //线下单审核订单
         postAjax("verified_to_order", "", function (data) {
 
             if (data.length > 0) {
-                mini.showMessageBox({
+                messageBoxId = mini.showMessageBox({
                     title: "提示",
                     iconCls: "mini-messagebox-question",
                     buttons: ["我知道了"],
@@ -363,7 +353,7 @@ function getMyTipOrder() {
         postAjax("change_order_info", "", function (data) {
             if (data.length > 0) {
                 let item = data[0];
-                mini.showMessageBox({
+                messageBoxId = mini.showMessageBox({
                     title: "提示",
                     iconCls: "mini-messagebox-question",
                     width: 700,
@@ -396,7 +386,7 @@ function getMyTipOrder() {
                     content += item.content;
                 })
                 if (content != "") {
-                    mini.showMessageBox({
+                    messageBoxId = mini.showMessageBox({
                         title: "提示",
                         iconCls: "mini-messagebox-question",
                         buttons: ["我知道了"],
@@ -414,7 +404,7 @@ function getMyTipOrder() {
             if (data.data == 0 || data.data.length == 0) {
                 return;
             }
-            mini.showMessageBox({
+            messageBoxId = mini.showMessageBox({
                 title: "提示",
                 iconCls: "mini-messagebox-question",
                 buttons: ["我知道了"],
@@ -432,10 +422,10 @@ function getMyTipOrder() {
             isTipedAfterSale = 0;
             afterSaleVerifyIdx = 0;
         }
-        setTimeout(function () {
-            getMyTipOrder();
-        }, intervalTime);
     }
+    setTimeout(function () {
+        getMyTipOrder();
+    }, intervalTime);
 }
 
 function goToHandleOrder(ids, toOrderState) {

ecomServer/MainForm.cs

@@ -364,8 +364,8 @@ namespace ErpServer
                                                     isAll = false;
                                                 }
                                             }
-                                            sql = "update CE_ErpTradeCell WITH(ROWLOCK) set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0  where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag='' and isAfterSaleOrder=0 ;";
-                                            sql += "update CE_ErpTradeCell WITH(ROWLOCK) set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0  where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag!='' and OrderState>6 and isAfterSaleOrder=0 ;";
+                                            sql = "update CE_ErpTradeCell WITH(ROWLOCK) set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0,FinishDeliveryTime = GETDATE()  where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag='' and isAfterSaleOrder=0 ;";
+                                            sql += "update CE_ErpTradeCell WITH(ROWLOCK) set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0,FinishDeliveryTime = GETDATE()  where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag!='' and OrderState>6 and isAfterSaleOrder=0 ;";
 
                                             if (isAll)
                                             {