物料管理bug

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -35,15 +35,15 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-        /// 增加一条数据
-        /// </summary>
-        public long Add(CallCenterApi.Model.T_Wo_WorkOrderItem_New model)
+		/// 增加一条数据
+		/// </summary>
+		public long Add(CallCenterApi.Model.T_Wo_WorkOrderItem_New model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderItem_New(");
-            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime)");
+            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime)");
+            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -54,6 +54,11 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_NextUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_NextDept", SqlDbType.Int,4),
                     new SqlParameter("@F_IsUsed", SqlDbType.Int,4),
+                    new SqlParameter("@F_LimitTime", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_IsSMS", SqlDbType.Int,4),
+                    new SqlParameter("@F_SMSToUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_SMSToPhone", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
             parameters[0].Value = model.F_WoID;
@@ -64,8 +69,13 @@ namespace CallCenterApi.DAL
             parameters[5].Value = model.F_NextUser;
             parameters[6].Value = model.F_NextDept;
             parameters[7].Value = model.F_IsUsed;
-            parameters[8].Value = model.F_CreateUser;
-            parameters[9].Value = model.F_CreateTime;
+            parameters[8].Value = model.F_LimitTime;
+            parameters[9].Value = model.F_IsSMS;
+            parameters[10].Value = model.F_SMSToUser;
+            parameters[11].Value = model.F_SMSToPhone;
+            parameters[12].Value = model.F_SMSContent;
+            parameters[13].Value = model.F_CreateUser;
+            parameters[14].Value = model.F_CreateTime;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -87,11 +97,16 @@ namespace CallCenterApi.DAL
             strSql.Append("F_WoID=@F_WoID,");
             strSql.Append("F_WoState=@F_WoState,");
             strSql.Append("F_ItemType=@F_ItemType,");
-            strSql.Append("F_OptType=@F_OptType,"); 
+            strSql.Append("F_OptType=@F_OptType,");
             strSql.Append("F_OptContent=@F_OptContent,");
             strSql.Append("F_NextUser=@F_NextUser,");
             strSql.Append("F_NextDept=@F_NextDept,");
             strSql.Append("F_IsUsed=@F_IsUsed,");
+            strSql.Append("F_LimitTime=@F_LimitTime,");
+            strSql.Append("F_IsSMS=@F_IsSMS,");
+            strSql.Append("F_SMSToUser=@F_SMSToUser,");
+            strSql.Append("F_SMSToPhone=@F_SMSToPhone,");
+            strSql.Append("F_SMSContent=@F_SMSContent,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
             strSql.Append("F_CreateTime=@F_CreateTime");
             strSql.Append(" where F_ID=@F_ID");
@@ -104,20 +119,30 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_NextUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_NextDept", SqlDbType.Int,4),
                     new SqlParameter("@F_IsUsed", SqlDbType.Int,4),
+                    new SqlParameter("@F_LimitTime", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_IsSMS", SqlDbType.Int,4),
+                    new SqlParameter("@F_SMSToUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_SMSToPhone", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_ID", SqlDbType.BigInt,8)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
-            parameters[2].Value = model.F_ItemType; 
+            parameters[2].Value = model.F_ItemType;
             parameters[3].Value = model.F_OptType;
             parameters[4].Value = model.F_OptContent;
             parameters[5].Value = model.F_NextUser;
             parameters[6].Value = model.F_NextDept;
             parameters[7].Value = model.F_IsUsed;
-            parameters[8].Value = model.F_CreateUser;
-            parameters[9].Value = model.F_CreateTime;
-            parameters[10].Value = model.F_ID;
+            parameters[8].Value = model.F_LimitTime;
+            parameters[9].Value = model.F_IsSMS;
+            parameters[10].Value = model.F_SMSToUser;
+            parameters[11].Value = model.F_SMSToPhone;
+            parameters[12].Value = model.F_SMSContent;
+            parameters[13].Value = model.F_CreateUser;
+            parameters[14].Value = model.F_CreateTime;
+            parameters[15].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -202,9 +227,9 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-        /// 得到一个对象实体
-        /// </summary>
-        public CallCenterApi.Model.T_Wo_WorkOrderItem_New DataRowToModel(DataRow row)
+		/// 得到一个对象实体
+		/// </summary>
+		public CallCenterApi.Model.T_Wo_WorkOrderItem_New DataRowToModel(DataRow row)
         {
             CallCenterApi.Model.T_Wo_WorkOrderItem_New model = new CallCenterApi.Model.T_Wo_WorkOrderItem_New();
             if (row != null)
@@ -245,6 +270,26 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsUsed = int.Parse(row["F_IsUsed"].ToString());
                 }
+                if (row["F_LimitTime"] != null)
+                {
+                    model.F_LimitTime = row["F_LimitTime"].ToString();
+                }
+                if (row["F_IsSMS"] != null && row["F_IsSMS"].ToString() != "")
+                {
+                    model.F_IsSMS = int.Parse(row["F_IsSMS"].ToString());
+                }
+                if (row["F_SMSToUser"] != null)
+                {
+                    model.F_SMSToUser = row["F_SMSToUser"].ToString();
+                }
+                if (row["F_SMSToPhone"] != null)
+                {
+                    model.F_SMSToPhone = row["F_SMSToPhone"].ToString();
+                }
+                if (row["F_SMSContent"] != null)
+                {
+                    model.F_SMSContent = row["F_SMSContent"].ToString();
+                }
                 if (row["F_CreateUser"] != null)
                 {
                     model.F_CreateUser = row["F_CreateUser"].ToString();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -684,7 +684,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                             if (isover == 1)
                                 opt = "创建并处理完结工单"; optbut = (int)EnumItemOpt.end;
                             var content = deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + opt;
-                            var itemid=new WorkOrderController().AddLog((int)orderid, model.State.Value, content, (int)EnumItemType.deal, optbut, touser, clbm, ua);
+                            var itemid=new WorkOrderController().AddLog((int)orderid, model.State.Value, content, (int)EnumItemType.deal, optbut, touser, clbm, "", 0, "", "", ua);
                             if (itemid > 0)
                             {
                                 if (!string.IsNullOrWhiteSpace(touser))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/MaterialManageController.cs

@@ -27,10 +27,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #region 筛选
             if (!string.IsNullOrWhiteSpace(MaterialCode))
             {//先验证物料编码为11位纯数字，再查询
-                if (MaterialCode.Length != 11)
-                    return Error("物料编号必须是11位");
-                if (!Regex.IsMatch(MaterialCode, @"^d{11}$"))
-                    return Error("物料编号必须为数字");
+                if (!valcode(MaterialCode))
+                    return Error("物料编号必须是11位数字");
                 sql += " and F_MaterialCode='" + MaterialCode + "'";
             }
             if(!string.IsNullOrWhiteSpace(MaterialName))
@@ -267,7 +265,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (dr["物料编码"].ToString() != "" && valcode(dr["物料编码"].ToString()))
                         {
                             Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
-                            dModel.F_MaterialCode = dr["物料编码"].ToString();//物料编号
+                            dModel.F_MaterialCode = dr["物料编码"].ToString();//物料编码
                             dModel.F_MaterialName = dr["物料名称"].ToString();//物料名称
                             dModel.F_Model = dr["型号"].ToString();//型号
                             dModel.F_Specs = dr["规格"].ToString();//规格
@@ -292,7 +290,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
                         else
-                            msg = msg + "第" + headrow + "行，物料编号为空或格式不正确，未导入<br>";
+                            msg = msg + "第" + headrow + "行，物料编码为空或格式不正确，未导入<br>";
                         #endregion
                     }
                     if (string.IsNullOrEmpty(msg))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -562,7 +562,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 deptname = deptmodel.F_DeptName + "-";
                             }
                             #endregion
-                            AddLog(orderid, model.State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua);
+                            AddLog(orderid, model.State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, "", 0, "", "", ua);
                             return Success("修改成功！");
                         }
                         else
@@ -608,7 +608,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     deptname = deptmodel.F_DeptName + "-";
                                 }
-                                AddLog(item.ID, item.State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.delete, (int)EnumItemOpt.delete, "", 0, ua);
+                                AddLog(item.ID, item.State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.delete, (int)EnumItemOpt.delete, "", 0, "", 0, "", "", ua);
                                 res &= true;
                             }
                             else
@@ -1876,7 +1876,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername+ optcont;
-            var itemid = AddLog(model.ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser);
+            var itemid = AddLog(model.ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, "", 0, "", "", nowUser);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -1943,7 +1943,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             #endregion
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
-            var itemid = AddLog((int)model.ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser);
+            var itemid = AddLog((int)model.ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, "", 0, "", "", nowUser);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -2004,7 +2004,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单"+ optcont;
-            var itemid = AddLog(model.ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser);
+            var itemid = AddLog(model.ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, "", 0, "", "", nowUser);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -2075,7 +2075,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser);
+            var itemid = AddLog((int)model.ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, "", 0, "", "", nowUser);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -2121,7 +2121,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 #endregion
                 var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")催办工单，催办说明：" + cont;
-                long itemid = AddLog(model.ID, model.State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser);
+                long itemid = AddLog(model.ID, model.State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, "", 0, "", "", nowUser);
                 if (itemid > 0)
                 {
                     sendsysmsg(model, nowUser, touser, Int32.Parse(itemid.ToString()), "催办");
@@ -2336,7 +2336,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(long woid,int wostate,string content,int itemtype,int opttype,string nextuser,int nextdept, Model.T_Sys_UserAccount nowUser)
+        public long AddLog(long woid,int wostate,string content,int itemtype,int opttype,string nextuser,int nextdept, 
+            string limittime,int issms,string smsuser,string smscont,Model.T_Sys_UserAccount nowUser)
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
             #region 
@@ -2359,59 +2360,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_NextUser = nextuser;
             itemModel.F_NextDept = nextdept;
             itemModel.F_IsUsed = 0;
+            itemModel.F_LimitTime = limittime;
+            itemModel.F_IsSMS = issms;
+            itemModel.F_SMSToUser = smsuser;
+            if (!string.IsNullOrWhiteSpace(smsuser))
+            {
+                var smsusermodel = sysUserAccountBll.GetModel(smsuser);
+                if (smsusermodel != null)
+                    itemModel.F_SMSToPhone = smsusermodel.F_Mobile;
+            }
+            itemModel.F_SMSContent = smscont;
             itemModel.F_CreateUser = nowUser.F_UserCode;
             itemModel.F_CreateTime = DateTime.Now;
             var res= itembll.Add(itemModel);
             return res;
         }
         /// <summary>
-        /// 添加工单记录
-        /// </summary>
-        //public long AddOrderItem(string orderid,int type,int todept, string touser, int isend,string cont,int isover,decimal limittime, Model.T_Sys_UserAccount nowUser)
-        //{
-        //    #region 
-        //    //处理当前工单的记录之前的记录过期
-        //    var itemlast = itembll.GetModelList(" isnull(isused,'0')='0' and Type=" + (int)EnumItemType.deal+ " and  WorkOrderID='" + orderid + "' and IsDel=0 ");
-        //    if(itemlast.Count>0)
-        //    {
-        //        foreach (var it in itemlast)
-        //        {
-        //            it.IsUsed = 1;
-        //            itembll.Update(it);
-        //        }
-        //    }
-        //    #endregion
-        //    Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
-        //    item.WorkOrderID = orderid;
-        //    item.Type = (int)EnumItemType.deal; //1     //处理
-        //    item.ToDept = todept; //部门
-        //    item.ToUser = touser;  //接收人
-        //    item.Detail = cont;
-        //    item.IsDel = 0;
-        //    //转派
-        //    if (isend == 0)
-        //    {
-        //        item.State = (int)EnumItemState.assign;//0;
-        //        item.IsLast = 0;
-        //    }
-        //    else
-        //    {
-        //        if (isover == 1)
-        //        {
-        //            item.State = (int)EnumItemState.finish;//2;
-        //            item.IsLast = 1;
-        //        }
-        //    }
-        //    item.LimitTime = limittime;
-        //    item.IsStart = 0;
-        //    item.IsTimeOut = 0;
-        //    item.IsUsed = 0;
-        //    item.CreateUser = nowUser.F_UserCode;
-        //    item.CreateTime = DateTime.Now;
-        //    long itemid = itembll.Add(item);
-        //    return itemid;
-        //}
-        /// <summary>
         /// 工单修改操作日志
         /// </summary>
         /// <param name="WorkOrderID">工单编号</param>

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -24,6 +24,11 @@ namespace CallCenterApi.Model
         private string _f_nextuser;
         private int? _f_nextdept;
         private int? _f_isused = 0;
+        private string _f_limittime;
+        private int? _f_issms;
+        private string _f_smstouser;
+        private string _f_smstophone;
+        private string _f_smscontent;
         private string _f_createuser;
         private DateTime? _f_createtime;
         /// <summary>
@@ -55,15 +60,8 @@ namespace CallCenterApi.Model
         /// </summary>
         public int? F_ItemType
         {
-            get
-            {
-                return _f_itemtype;
-            }
-
-            set
-            {
-                _f_itemtype = value;
-            }
+            set { _f_itemtype = value; }
+            get { return _f_itemtype; }
         }
         /// <summary>
         /// 操作类型
@@ -106,6 +104,46 @@ namespace CallCenterApi.Model
             get { return _f_isused; }
         }
         /// <summary>
+        /// 时限
+        /// </summary>
+        public string F_LimitTime
+        {
+            set { _f_limittime = value; }
+            get { return _f_limittime; }
+        }
+        /// <summary>
+        /// 是否短信提醒
+        /// </summary>
+        public int? F_IsSMS
+        {
+            set { _f_issms = value; }
+            get { return _f_issms; }
+        }
+        /// <summary>
+        /// 短信提醒人
+        /// </summary>
+        public string F_SMSToUser
+        {
+            set { _f_smstouser = value; }
+            get { return _f_smstouser; }
+        }
+        /// <summary>
+        /// 短信提醒电话
+        /// </summary>
+        public string F_SMSToPhone
+        {
+            set { _f_smstophone = value; }
+            get { return _f_smstophone; }
+        }
+        /// <summary>
+        /// 短信提醒内容
+        /// </summary>
+        public string F_SMSContent
+        {
+            set { _f_smscontent = value; }
+            get { return _f_smscontent; }
+        }
+        /// <summary>
         /// 创建人
         /// </summary>
         public string F_CreateUser
@@ -121,7 +159,6 @@ namespace CallCenterApi.Model
             set { _f_createtime = value; }
             get { return _f_createtime; }
         }
-        
         #endregion Model
     }
 }

ivr/IVR_SYCW.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ivr>
-	<flow Name="IVR_SYCW" Type="normal" MatchedNum="." MatchedLine="|-1|" Concurrency="1">
+	<flow Name="IVR_XLX" Type="normal" MatchedNum="." MatchedLine="|-1|" Concurrency="1">
 		<cell Name="CELL_START" Pos="1" Next="2" Note="开始节点" />
 		<cell Name="CELL_SQL" Pos="2" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
 		SqlStr="INSERT INTO T_Call_CallRecords(CallId,CallNumber,CallType,CallState,DealType,BeginTime,IvrStartTime,IvrEndTime,EndTime,LongTime,IsDeal,OperateType,MYD) VALUES('%[CallID]','%[CallerID]',0,0,0,GETDATE(),GETDATE(),GETDATE(),GETDATE(),0,0,0,0)" 
@@ -15,41 +15,34 @@
 			<DefVar VarType="1" VarName="HolidayVerify" VarVal="0" />
 			<DefVar VarType="1" VarName="zbdh" VarVal="0" />
 		</cell>
+		<!--1.播放欢迎词-->
+		<cell Name="CELL_AUDIODTMF" Pos="12" PlayType="2" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
+		TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="8" FailPos="24" HangupPos="25" Note="放欢迎词" />
+		 <!--2.黑名单-->
 		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
 		SqlStr="select COUNT(*) FROM T_Call_Blacklist where F_TelPhone='%[CallerID]'" IsSaved="yes" SuccessPos="5" FailPos="5" Note="读取黑名单" />
 		<cell Name="CELL_RECORDSET" Pos="5" LPos="6" EPos="6" GPos="6" Note="取黑名单结果">
 			<Map Var="BlackListVerify" />
 		</cell>
-		<cell Name="CELL_COMPARE" Pos="6" Data1Type="2" Data2Type="1" Data3Type="1" Data1="BlackListVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="7" FalsePos="12" Note="判断黑名单" />
+		<cell Name="CELL_COMPARE" Pos="6" Data1Type="2" Data2Type="1" Data3Type="1" Data1="BlackListVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="7" FalsePos="8" Note="判断黑名单" />
 		<cell Name="CELL_SQL" Pos="7" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
 		SqlStr="update T_Call_CallRecords set CallState=1,DealType=1,IsDeal=1 where CallId='%[CallID]'" IsSaved="no" SuccessPos="26" FailPos="26" Note="黑名单通话记录" />
 		
-		<cell Name="CELL_AUDIODTMF" Pos="12" PlayType="2" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
-		TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="8" FailPos="24" HangupPos="25" Note="放欢迎词" />
-		<!--
-			1.播放欢迎词-2.判断是否下班 是直接转入坐席，不是继续播报
-		-->
-		<!--<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
-		SqlStr="SELECT count(*) FROM T_Sys_WorkCalendar WHERE getdate() between F_DateId and DATEADD(dd,1,F_DateId) AND F_WorkingFlag=1 AND Convert(varchar(20),getdate(),108)&gt;=Convert(varchar(20),'07:30:00',108) and Convert(varchar(20),getdate(),108)&lt;=Convert(varchar(20),'23:30:00',108)" 
-		IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />-->
-    <cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18"
+		<!--3.判断是否工作时间 是直接转入坐席，不是继续播报-->
+		<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18"
 		SqlStr="EXEC P_GetHolidays " IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />
 		<cell Name="CELL_RECORDSET" Pos="9" LPos="10" EPos="10" GPos="10" Note="取节假日结果">
 			<Map Var="HolidayVerify" />
-      <!--<Map Var="ZBDHVerify" />-->  <!--值班电话返回值-->
 		</cell>
 		<cell Name="CELL_COMPARE" Pos="10" Data1Type="2" Data2Type="1" Data3Type="1" Data1="HolidayVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="603" FalsePos="11" Note="判断节假日" />
-    <!--<cell Name="CELL_COMPARE" Pos="101" Data1Type="2" Data2Type="1" Data3Type="1" Data1="ZBDHVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="29" FalsePos="11" Note="判断值班电话" />-->
-		<!--<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="1" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\假期提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
-		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="keyh" SuccessPos="11" FailPos="24" HangupPos="25" Note="放节假日音" />-->
-    <cell Name="CELL_AUDIODTMF" Pos="11" PlayType="1" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\假期提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50"
+		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="1" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\假期提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50"
 		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="Key" SuccessPos="301" FailPos="24" HangupPos="25" Note="放节假日音" />
-    <cell Name="CELL_BRANCH" Pos="301" Var="Key" DefaultPos="11" Note="分支节点">
-      <Branch Value="1" Pos="29" />      <!--转值班电话-->
-      <Branch Value="2" Pos="20" />      <!--新添加语音留言-->
-    </cell>
+		<cell Name="CELL_BRANCH" Pos="301" Var="Key" DefaultPos="11" Note="分支节点">
+		  <Branch Value="1" Pos="29" />      <!--转值班电话-->
+		  <Branch Value="2" Pos="20" />      <!--新添加语音留言-->
+		</cell>
 
-    <cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
+		<cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" 
 		SqlStr="select top 1 F_ZXZID from T_Sys_SeatGroup where F_ZXZCode='ZXZ'" 
 		IsSaved="yes" SuccessPos="604" FailPos="24" Note="获取坐席组ID" />
 		<cell Name="CELL_RECORDSET" Pos="604" LPos="13" EPos="13" GPos="13" Note="获取坐席组ID结果">
@@ -57,7 +50,7 @@
 		</cell>
 		
 		<!--坐席排队时，没有登录坐席直接转值班电话，无空闲坐席转坐席全忙放音，有空闲坐席继续播报-->
-		<cell Name="CELL_QUEUE" Pos="13" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="1" Group="12" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
+		<cell Name="CELL_QUEUE" Pos="13" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
 		NoAgentPos="29" NoFreePos="14" SuccessPos="18" HangupPos="25" Note="排队节点" />
 		
 		<cell Name="CELL_AUDIODTMF" Pos="14" PlayType="1" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\坐席全忙.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
@@ -65,7 +58,7 @@
 		<cell Name="CELL_BRANCH" Pos="15" Var="Key" DefaultPos="14" Note="分支节点">
 			<Branch Value="1" Pos="16" />       <!--继续排队-->
 			<Branch Value="2" Pos="29" />       <!--转值班电话-->
-      <Branch Value="3" Pos="20" />       <!--新添加语音留言-->
+			<Branch Value="3" Pos="20" />       <!--新添加语音留言-->
 		</cell>		
 		<cell Name="CELL_CONTINUEQUEUE" Pos="16" Agent="AgentNo" Exten="AgentExtNo" Audio="E:\midware\ivr\ivr_lvdi\wav\保持音.wav" Timeout="60" SuccessPos="18" HangupPos="25" TimeoutPos="14" Note="继续排队节点" />
 		<cell Name="CELL_CANCELQUEUE" Pos="17" Reason="等烦了" Next="24" Note="放弃排队节点" />		
@@ -92,9 +85,6 @@
 		<!--黑名单提示音-->
 		
 		<!--转值班电话-->
-		<cell Name="CELL_BRANCH"  Pos="28" Var="keyh" DefaultPos="14" Note="是否转值班电话-比较按键值" >
-			<Branch Pos="29" Value="1" />
-		</cell>
 		<cell Name="CELL_AUDIODTMF" Pos="29" PlayType="2" ContentType="1" Content="E:\midware\ivr\ivr_lvdi\wav\转值班电话提示.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
 		TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="701" FailPos="24" HangupPos="25" Note="转值班电话提示音" />
 		<cell Name="CELL_SQL" Pos="701" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_SanYuanCW;Data Source=192.168.4.18" SqlStr="EXEC P_GetZBDH " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话" />