edit

BizCom/Dao/CeErpPackData.cs

@@ -0,0 +1,118 @@
+using Castle.ActiveRecord;
+using NHibernate.Criterion;
+using System;
+using System.Text;
+
+namespace BizCom
+{
+    [ActiveRecord("CE_ErpPackData")]
+    public class CeErpPackData : ComBase<CeErpPackData>
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [PrimaryKey(PrimaryKeyType.Native)]
+        public int ID { get; set; }
+
+        private string _fileName = "";
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        [Property]
+        public string fileName
+        {
+            get { return _fileName; }
+            set { _fileName = value; }
+        }
+
+        private int _downNum = 0;
+
+        /// <summary>
+        /// 下载次数
+        /// </summary>
+        [Property]
+        public int downNum
+        {
+            get { return _downNum; }
+            set { _downNum = value; }
+        }
+
+        private int _upStatus = 0;
+        /// <summary>
+        /// 状态 0待打包 1打包中 2打包完成 3打包失败 4取消
+        /// </summary>
+        [Property]
+        public int upStatus
+        {
+            get { return _upStatus; }
+            set { _upStatus = value; }
+        }
+
+        private string _fileUrl = "";
+        /// <summary>
+        /// 文件地址
+        /// </summary>
+        [Property]
+        public string fileUrl
+        {
+            get { return _fileUrl; }
+            set { _fileUrl = value; }
+        }
+
+        private int _supplierId = 0;
+        /// <summary>
+        /// 车间ID
+        /// </summary>
+        [Property]
+        public int supplierId
+        {
+            get { return _supplierId; }
+            set { _supplierId = value; }
+        }
+
+        private DateTime _createtime = DateTime.Now;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Property]
+        public DateTime createtime
+        {
+            get { return _createtime; }
+            set { _createtime = value; }
+        }
+
+        private int _createBy = 0;
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Property]
+        public int createBy
+        {
+            get { return _createBy; }
+            set { _createBy = value; }
+        }
+        private string _createName = "";
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Property]
+        public string createName
+        {
+            set { _createName = value; }
+            get { return _createName; }
+        }
+
+        private string _message = "";
+        /// <summary>
+        /// 信息
+        /// </summary>
+        [Property]
+        public string message
+        {
+            get { return _message; }
+            set { _message = value; }
+        }
+
+    }
+}

BizCom/Dao/CeErpPackDataItem.cs

@@ -0,0 +1,53 @@
+using Castle.ActiveRecord;
+using NHibernate.Criterion;
+using System;
+using System.Text;
+
+namespace BizCom
+{
+    [ActiveRecord("CE_ErpPackDataItem")]
+    public class CeErpPackDataItem : ComBase<CeErpPackDataItem>
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [PrimaryKey(PrimaryKeyType.Native)]
+        public int ID { get; set; }
+
+        private string _ctid = "";
+        /// <summary>
+        /// ¶©µ¥
+        /// </summary>
+        [Property]
+        public string ctid
+        {
+            get { return _ctid; }
+            set { _ctid = value; }
+        }
+
+        private int _packId = 0;
+
+        /// <summary>
+        /// ÏÂÔØ´ÎÊý
+        /// </summary>
+        [Property]
+        public int packId
+        {
+            get { return _packId; }
+            set { _packId = value; }
+        }
+
+        private string _message = "";
+        /// <summary>
+        /// ÐÅÏ¢
+        /// </summary>
+        [Property]
+        public string message
+        {
+            get { return _message; }
+            set { _message = value; }
+        }
+
+    }
+}

SiteCore/Handler/noti.cs

@@ -663,6 +663,7 @@ namespace SiteCore.Handler
                                             entity.DesignUserId = 3542;
                                             entity.WaitDesignTime = DateTime.Now;
                                             entity.DispatchSort = 2;
+                                            entity.UpdateTime = DateTime.Now;
                                             entity.Update();
 
                                         }

SiteCore/Handler/sync.order.cs

@@ -954,7 +954,7 @@ namespace SiteCore.Handler
                     //    }
                     //}
                     //}
-
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     returnSuccessMsg("保存成功！");
                     LogHelper.addLog(entity.ctid, CurrentUser.UserID, "额外：" + entity.OtherMemo, entity.OrderState);
@@ -975,6 +975,7 @@ namespace SiteCore.Handler
                 if (ctid != "") entity = CeErpTradeCell.GetByCtid(ctid);
                 if (entity != null)
                 {
+                    entity.UpdateTime = DateTime.Now;
                     entity.CustomerMemo = GetPostString("CustomerMemo");
                     entity.Update();
                     ApiVo apiVo = new ApiVo();
@@ -12846,6 +12847,11 @@ namespace SiteCore.Handler
                     {
                         ceErpTradeCellExtend.ToType = "外协";
                     }
+                    if ("外协".Equals(ceErpTradeCellExtend.ToType))
+                    {
+                        string sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ctid + "';";
+                        CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
+                    }
                 }
                 if (ceErpTradeCellExtend.ID == 0)
                 {
@@ -13348,6 +13354,61 @@ namespace SiteCore.Handler
                 return;
             }
         }
+
+        public void packOrderInfo()
+        {
+            string ctids = GetPostString("ctids");
+            if (!string.IsNullOrEmpty(ctids))
+            {
+                string[] ctid_list = ctids.Split(',');
+                if (ctid_list.Length > 20)
+                {
+                    returnErrorMsg("单次下载次数不能超过20个");
+                    return;
+                }
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("select ctid,OrderState,SupplierId from CE_ErpTradeCell where ctid in ({0})", "'" + ctids.Replace(",", "','") + "'");
+                DataTable dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                int supplierId = 0;
+                StringBuilder insterSql = new StringBuilder();
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    DataRow row = dt.Rows[i];
+                    if (i == 0)
+                    {
+                        supplierId = Convert.ToInt32(row["SupplierId"]);
+                    }
+                    if (supplierId > 0 && supplierId != Convert.ToInt32(row["SupplierId"]))
+                    {
+                        returnErrorMsg("同车间的订单才能一起打包");
+                        return;
+                    }
+                    int orderState = Convert.ToInt32(row["OrderState"]);
+                    if (orderState != 5)
+                    {
+                        returnErrorMsg(row["ctid"].ToString() + "订单状态不对无法打包。");
+                        return;
+                    }
+                    insterSql.AppendLine("INSERT INTO [CE_ErpPackDataItem] ([ctid], [packId]) VALUES ( '" + row["ctid"].ToString() + "', {0});");
+                }
+                CeErpPackData ceErpPackData = new CeErpPackData();
+                ceErpPackData.fileName = supplierId + "LT_" + DateTime.Now.ToString("yyyyMMddhhMmss") + ".zip";
+                ceErpPackData.supplierId = supplierId;
+                ceErpPackData.createtime = DateTime.Now;
+                ceErpPackData.createBy = CurrentUser.UserID;
+                ceErpPackData.createName = CurrentUser.UserName;
+                ceErpPackData.Create();
+
+                if (ceErpPackData.ID > 0)
+                {
+                    string inSql = string.Format(insterSql.ToString(), ceErpPackData.ID);
+                    DbHelper.DbConn.ExecuteNonQuery(inSql);
+                }
+                returnSuccessMsg("打包成功");
+                return;
+            }
+            returnErrorMsg("缺少必要的参数");
+        }
     }
 
 }

SiteCore/taobao/apiDesign.cs

@@ -603,6 +603,7 @@ namespace SiteCore.Handler
                         if (ceErpTradeCell != null)
                         {
                             ceErpTradeCell.OrderState = orderState;
+                            ceErpTradeCell.UpdateTime = DateTime.Now;
                             LogHelper.addLog(tid, userId, con, orderState);
                             return;
                         }
@@ -667,6 +668,7 @@ namespace SiteCore.Handler
                             ceErpTradeCell.WaitDesignTime = DateTime.Now;
                             ceErpTradeCell.StartDesignTime = DateTime.Now;
                         }
+                        ceErpTradeCell.UpdateTime = DateTime.Now;
                         ceErpTradeCell.Update();
                         LogHelper.addLog(ceErpTradeCell.ctid, 3542, "接口请求：" + orderState, ceErpTradeCell.OrderState);
                         commonHelper.UpdateRelationOrder(tid);
@@ -765,6 +767,7 @@ namespace SiteCore.Handler
                 entity.IsReturn = 2;
                 entity.ReturnTime = DateTime.Now;
                 entity.ReturnReason = content;
+                entity.UpdateTime = DateTime.Now;
                 entity.Update();
                 LogHelper.addLog(entity.ctid, 3542, "接口打回：" + content, entity.OrderState);
                 returnSuccessMsg("保存成功!");
@@ -849,6 +852,7 @@ namespace SiteCore.Handler
                     apiVo.actionName = "afterOver";
                     designHelper.API_WorkCore(apiVo);     //afterOver
                 }
+                entity.UpdateTime = DateTime.Now;
                 entity.Update();
                 returnSuccessMsg("操作成功！");
                 CeErpSukuraData.createInfo(entity.ctid, 8);

SiteCore/taobao/commonHelper.cs

@@ -1851,6 +1851,8 @@ namespace SiteCore
                 {
                     if ("外协".Equals(ceErpTradeCellExtend.ToType))
                     {
+                        string sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ctid + "';";
+                        CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
                         return new designApiResponseVo(200, "");
                     }
                     if ("内部".Equals(ceErpTradeCellExtend.ToType))
@@ -2723,7 +2725,11 @@ namespace SiteCore
                         {
                             ceErpTradeCellExtend.ToType = "外协";
                         }
-
+                        if ("外协".Equals(ceErpTradeCellExtend.ToType))
+                        {
+                            string sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ceErpTradeCellExtend.ctid + "';";
+                            CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
+                        }
                     }
 
                     if (ceErpTradeCellExtend.ID == 0)

SiteCore/taobao/preSalesHelper.cs

@@ -118,7 +118,7 @@ namespace SiteCore.Handler
 
 
                     entity.IsUrgency = true;
-
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     ApiVo apiVo = new ApiVo();
                     apiVo.orderNumber = entity.ctid;
@@ -233,6 +233,7 @@ namespace SiteCore.Handler
                     entity.AfterSaleState = 1; //1待售后2售后主管审核3主管审核4完成售后
                     //entity.AfterSaleReason = reason;
                     entity.AfterSaleTime = DateTime.Now;
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "售前标记售后-" + reason, entity.OrderState, 1);
                     returnSuccessMsg("转售后成功！");
@@ -281,6 +282,7 @@ namespace SiteCore.Handler
                     entity.DesignUserId = fentity.DesignUserId;
                     entity.seller_memo = "补差价单:" + ftid;
                     entity.IsSample = 2;
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "手动关联补差价", entity.OrderState, 1);
                     returnSuccessMsg("关联成功！");
@@ -308,7 +310,7 @@ namespace SiteCore.Handler
                 {
 
                     entity.CustomerUserId = customerUserId;
-
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     returnSuccessMsg("操作成功！");
                     LogHelper.addLog(entity.ctid, userid, "转单给其他客服" + userid, entity.OrderState);
@@ -383,6 +385,7 @@ namespace SiteCore.Handler
                 if (entity != null)
                 {
                     entity.wechatTag = 0;
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     CeErpStayGoods pers = CeErpStayGoods.GetByTid(entity.tid);
                     if (pers != null)
@@ -478,6 +481,7 @@ namespace SiteCore.Handler
                 if (entity != null)
                 {
                     entity.IsPreDelivery = 1;
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "预发货", entity.OrderState);
                     returnSuccessMsg("预发货成功！");
@@ -643,6 +647,7 @@ namespace SiteCore.Handler
                         entity.DesignUserId = userid;
                         entity.OrderState = 3;
                         entity.WaitDesignTime = DateTime.Now;
+                        entity.UpdateTime = DateTime.Now;
                         entity.Update();
                         string name = commonHelper.getUserNameById(userid);
                         commonHelper.UpdateRelationOrder(entity.ctid);
@@ -719,6 +724,7 @@ namespace SiteCore.Handler
                     if (entity != null)
                     {
                         entity.IsRefund = 0;
+                        entity.UpdateTime = DateTime.Now;
                         entity.Update();
                         LogHelper.addLog(ctid, UserID, name + "清除退款状态", 0, 1);
                     }
@@ -885,6 +891,7 @@ namespace SiteCore.Handler
                     apiVo.actionName = "orderRemarks";
                     apiVo.orderRemarks = entity.seller_memo;
                     designHelper.API_WorkCore(apiVo);//changeDesign/orderRemarks
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "：" + sfTagMSg + "--" + entity.seller_memo, entity.OrderState, 1);
                     returnSuccessMsg("标记成功！");
@@ -1063,6 +1070,7 @@ namespace SiteCore.Handler
                         returnErrorMsg("请勿重复标记");
                         return;
                     }
+                    entity.UpdateTime = DateTime.Now;
                     entity.IsSendGift = 1;
                     entity.Update();
                     LogHelper.addLog(eid, UserID, name + "送小礼物");
@@ -1106,7 +1114,7 @@ namespace SiteCore.Handler
                     {
                         entity.IsAddWechat = 1;
                     }
-
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "标记已添加微信", entity.OrderState, 1);
                     returnSuccessMsg("标记成功！");
@@ -1186,6 +1194,7 @@ namespace SiteCore.Handler
                             apiVo.actionName = "afterOver";
                             designHelper.API_WorkCore(apiVo);     //afterOver
                         }
+                        entity.UpdateTime = DateTime.Now;
                         entity.Update();
                         returnSuccessMsg("操作成功！");
                         LogHelper.addLog(entity.ctid, UserID, "责任人" + (st == 1 ? "认可" : ("不认可," + afmemo)), 0, 3);
@@ -1258,7 +1267,7 @@ namespace SiteCore.Handler
                                 ceErpTradeAfterSaleExtend.Create();
                             }
                         }
-
+                        entity.UpdateTime = DateTime.Now;
                         entity.Update();
                         returnSuccessMsg("操作成功！");
                         LogHelper.addLog(entity.ctid, UserID, "责任主管" + (st == 1 ? "认可" : ("不认可," + afmemo)), 0, 3);
@@ -1401,6 +1410,7 @@ namespace SiteCore.Handler
                         }
                     }
                     entity.MemoOpt = 3;
+                    entity.UpdateTime = DateTime.Now;
                     entity.CheckOrderTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "标记：查货", entity.OrderState, 1);
@@ -1434,6 +1444,7 @@ namespace SiteCore.Handler
                         stropt = "“定稿”";
                     }
                     entity.MemoOpt = memoopt;
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     LogHelper.addLog(entity.ctid, UserID, name + "标记：" + stropt, entity.OrderState, 1);
                     returnSuccessMsg("操作成功！");
@@ -1456,6 +1467,7 @@ namespace SiteCore.Handler
                 if (entity != null)
                 {
                     entity.OtherMemo = GetPostString("otherMemo");
+                    entity.UpdateTime = DateTime.Now;
                     entity.Update();
                     returnSuccessMsg("保存成功！");
                     LogHelper.addLog(entity.ctid, UserID, name + "额外：" + entity.OtherMemo, entity.OrderState);
@@ -1911,7 +1923,11 @@ namespace SiteCore.Handler
                         {
                             ceErpTradeCellExtend.ToType = "外协";
                         }
-
+                        if ("外协".Equals(ceErpTradeCellExtend.ToType))
+                        {
+                            string sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ceErpTradeCellExtend.ctid + "';";
+                            CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
+                        }
                     }
                     ceErpTradeCellExtend.Create();
                 }

SiteCore/taobao/tmcHelper.cs

@@ -1030,7 +1030,7 @@ namespace SiteCore
                 }
 
             }
-
+            CeErpTradeCell.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set UpdateTime = getdate() where tid = '{0}'", tObj.refOid));
             if (tObj.sellerMemo == "物料")
             {
                 entity.seller_memo = "(" + trade.tid + ")-物料";

Web/EDelivery/SupplierOrder.aspx

@@ -5,10 +5,11 @@
     <script type="text/javascript" src="js/SupplierOrder.js?v=<%=SiteVer %>"></script>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="btn" runat="Server">
-       <table style="width: 100%;">
+    <table style="width: 100%;">
         <tr>
             <td style="width: 80%;">
                 <a class="mini-button mini-button-primary" style="padding: 2px 5px 2px 5px;" iconcls="icon-download" onclick="multiExport()">批量下载</a>
+                <a id="packBtn" runat="server" visible="false" class="mini-button mini-button-primary" style="padding: 2px 5px 2px 5px;" iconcls="icon-download" onclick="packOrder()">打包</a>
                 <%--<a class="mini-button mini-button-primary" style="padding: 2px 5px 2px 5px;" iconcls="icon-folder" onclick="returnOrderFn()">退单</a>--%>
             </td>
         </tr>

Web/EDelivery/SupplierOrder.aspx.cs

@@ -1,4 +1,5 @@
-using SiteCore;
+using Org.BouncyCastle.Bcpg;
+using SiteCore;
 using SQLData;
 using System;
 using System.Collections.Generic;
@@ -25,6 +26,11 @@ public partial class EDelivery_SupplierOrder : BasePage
 
     protected void Page_Load(object sender, EventArgs e)
     {
+        if (CurrentUser.UserPost.Post.Code == "Supplier")
+        {
+            packBtn.Visible = false;
+        }
+        else { packBtn.Visible = true; }
         if (!IsPostBack)
         {
             //StringBuilder sql = new StringBuilder();

Web/EDelivery/js/SupplierOrder.js

@@ -383,3 +383,19 @@ function verifyOrderFn(tids) {
     });
 
 }
+
+function packOrder() {
+    let sels = grid.getSelecteds();
+    if (sels.length > 0) {
+        let ctids = [];
+        for (var i = 0; i < sels.length; i++) {
+            ctids.push(sels[i].ctid);
+        }
+        postAjax("packOrderInfo", { ctids: ctids.join(",") }, function (data) {
+            progressHide();
+            resultShow(data, "grid.reload();");
+        });
+    } else {
+        mini.alert("请选择要下载的记录！");
+    }
+}

Web/Global.asax

@@ -113,6 +113,8 @@
                                  typeof(CeErpTradeSpu),
                                  typeof(CeErpSukuraData),
                                  typeof(CeErpDeliverMark),
+                                 typeof(CeErpPackData),
+                                 typeof(CeErpPackDataItem),
                                  typeof(CeErpDataSendOrderInfo)
 
                              };