edit

SiteCore/Handler/sync.order.cs

@@ -778,6 +778,15 @@ namespace SiteCore.Handler
                                 returnErrorMsg("无法修改备注，设计稿已使用原备注，修改后下载文件会无法对应");
                                 return;
                             }
+                            /*if (CurrentUser.UserPost.Post.Code != "Place")
+                            {
+                                CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
+                                if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
+                                {
+                                    returnErrorMsg("售前系统订单无法再此修改！");
+                                    return;
+                                }
+                            }*/
                         }
 
 
@@ -13492,7 +13501,7 @@ namespace SiteCore.Handler
             {
                 int eid = GetPostInt("eid");
                 CeErpSupplierProductTime ceErpSupplierProductTime = CeErpSupplierProductTime.Get(eid);
-                
+
                 if (ceErpSupplierProductTime == null)
                 {
                     ceErpSupplierProductTime = new CeErpSupplierProductTime();

SiteCore/taobao/commonHelper.cs

@@ -97,17 +97,23 @@ namespace SiteCore
                 }
                 else
                 {
+                    DateTime date = DateTime.Parse(dr["VerifyTime"].ToString());
+
                     if (type == 2)
                     {
-                        DateTime date = DateTime.Parse(dr["VerifyTime"].ToString());
                         if (DateTime.Compare(DateTime.Now, date.AddHours(96)) <= 0)
                         {
                             continue;
                         }
                     }
-
+                    //车间自动审核
                     if (state == "0")
                     {
+                        //节假日120小时
+                        if (DateTime.Compare(DateTime.Now, date.AddHours(120)) <= 0)
+                        {
+                            continue;
+                        }
                         CeErpTradeResponsible ceErpTradeResponsible = CeErpTradeResponsible.GetById(dr["ID"].ToString());
                         if (ceErpTradeResponsible != null)
                         {

SiteCore/taobao/preSalesHelper.cs

@@ -2346,6 +2346,7 @@ namespace SiteCore.Handler
                 }
                 trade.Update();
             }
+            CeErpTradeCell.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set UpdateTime = getdate() where tid = '{0}'", trade.tid));
             try
             {
                 if (bizOrder.status == "CLOSE" || bizOrder.status == "CANCEL")

SiteCore/taobao/tmcHelper.cs

@@ -390,7 +390,7 @@ namespace SiteCore
 
         static List<string> postcodes = new List<string>()
         {
-           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo","SP","zhuosheng","aolifu","GQ"
+           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo","SP","zhuosheng","aolifu","GQ","yixi","guliang","haijiaoqi"
         };
 
         public static void Api_TmcTradeMsg(string res)

ecomServer/MainForm.cs

@@ -284,7 +284,7 @@ namespace ErpServer
                                 {
                                     case "updatestate_close":
                                         {
-                                            sql = "update CE_ErpTradeCell  set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0,isRefund=2 where tid='" + dr["ctid"] + "' and isAfterSaleOrder=0";
+                                            sql = "update CE_ErpTradeCell WITH(ROWLOCK) set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0,isRefund=2 where tid='" + dr["ctid"] + "' and isAfterSaleOrder=0";
                                             SqlHelper.ExecuteNonQuery(sql);
                                             break;
                                         }
@@ -293,15 +293,15 @@ namespace ErpServer
                                             //sql.AppendFormat("update ce_ErpTradeCell set OrderState={1},IsUrgency=0 where IsPreDelivery=0 and tid='{0}' and SplitTag='' and isAfterSaleOrder=0;", tObj.refOid, (int)OrderState.交易完成);
                                             //拆分单更新，只有下单完成的才更新成已发货已完成
                                             //sql.AppendFormat("update ce_ErpTradeCell set OrderState={1},IsUrgency=0 where IsPreDelivery=0 and tid='{0}' and SplitTag!='' and OrderState>5 and isAfterSaleOrder=0;", tObj.refOid, (int)OrderState.交易完成);
-                                            sql = "update CE_ErpTradeCell  set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0 where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag='' and isAfterSaleOrder=0 ;";
-                                            sql += "update CE_ErpTradeCell  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 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 ;";
                                             SqlHelper.ExecuteNonQuery(sql);
                                             break;
                                         }
                                     case "updatestate_shipped":
                                         {
-                                            sql = "update CE_ErpTradeCell  set OrderState=" + dr["orderstate"] + ",IsUrgency=0,isReturn=0  where tid='" + dr["ctid"] + "' and IsPreDelivery=0  and SplitTag='' and isAfterSaleOrder=0 ;";
-                                            sql += "update CE_ErpTradeCell  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  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 ;";
                                             SqlHelper.ExecuteNonQuery(sql);
                                             break;
                                         }
@@ -309,10 +309,10 @@ namespace ErpServer
                                         {
                                             if (Convert.ToInt32(dr["refundState"]) == 1)
                                             {
-                                                sql = "update CE_ErpTradeCell  set IsRefund=" + dr["refundState"] + ",IsReadTag=2  where isAfterSaleOrder=0 and tid='" + dr["ctid"] + "'";
+                                                sql = "update CE_ErpTradeCell WITH(ROWLOCK) set IsRefund=" + dr["refundState"] + ",IsReadTag=2  where isAfterSaleOrder=0 and tid='" + dr["ctid"] + "'";
                                             }
                                             else
-                                                sql = "update CE_ErpTradeCell  set IsRefund=" + dr["refundState"] + " where isAfterSaleOrder=0 and tid='" + dr["ctid"] + "'";
+                                                sql = "update CE_ErpTradeCell WITH(ROWLOCK) set IsRefund=" + dr["refundState"] + " where isAfterSaleOrder=0 and tid='" + dr["ctid"] + "'";
                                             SqlHelper.ExecuteNonQuery(sql);
                                             break;
                                         }
@@ -337,11 +337,11 @@ namespace ErpServer
                                             sqlParameter[1].Direction = ParameterDirection.Output;
                                             if (num == 30)
                                             {
-                                                SqlHelper.ExecuteNonQueryStore("sp_set_bucha_ctid", sqlParameter);
+                                                SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_set_bucha_ctid", sqlParameter, 10);
                                             }
                                             else
                                             {
-                                                SqlHelper.ExecuteNonQueryStore("sp_set_bucha", sqlParameter);
+                                                SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_set_bucha", sqlParameter, 10);
                                             }
 
                                             break;