|
|
@@ -197,7 +197,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
197
|
197
|
//sql += $" and (F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.revoke + ")" + " " + uwhere;
|
|
198
|
198
|
sql += $" and (F_State in(" + (int)EnumWorkOrderState.neworder + ")" + " " + uwhere;
|
|
199
|
199
|
// sql += "and T_Wo_WorkOrder.F_ID in (" + GetBackWorkOrderID(ua.F_UserCode) + ") ";
|
|
200
|
|
- if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode, 1)))
|
|
|
200
|
+ if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
|
|
201
|
201
|
{
|
|
202
|
202
|
sql += $" or (F_State={(int)EnumWorkOrderState.assign} and F_State2={(int)EnumWorkOrderState.assign} and T_Wo_WorkOrder.F_ID in ({GetRevokeWo(ua.F_UserCode, 1)}))";
|
|
203
|
203
|
sql += $" or (F_State={(int)EnumWorkOrderState.assign} and F_Flag=1 and T_Wo_WorkOrder.F_ID in ({GetRevokeWo(ua.F_UserCode)}))";
|
|
|
@@ -244,14 +244,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
244
|
244
|
sql += " and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
|
|
245
|
245
|
if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
|
|
246
|
246
|
{
|
|
247
|
|
- if (ua.F_Flag == 1)
|
|
248
|
|
- {
|
|
249
|
|
- sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
250
|
|
- }
|
|
251
|
|
- else if (ua.F_Flag == 2)
|
|
252
|
|
- {
|
|
253
|
|
- sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
254
|
|
- }
|
|
|
247
|
+ sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign+ ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
|
248
|
+ //if (ua.F_Flag == 1)
|
|
|
249
|
+ //{
|
|
|
250
|
+ // sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
|
251
|
+ //}
|
|
|
252
|
+ //else if (ua.F_Flag == 2)
|
|
|
253
|
+ //{
|
|
|
254
|
+ // sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
|
255
|
+ //}
|
|
255
|
256
|
}
|
|
256
|
257
|
else
|
|
257
|
258
|
{
|
|
|
@@ -318,10 +319,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
318
|
319
|
return Success("无操作权限"); ;
|
|
319
|
320
|
}
|
|
320
|
321
|
//sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" +"1" +"' "+ uwhere; ;
|
|
321
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
|
|
|
322
|
+ sql += $" and ((F_State=" + (int)EnumWorkOrderState.finish + " and F_State2!=" + (int)EnumWorkOrderState.evaluate + ") or (F_State!=" + (int)EnumWorkOrderState.evaluate + " and F_State2=" + (int)EnumWorkOrderState.finish + ")) and F_IsVisit = '" + "1" + "' " + uwhere; ;
|
|
322
|
323
|
break;
|
|
323
|
324
|
case 6://已回访
|
|
324
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
|
|
|
325
|
+ sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate+ " or F_State2="+ (int)EnumWorkOrderState.evaluate + ")";
|
|
325
|
326
|
sql += $" and F_IsVisit=" + 1; ;
|
|
326
|
327
|
sql += $" and F_VisitBy !=''";
|
|
327
|
328
|
if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
|
|
|
@@ -381,7 +382,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
381
|
382
|
{
|
|
382
|
383
|
return Success("无操作权限"); ;
|
|
383
|
384
|
}
|
|
384
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
|
|
|
385
|
+ //sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
|
|
385
|
386
|
break;
|
|
386
|
387
|
case 7://待完结
|
|
387
|
388
|
if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
|
|
|
@@ -392,7 +393,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
392
|
393
|
{
|
|
393
|
394
|
return Success("无操作权限"); ;
|
|
394
|
395
|
}
|
|
395
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or F_Type = 3)"; ;
|
|
|
396
|
+ sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or F_Type = 3)"; ;
|
|
396
|
397
|
//sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or F_Type = 3)"; ;
|
|
397
|
398
|
break;
|
|
398
|
399
|
case 8://待审批
|
|
|
@@ -577,7 +578,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
577
|
578
|
{
|
|
578
|
579
|
return Success("无操作权限"); ;
|
|
579
|
580
|
}
|
|
580
|
|
- sql += $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
|
|
|
581
|
+ sql += $" and (F_State in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}) or F_State2 in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}))";
|
|
581
|
582
|
break;
|
|
582
|
583
|
case 20: //抄送工单列表
|
|
583
|
584
|
if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
|
|
|
@@ -781,15 +782,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
781
|
782
|
sql += " and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
|
|
782
|
783
|
if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
|
|
783
|
784
|
{
|
|
|
785
|
+ sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
784
|
786
|
|
|
785
|
|
- if (ua.F_Flag == 1)
|
|
786
|
|
- {
|
|
787
|
|
- sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
788
|
|
- }
|
|
789
|
|
- else if (ua.F_Flag == 2)
|
|
790
|
|
- {
|
|
791
|
|
- sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
792
|
|
- }
|
|
|
787
|
+ //if (ua.F_Flag == 1)
|
|
|
788
|
+ //{
|
|
|
789
|
+ // sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
|
790
|
+ //}
|
|
|
791
|
+ //else if (ua.F_Flag == 2)
|
|
|
792
|
+ //{
|
|
|
793
|
+ // sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
|
|
|
794
|
+ //}
|
|
793
|
795
|
}
|
|
794
|
796
|
else
|
|
795
|
797
|
{
|
|
|
@@ -867,8 +869,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
867
|
869
|
{
|
|
868
|
870
|
RV_awaitVist = 0;
|
|
869
|
871
|
break;
|
|
870
|
|
- }
|
|
871
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
|
|
|
872
|
+ }
|
|
|
873
|
+ sql += $" and ((F_State=" + (int)EnumWorkOrderState.finish + " and F_State2!=" + (int)EnumWorkOrderState.evaluate + ") or (F_State!=" + (int)EnumWorkOrderState.evaluate + " and F_State2=" + (int)EnumWorkOrderState.finish + ")) and F_IsVisit = '" + "1" + "' " + uwhere; ;
|
|
872
|
874
|
//sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
|
|
873
|
875
|
RV_awaitVist = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
|
|
874
|
876
|
|
|
|
@@ -876,15 +878,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
876
|
878
|
case 6://已回访
|
|
877
|
879
|
sql = "";
|
|
878
|
880
|
sql += $" F_IsDelete=0";
|
|
879
|
|
-
|
|
880
|
881
|
if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
|
|
881
|
882
|
{
|
|
882
|
883
|
sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
|
|
883
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
|
|
|
884
|
+ sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate+" or F_State2 = " + (int)EnumWorkOrderState.evaluate+")" ;
|
|
884
|
885
|
}
|
|
885
|
886
|
else if (ro.F_RoleCode == "XTGLY")
|
|
886
|
887
|
{
|
|
887
|
888
|
uwhere = ""; ;
|
|
|
889
|
+ sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate + " or F_State2 = " + (int)EnumWorkOrderState.evaluate + ")";
|
|
888
|
890
|
}
|
|
889
|
891
|
else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
|
|
890
|
892
|
{
|
|
|
@@ -938,8 +940,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
938
|
940
|
RV_haveVisit = 0;
|
|
939
|
941
|
break;
|
|
940
|
942
|
}
|
|
941
|
|
- string where = $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
|
|
942
|
|
- RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql + where).Count;//
|
|
|
943
|
+ string where = $"F_IsDelete=0 and (F_State in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}) or F_State2 in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}))"; ;
|
|
|
944
|
+ RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(where).Count;//
|
|
943
|
945
|
sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
|
|
944
|
946
|
sql += $" and F_IsVisit=" + 1; ;
|
|
945
|
947
|
sql += $" and F_VisitBy !=''";
|
|
|
@@ -957,7 +959,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
957
|
959
|
DWJ = 0;
|
|
958
|
960
|
break; ;
|
|
959
|
961
|
}
|
|
960
|
|
- sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or F_Type = 3)"; ;
|
|
|
962
|
+ sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or F_Type = 3)"; ;
|
|
961
|
963
|
//sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or F_Type = 3) "; ;
|
|
962
|
964
|
DWJ = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
|
|
963
|
965
|
break;
|
|
|
@@ -1212,7 +1214,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1212
|
1214
|
{
|
|
1213
|
1215
|
|
|
1214
|
1216
|
string markdepts = "37,57,74,88,268,422,339";
|
|
1215
|
|
- string qualdepts = "12,36,295";
|
|
|
1217
|
+ string qualdepts = "12,36,295,245";
|
|
1216
|
1218
|
string detpid = "" + ua.F_DeptId;
|
|
1217
|
1219
|
var deparmentlist = new List<Model.T_Sys_Department>();
|
|
1218
|
1220
|
Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
|
|
|
@@ -1441,6 +1443,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1441
|
1443
|
string deptmodelsname = "";
|
|
1442
|
1444
|
int wostate = 0;
|
|
1443
|
1445
|
var toussers = "";
|
|
|
1446
|
+ int woflag = 0;
|
|
1444
|
1447
|
// var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and F_OptType=" + (int)EnumItemOpt.audit + " and F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
|
|
1445
|
1448
|
// if (itemlast != null)
|
|
1446
|
1449
|
// toussers = itemlast.F_CreateUser;
|
|
|
@@ -1541,6 +1544,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1541
|
1544
|
if (userid <= 0 || !res)
|
|
1542
|
1545
|
res = false;
|
|
1543
|
1546
|
wostate = 1;
|
|
|
1547
|
+ woflag = 9;
|
|
1544
|
1548
|
}
|
|
1545
|
1549
|
else if (AuditState == 1)
|
|
1546
|
1550
|
{
|
|
|
@@ -1570,7 +1574,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1570
|
1574
|
if (res)
|
|
1571
|
1575
|
{
|
|
1572
|
1576
|
model.F_State = wostate;
|
|
1573
|
|
- model.F_State2 = wostate;
|
|
|
1577
|
+ if (woflag == 9)
|
|
|
1578
|
+ {
|
|
|
1579
|
+ model.F_State2 = 0;
|
|
|
1580
|
+ }
|
|
|
1581
|
+ else
|
|
|
1582
|
+ {
|
|
|
1583
|
+ model.F_State2 = wostate;
|
|
|
1584
|
+ }
|
|
|
1585
|
+ model.F_Flag = woflag;
|
|
1574
|
1586
|
//处理内容
|
|
1575
|
1587
|
if (!string.IsNullOrEmpty(AuditCont))
|
|
1576
|
1588
|
model.F_AuditCont += AuditCont + "；";
|
|
|
@@ -1669,6 +1681,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1669
|
1681
|
deptname = deptmodel1.F_DeptName;
|
|
1670
|
1682
|
}
|
|
1671
|
1683
|
int isbl = 0;
|
|
|
1684
|
+ int flag = 9;
|
|
1672
|
1685
|
Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
|
|
1673
|
1686
|
//if (dapt != 0)
|
|
1674
|
1687
|
//{
|
|
|
@@ -1677,8 +1690,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1677
|
1690
|
isbl = 1;
|
|
1678
|
1691
|
nextda = 37;
|
|
1679
|
1692
|
opt = "流转市场管理科";
|
|
1680
|
|
- nextda2 = 36;
|
|
1681
|
|
- opt2 = "流转质量管理科";
|
|
|
1693
|
+ //nextda2 = 36;
|
|
|
1694
|
+ //opt2 = "流转质量管理科";
|
|
|
1695
|
+ //flag = 3;
|
|
1682
|
1696
|
}
|
|
1683
|
1697
|
else if (CirculMarket(ua.F_DeptId, 14))
|
|
1684
|
1698
|
{
|
|
|
@@ -1691,6 +1705,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1691
|
1705
|
isbl = 1;
|
|
1692
|
1706
|
nextda = 74;
|
|
1693
|
1707
|
opt = "流转策划推广";
|
|
|
1708
|
+ //nextda2 = 245;
|
|
|
1709
|
+ //opt2 = "流转质量督察处";
|
|
|
1710
|
+ //flag = 3;
|
|
1694
|
1711
|
}
|
|
1695
|
1712
|
else if (CirculMarket(ua.F_DeptId, 16))
|
|
1696
|
1713
|
{
|
|
|
@@ -1733,18 +1750,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1733
|
1750
|
if (ro.F_RoleCode == "DQJL")
|
|
1734
|
1751
|
{
|
|
1735
|
1752
|
cont = "大区经理已审批:" + AuditCont + "," + opt;
|
|
1736
|
|
- if (!string.IsNullOrEmpty(opt2))
|
|
1737
|
|
- {
|
|
1738
|
|
- cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
|
|
1739
|
|
- }
|
|
|
1753
|
+ //if (!string.IsNullOrEmpty(opt2))
|
|
|
1754
|
+ //{
|
|
|
1755
|
+ // cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
|
|
|
1756
|
+ //}
|
|
1740
|
1757
|
}
|
|
1741
|
1758
|
else
|
|
1742
|
1759
|
{
|
|
1743
|
1760
|
cont = "分公司经理已审批:" + AuditCont + "," + opt;
|
|
1744
|
|
- if (!string.IsNullOrEmpty(opt2))
|
|
1745
|
|
- {
|
|
1746
|
|
- cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
|
|
1747
|
|
- }
|
|
|
1761
|
+ //if (!string.IsNullOrEmpty(opt2))
|
|
|
1762
|
+ //{
|
|
|
1763
|
+ // cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
|
|
|
1764
|
+ //}
|
|
1748
|
1765
|
}
|
|
1749
|
1766
|
}
|
|
1750
|
1767
|
else
|
|
|
@@ -1752,34 +1769,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
1752
|
1769
|
if (ro.F_RoleCode == "DQJL")
|
|
1753
|
1770
|
{
|
|
1754
|
1771
|
cont = "大区经理未审批" + opt;
|
|
1755
|
|
- if (!string.IsNullOrEmpty(opt2))
|
|
1756
|
|
- {
|
|
1757
|
|
- cont2 = "大区经理未审批" + opt2;
|
|
1758
|
|
- }
|
|
|
1772
|
+ //if (!string.IsNullOrEmpty(opt2))
|
|
|
1773
|
+ //{
|
|
|
1774
|
+ // cont2 = "大区经理未审批" + opt2;
|
|
|
1775
|
+ //}
|
|
1759
|
1776
|
}
|
|
1760
|
1777
|
else
|
|
1761
|
1778
|
{
|
|
1762
|
1779
|
cont = "分公司经理未审批" + opt;
|
|
1763
|
|
- if (!string.IsNullOrEmpty(opt2))
|
|
1764
|
|
- {
|
|
1765
|
|
- cont2 = "分公司经理未审批" + opt2;
|
|
1766
|
|
- }
|
|
|
1780
|
+ //if (!string.IsNullOrEmpty(opt2))
|
|
|
1781
|
+ //{
|
|
|
1782
|
+ // cont2 = "分公司经理未审批" + opt2;
|
|
|
1783
|
+ //}
|
|
1767
|
1784
|
}
|
|
1768
|
1785
|
}
|
|
1769
|
|
- if (nextda != 0 || nextda2 != 0)
|
|
|
1786
|
+ if (nextda != 0)
|
|
1770
|
1787
|
{
|
|
1771
|
|
- var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl);
|
|
1772
|
|
- if (nextda2 != 0)
|
|
1773
|
|
- {
|
|
1774
|
|
- var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
|
|
1775
|
|
- }
|
|
1776
|
|
- //else
|
|
|
1788
|
+ //if (flag == 1)
|
|
1777
|
1789
|
//{
|
|
1778
|
|
-
|
|
|
1790
|
+ // model.F_State2 = (int)EnumWorkOrderState.finish;
|
|
|
1791
|
+ // model.F_Flag = 1;
|
|
1779
|
1792
|
//}
|
|
1780
|
|
- return true;
|
|
|
1793
|
+ model.F_Flag = 9;
|
|
|
1794
|
+ var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,3,9);
|
|
|
1795
|
+ //if (nextda2 != 0)
|
|
|
1796
|
+ //{
|
|
|
1797
|
+ // model.F_Flag = 3;
|
|
|
1798
|
+ // var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
|
|
|
1799
|
+ //}
|
|
|
1800
|
+ return res;
|
|
|
1801
|
+ }
|
|
|
1802
|
+ else
|
|
|
1803
|
+ {
|
|
|
1804
|
+ return false;
|
|
1781
|
1805
|
}
|
|
1782
|
|
- else return false;
|
|
1783
|
1806
|
|
|
1784
|
1807
|
}
|
|
1785
|
1808
|
/// <summary>
|
|
|
@@ -2417,8 +2440,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
2417
|
2440
|
list.Add(model);
|
|
2418
|
2441
|
}
|
|
2419
|
2442
|
var itemlasts = itembll.GetModelList(" F_WoID=" + id + " and F_Type=" + ua.F_Flag + " ");
|
|
2420
|
|
- ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
|
|
2421
|
|
- FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
|
|
|
2443
|
+ //var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
|
|
|
2444
|
+ //FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
|
|
|
2445
|
+ var configfj = "http://192.168.8.9:1005/";
|
|
|
2446
|
+ FileUrl = GetFileData(model.F_Files, configfj);
|
|
2422
|
2447
|
if (list.Count > 0)
|
|
2423
|
2448
|
{
|
|
2424
|
2449
|
List<WorkOrderNewInput> Input = modeltooip(list);
|
|
|
@@ -2931,7 +2956,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
2931
|
2956
|
else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
|
|
2932
|
2957
|
{
|
|
2933
|
2958
|
string markdepts = "37,57,74,88,268,422,339";
|
|
2934
|
|
- string qualdepts = "12,36,295";
|
|
|
2959
|
+ string qualdepts = "12,36,295,245";
|
|
2935
|
2960
|
string detpid = "" + ua.F_DeptId;
|
|
2936
|
2961
|
var deparmentlist = new List<Model.T_Sys_Department>();
|
|
2937
|
2962
|
Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
|
|
|
@@ -6084,7 +6109,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
6084
|
6109
|
}
|
|
6085
|
6110
|
else if (model1[i].F_State == 11)
|
|
6086
|
6111
|
{
|
|
6087
|
|
- model.F_StateName = "已回访";
|
|
|
6112
|
+ model.F_StateName = "外线已完结";
|
|
6088
|
6113
|
}
|
|
6089
|
6114
|
else if (model1[i].F_State == 12)
|
|
6090
|
6115
|
{
|
|
|
@@ -6151,7 +6176,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
6151
|
6176
|
}
|
|
6152
|
6177
|
else if (model1[i].F_State2 == 11)
|
|
6153
|
6178
|
{
|
|
6154
|
|
- model.F_StateName2 = "已回访";
|
|
|
6179
|
+ model.F_StateName2 = "内线已完结";
|
|
6155
|
6180
|
}
|
|
6156
|
6181
|
else if (model1[i].F_State2 == 12)
|
|
6157
|
6182
|
{
|
|
|
@@ -6479,7 +6504,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
6479
|
6504
|
model.F_WorkmanShip = model1[i].F_WorkmanShip;//质量管理科-工艺
|
|
6480
|
6505
|
model.F_Manufacturers = model1[i].F_Manufacturers;//质量管理科-原料及厂家
|
|
6481
|
6506
|
model.F_ProductionNum = model1[i].F_ProductionNum;//质量管理科-该批次生产数量
|
|
6482
|
|
-
|
|
|
6507
|
+ model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
|
|
|
6508
|
+
|
|
|
6509
|
+
|
|
6483
|
6510
|
|
|
6484
|
6511
|
if (ua != null)
|
|
6485
|
6512
|
{
|
|
|
@@ -7023,20 +7050,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7023
|
7050
|
/// <summary>
|
|
7024
|
7051
|
/// 添加工单记录
|
|
7025
|
7052
|
/// </summary>
|
|
7026
|
|
- public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3)
|
|
|
7053
|
+ public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3,int flagstate=0)
|
|
7027
|
7054
|
{
|
|
7028
|
7055
|
Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
|
|
7029
|
7056
|
#region
|
|
7030
|
7057
|
string strsql = "";
|
|
|
7058
|
+ string flagstr = "";
|
|
|
7059
|
+ if (flag != 3)
|
|
|
7060
|
+ flagstr = $" and F_Type in({ flag},3)";
|
|
7031
|
7061
|
Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
|
|
7032
|
7062
|
if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag!=3)
|
|
7033
|
7063
|
{
|
|
7034
|
|
- strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and F_WoID={woid} and F_CreateUser={nowUser.F_UserCode} and F_Type in({flag},3) ";
|
|
|
7064
|
+ strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and F_WoID={woid} and F_CreateUser={nowUser.F_UserCode}{flagstr}";
|
|
7035
|
7065
|
}
|
|
7036
|
7066
|
else
|
|
7037
|
7067
|
{
|
|
7038
|
|
- strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and F_WoID={woid} and (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%')"
|
|
7039
|
|
- + $" and F_Type in({flag},3)";
|
|
|
7068
|
+ strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and F_WoID={woid} and (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%'){flagstr}" ;
|
|
7040
|
7069
|
}
|
|
7041
|
7070
|
//处理当前工单的记录之前的记录过期
|
|
7042
|
7071
|
//var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and F_WoID=" + woid + " ");
|
|
|
@@ -7068,6 +7097,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7068
|
7097
|
itemModel.F_IsUsed = F_IsUsed;
|
|
7069
|
7098
|
itemModel.F_LimitTime = overtime.ToString();
|
|
7070
|
7099
|
itemModel.F_Type = flag;//区分内外线和公共部门
|
|
|
7100
|
+ if (flagstate != 0)
|
|
|
7101
|
+ itemModel.F_Flag = flagstate;
|
|
|
7102
|
+ else
|
|
|
7103
|
+ itemModel.F_Flag = new BLL.T_Wo_WorkOrder().GetModel(woid).F_Flag;
|
|
7071
|
7104
|
if (create != "")
|
|
7072
|
7105
|
{
|
|
7073
|
7106
|
itemModel.F_CreateTime = DateTime.Parse(create);
|
|
|
@@ -7447,18 +7480,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7447
|
7480
|
{
|
|
7448
|
7481
|
if (flag == 3)
|
|
7449
|
7482
|
{
|
|
7450
|
|
- var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
|
|
7451
|
|
- var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2);
|
|
|
7483
|
+ var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,0,0,0,"",0,1,flag);
|
|
|
7484
|
+ var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
|
|
7452
|
7485
|
}
|
|
7453
|
7486
|
else if (flag == 2)
|
|
7454
|
7487
|
{
|
|
7455
|
|
- var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2);
|
|
7456
|
|
- DealWO(ua, modlelist, input, cont, "", 1, "", 1, "");
|
|
|
7488
|
+ var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
|
|
|
7489
|
+ DealWO(ua, modlelist, input, cont, "", 1, "", 1, "",flag);
|
|
7457
|
7490
|
}
|
|
7458
|
7491
|
else
|
|
7459
|
7492
|
{
|
|
7460
|
|
- var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
|
|
7461
|
|
- DealWO(ua, modlelist, input, cont, "", 1, "", 2, "");
|
|
|
7493
|
+ var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,flag);
|
|
|
7494
|
+ DealWO(ua, modlelist, input, cont, "", 1, "", 2, "",flag);
|
|
7462
|
7495
|
|
|
7463
|
7496
|
}
|
|
7464
|
7497
|
return Success("转派成功");
|
|
|
@@ -7542,7 +7575,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7542
|
7575
|
string touser = "";
|
|
7543
|
7576
|
string strwhere = "";
|
|
7544
|
7577
|
string contens = "";
|
|
7545
|
|
- strwhere = $" F_DeptId in (select top 1 F_NextDept from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339) order by F_CreateTime desc)";
|
|
|
7578
|
+ strwhere = $" F_DeptId in (select top 1 F_NextDept from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422) order by F_CreateTime desc)";
|
|
7546
|
7579
|
var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
|
|
7547
|
7580
|
if (deptmodel != null)
|
|
7548
|
7581
|
{
|
|
|
@@ -7550,11 +7583,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7550
|
7583
|
if (userlist.Count > 0)
|
|
7551
|
7584
|
{
|
|
7552
|
7585
|
if (flag == 1)
|
|
7553
|
|
- contens = $" 修改注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>"+ model.F_WorkOrderCode +"</a>" ;
|
|
|
7586
|
+ contens = $" 修改注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
|
|
7554
|
7587
|
|
|
7555
|
7588
|
//< span class="top_notices_con">系统维护管理员 修改注解, 工单编号 20220527152927398</span>
|
|
7556
|
7589
|
else
|
|
7557
|
|
- contens = $" 附加注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>"+ model.F_WorkOrderCode + "</a>";
|
|
|
7590
|
+ contens = $" 附加注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
|
|
7558
|
7591
|
foreach (var item in userlist)
|
|
7559
|
7592
|
{
|
|
7560
|
7593
|
touser = item.F_UserCode; ;
|
|
|
@@ -7562,7 +7595,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7562
|
7595
|
msg.Type = (int)Model.MSGType.Annotation;
|
|
7563
|
7596
|
msg.ToUser = touser;
|
|
7564
|
7597
|
msg.ToID = (int)model.F_ID;
|
|
7565
|
|
- msg.Detail = $"<span class='top_notices_con'> "+ua.F_UserName + contens+ "</span>";
|
|
|
7598
|
+ msg.Detail = $"<span class='top_notices_con'> " + ua.F_UserName + contens + "</span>";
|
|
7566
|
7599
|
msg.State = 0;
|
|
7567
|
7600
|
msg.IsDel = 0;
|
|
7568
|
7601
|
msg.CreateDate = DateTime.Now;
|
|
|
@@ -7619,15 +7652,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7619
|
7652
|
{
|
|
7620
|
7653
|
#region 工单处理
|
|
7621
|
7654
|
int sms = 0;
|
|
7622
|
|
- var itemlasts = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoID=" + model.F_ID + " ");
|
|
7623
|
|
- string creatuser = "";
|
|
|
7655
|
+ int woflag = model.F_Flag;
|
|
|
7656
|
+ string strsql = "";
|
|
|
7657
|
+ if (woflag == 1)
|
|
|
7658
|
+ {
|
|
|
7659
|
+ strsql = $" and F_Type in(1,3)";
|
|
|
7660
|
+ }
|
|
|
7661
|
+ else if (woflag == 2)
|
|
|
7662
|
+ {
|
|
|
7663
|
+ strsql = $" and F_Type in(2,3)";
|
|
|
7664
|
+ }
|
|
|
7665
|
+ var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and F_WoID={model.F_ID}");
|
|
|
7666
|
+ string creatuser1 = "";
|
|
|
7667
|
+ string creatuser2 = "";
|
|
7624
|
7668
|
if (itemlasts.Count > 0)
|
|
7625
|
7669
|
{
|
|
7626
|
7670
|
foreach (var it in itemlasts)
|
|
7627
|
7671
|
{
|
|
7628
|
|
- if (it.F_WoState == 10)
|
|
|
7672
|
+ if (it.F_WoState == 10 && it.F_Type == 1 && (it.F_Flag == 1 || it.F_Flag == 3))
|
|
|
7673
|
+ {
|
|
|
7674
|
+ creatuser1 = it.F_CreateUser;
|
|
|
7675
|
+ }
|
|
|
7676
|
+ if (it.F_WoState == 10 && it.F_Type==2 && (it.F_Flag == 2 || it.F_Flag == 3))
|
|
7629
|
7677
|
{
|
|
7630
|
|
- creatuser = it.F_CreateUser;
|
|
|
7678
|
+ creatuser2 = it.F_CreateUser;
|
|
7631
|
7679
|
}
|
|
7632
|
7680
|
}
|
|
7633
|
7681
|
}
|
|
|
@@ -7642,62 +7690,85 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7642
|
7690
|
#endregion
|
|
7643
|
7691
|
var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
|
|
7644
|
7692
|
//获取上一级处理人员
|
|
7645
|
|
- int deptid = 0;
|
|
7646
|
|
- var touser = new BLL.T_Sys_UserAccount().GetModel(creatuser);
|
|
7647
|
|
- if (touser != null)
|
|
|
7693
|
+ int deptid1 = 0;
|
|
|
7694
|
+ int deptid2 = 0;
|
|
|
7695
|
+ var touser1 = new BLL.T_Sys_UserAccount().GetModel(creatuser1);
|
|
|
7696
|
+ if (touser1 != null)
|
|
7648
|
7697
|
{
|
|
7649
|
|
- deptid = touser.F_DeptId;
|
|
|
7698
|
+ deptid1 = touser1.F_DeptId;
|
|
7650
|
7699
|
}
|
|
7651
|
|
- string smscont = "";
|
|
|
7700
|
+ if (!string.IsNullOrEmpty(creatuser2))
|
|
|
7701
|
+ deptid2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2)?.F_DeptId ?? 0;
|
|
7652
|
7702
|
|
|
|
7703
|
+ string smscont = "";
|
|
7653
|
7704
|
|
|
7654
|
|
- var itemid = AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser, deptid, nowUser, model.F_limit, sms);
|
|
7655
|
|
- if (itemid > 0)
|
|
|
7705
|
+ if (deptid1 > 0)
|
|
|
7706
|
+ AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, 1);
|
|
|
7707
|
+ if (deptid2 > 0)
|
|
|
7708
|
+ AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser2, deptid2, nowUser, model.F_limit, sms, "", 0, 2);
|
|
|
7709
|
+ //if (itemid > 0)
|
|
|
7710
|
+ //{
|
|
|
7711
|
+ if (model.F_Type == "1")
|
|
7656
|
7712
|
{
|
|
7657
|
|
- if (model.F_Type == "1")
|
|
7658
|
|
- {
|
|
7659
|
|
- smscont = "咨询";
|
|
7660
|
|
- }
|
|
7661
|
|
- else if (model.F_Type == "2")
|
|
7662
|
|
- {
|
|
7663
|
|
- smscont = "投诉";
|
|
7664
|
|
- }
|
|
7665
|
|
- else if (model.F_Type == "3")
|
|
7666
|
|
- {
|
|
7667
|
|
- smscont = "抽检";
|
|
7668
|
|
- }
|
|
7669
|
|
- else if (model.F_Type == "5")
|
|
7670
|
|
- {
|
|
7671
|
|
- smscont = "业务协办";
|
|
7672
|
|
- }
|
|
7673
|
|
- else
|
|
|
7713
|
+ smscont = "咨询";
|
|
|
7714
|
+ }
|
|
|
7715
|
+ else if (model.F_Type == "2")
|
|
|
7716
|
+ {
|
|
|
7717
|
+ smscont = "投诉";
|
|
|
7718
|
+ }
|
|
|
7719
|
+ else if (model.F_Type == "3")
|
|
|
7720
|
+ {
|
|
|
7721
|
+ smscont = "抽检";
|
|
|
7722
|
+ }
|
|
|
7723
|
+ else if (model.F_Type == "5")
|
|
|
7724
|
+ {
|
|
|
7725
|
+ smscont = "业务协办";
|
|
|
7726
|
+ }
|
|
|
7727
|
+ else
|
|
|
7728
|
+ {
|
|
|
7729
|
+ smscont = "建议";
|
|
|
7730
|
+ }
|
|
|
7731
|
+ string[] mag = { smscont };
|
|
|
7732
|
+ string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
|
|
|
7733
|
+ if (touser1 != null)
|
|
|
7734
|
+ {
|
|
|
7735
|
+ if (!string.IsNullOrEmpty(touser1.F_Mobile))
|
|
7674
|
7736
|
{
|
|
7675
|
|
- smscont = "建议";
|
|
|
7737
|
+
|
|
|
7738
|
+ SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser1.F_Mobile.Trim());
|
|
|
7739
|
+ bool n = new SMSController().AddSmS(touser1.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
|
|
7676
|
7740
|
}
|
|
7677
|
|
- string[] mag = { smscont };
|
|
7678
|
|
- string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
|
|
7679
|
|
- if (touser != null)
|
|
|
7741
|
+ }
|
|
|
7742
|
+ if (deptid2 > 0)
|
|
|
7743
|
+ {
|
|
|
7744
|
+ var touser2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2);
|
|
|
7745
|
+ if (!string.IsNullOrEmpty(touser2.F_Mobile))
|
|
7680
|
7746
|
{
|
|
7681
|
|
- if (!string.IsNullOrEmpty(touser.F_Mobile))
|
|
7682
|
|
- {
|
|
7683
|
7747
|
|
|
7684
|
|
- SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser.F_Mobile.Trim());
|
|
7685
|
|
- bool n = new SMSController().AddSmS(touser.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
|
|
7686
|
|
- }
|
|
|
7748
|
+ SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser2.F_Mobile.Trim());
|
|
|
7749
|
+ bool n = new SMSController().AddSmS(touser2.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
|
|
7687
|
7750
|
}
|
|
|
7751
|
+ }
|
|
7688
|
7752
|
|
|
7689
|
|
- #region 处理工单
|
|
|
7753
|
+ #region 处理工单
|
|
|
7754
|
+ if (!string.IsNullOrEmpty(creatuser1))
|
|
|
7755
|
+ {
|
|
7690
|
7756
|
model.F_State = 2;
|
|
7691
|
|
- workOrder.Update(model);
|
|
7692
|
|
- #endregion
|
|
7693
|
|
- #region 推送消息
|
|
7694
|
|
- #region 向上一级操作人员推送消息
|
|
7695
|
|
- #endregion
|
|
7696
|
|
- #endregion
|
|
7697
|
|
- return true;
|
|
7698
|
7757
|
}
|
|
7699
|
|
- else
|
|
7700
|
|
- return false;
|
|
|
7758
|
+ if (!string.IsNullOrEmpty(creatuser2))
|
|
|
7759
|
+ {
|
|
|
7760
|
+ model.F_State2 = 2;
|
|
|
7761
|
+ }
|
|
|
7762
|
+ workOrder.Update(model);
|
|
|
7763
|
+ #endregion
|
|
|
7764
|
+ #region 推送消息
|
|
|
7765
|
+ #region 向上一级操作人员推送消息
|
|
|
7766
|
+ #endregion
|
|
|
7767
|
+ #endregion
|
|
|
7768
|
+ return true;
|
|
|
7769
|
+ //}
|
|
|
7770
|
+ //else
|
|
|
7771
|
+ // return false;
|
|
7701
|
7772
|
#endregion
|
|
7702
|
7773
|
}
|
|
7703
|
7774
|
/// <summary>
|
|
|
@@ -7857,11 +7928,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7857
|
7928
|
/// </summary>
|
|
7858
|
7929
|
/// <returns></returns>
|
|
7859
|
7930
|
[Authority]
|
|
7860
|
|
- public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
|
|
|
7931
|
+ public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, string F_Files,
|
|
7861
|
7932
|
int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=1)
|
|
7862
|
7933
|
{
|
|
7863
|
7934
|
int userId = CurrentUser.UserData.F_UserId;
|
|
7864
|
7935
|
string usercode = CurrentUser.UserData.F_UserCode;
|
|
|
7936
|
+ string markdepts = "37,57,74,88,268,422,339";
|
|
|
7937
|
+ string qualdepts = "12,36,295,245";
|
|
7865
|
7938
|
if (userId != 0)
|
|
7866
|
7939
|
{
|
|
7867
|
7940
|
Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
|
|
|
@@ -7933,8 +8006,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7933
|
8006
|
{
|
|
7934
|
8007
|
return Error("请选择接收部门");
|
|
7935
|
8008
|
}
|
|
7936
|
|
- if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
|
|
|
8009
|
+ if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" || markdepts.Contains(ua.F_DeptId.ToString()))
|
|
7937
|
8010
|
{
|
|
|
8011
|
+ if (markdepts.Contains(ua.F_DeptId.ToString()))
|
|
|
8012
|
+ {
|
|
|
8013
|
+ if (model.F_Type == "2" || model.F_Type == "5")
|
|
|
8014
|
+ {
|
|
|
8015
|
+ input.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
|
|
|
8016
|
+ input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
|
|
|
8017
|
+ }
|
|
|
8018
|
+ else if (model.F_Type == "3")
|
|
|
8019
|
+ {
|
|
|
8020
|
+ input.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
|
|
|
8021
|
+ input.F_SC_CJ_SelfResult = deptment.SelfResult;//市场管理科-抽检-自检结果
|
|
|
8022
|
+ input.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
|
|
|
8023
|
+ input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
|
|
|
8024
|
+ }
|
|
|
8025
|
+ }
|
|
7938
|
8026
|
model.F_Flag = flag;
|
|
7939
|
8027
|
if (flag == 3)
|
|
7940
|
8028
|
{
|
|
|
@@ -7942,9 +8030,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7942
|
8030
|
{
|
|
7943
|
8031
|
return Error("请选择接收部门");
|
|
7944
|
8032
|
|
|
7945
|
|
- }
|
|
7946
|
|
- var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
|
|
7947
|
|
- var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2);
|
|
|
8033
|
+ }
|
|
|
8034
|
+ var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
|
|
|
8035
|
+ var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
|
|
7948
|
8036
|
|
|
7949
|
8037
|
}
|
|
7950
|
8038
|
else if (flag == 2)
|
|
|
@@ -7953,8 +8041,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7953
|
8041
|
{
|
|
7954
|
8042
|
return Error("请选择接收部门");
|
|
7955
|
8043
|
}
|
|
7956
|
|
- var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2);
|
|
7957
|
|
- DealWO(ua, model, input, cont, "", 1, "", 1, "");
|
|
|
8044
|
+ var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
|
|
|
8045
|
+ DealWO(ua, model, input, cont, "", 1, "", 1, "",flag);
|
|
7958
|
8046
|
}
|
|
7959
|
8047
|
else
|
|
7960
|
8048
|
{
|
|
|
@@ -7962,8 +8050,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7962
|
8050
|
{
|
|
7963
|
8051
|
return Error("请选择接收部门");
|
|
7964
|
8052
|
}
|
|
7965
|
|
- var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
|
|
7966
|
|
- DealWO(ua, model, input, cont, "", 1, "", 2, "");
|
|
|
8053
|
+ var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
|
|
|
8054
|
+ DealWO(ua, model, input, cont, "", 1, "", 2, "",flag);
|
|
7967
|
8055
|
}
|
|
7968
|
8056
|
return Success("转派成功");
|
|
7969
|
8057
|
}
|
|
|
@@ -7980,22 +8068,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7980
|
8068
|
{
|
|
7981
|
8069
|
if (model != null)
|
|
7982
|
8070
|
{
|
|
7983
|
|
- if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
|
|
|
8071
|
+ if (qualdepts.Contains(ua.F_DeptId.ToString()))
|
|
7984
|
8072
|
{
|
|
7985
|
8073
|
input.F_WorkmanShip = deptment.WorkmanShip;//质量管理科-工艺
|
|
7986
|
8074
|
input.F_Manufacturers = deptment.Manufacturers;//质量管理科-原料及厂家
|
|
7987
|
8075
|
input.F_ProductionNum = deptment.ProductionNum;//质量管理科-该批次生产数量
|
|
7988
|
8076
|
}
|
|
7989
|
|
- if (model.F_Type == "2" || model.F_Type=="5")
|
|
|
8077
|
+ if (model.F_Type == "2" || model.F_Type == "5")
|
|
7990
|
8078
|
{
|
|
7991
|
|
- if (deptmodel.F_DeptId == 37)
|
|
|
8079
|
+ if (markdepts.Contains(ua.F_DeptId.ToString()))
|
|
7992
|
8080
|
{
|
|
7993
|
8081
|
// input. F_SC_QualityMonth = QualityMonth;//市场管理科-超出质保期限
|
|
7994
|
8082
|
input.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
|
|
7995
|
8083
|
}
|
|
7996
|
|
- else if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
|
|
|
8084
|
+ else if (qualdepts.Contains(ua.F_DeptId.ToString()))
|
|
7997
|
8085
|
{
|
|
7998
|
|
- input.F_IsVisit = isvisit.ToString();
|
|
|
8086
|
+ //input.F_IsVisit = isvisit.ToString();
|
|
7999
|
8087
|
input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
|
|
8000
|
8088
|
input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
|
|
8001
|
8089
|
input.F_ZL_ApprovalOpinions = deptment.ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
|
|
|
@@ -8014,7 +8102,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8014
|
8102
|
//input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
|
|
8015
|
8103
|
|
|
8016
|
8104
|
}
|
|
8017
|
|
- else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货") //退换货成品库录入物料信息
|
|
|
8105
|
+ else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货") //退换货成品库录入物料信息
|
|
8018
|
8106
|
{
|
|
8019
|
8107
|
//if (string.IsNullOrEmpty(jsonstr))
|
|
8020
|
8108
|
//{
|
|
|
@@ -8034,7 +8122,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8034
|
8122
|
itemodel.F_MaterialCode = item.materialcode;
|
|
8035
|
8123
|
itemodel.F_MaterialName = item.materialname;
|
|
8036
|
8124
|
itemodel.F_Formula = item.formula;
|
|
8037
|
|
- itemodel.F_ReturnQuantity = item.returnum??0;
|
|
|
8125
|
+ itemodel.F_ReturnQuantity = item.returnum ?? 0;
|
|
8038
|
8126
|
itemodel.F_WoID = model.F_ID;//工单id
|
|
8039
|
8127
|
itemodel.F_CreateOn = DateTime.Now;
|
|
8040
|
8128
|
itemodel.F_Remark = item.specs;//规格
|
|
|
@@ -8046,10 +8134,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8046
|
8134
|
}
|
|
8047
|
8135
|
|
|
8048
|
8136
|
}
|
|
8049
|
|
- else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货" )
|
|
|
8137
|
+ else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
|
|
8050
|
8138
|
{
|
|
8051
|
8139
|
input.F_CarNumber = deptment.CarNumber;//返厂车牌号
|
|
8052
|
|
- input.F_LoadingFee= deptment.LoadingFee;//装车费
|
|
|
8140
|
+ input.F_LoadingFee = deptment.LoadingFee;//装车费
|
|
8053
|
8141
|
input.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
|
|
8054
|
8142
|
input.F_MaterialFee = deptment.MaterialFee;//返料费
|
|
8055
|
8143
|
input.F_DrivePhone = deptment.DrivePhone;//电话号码
|
|
|
@@ -8089,7 +8177,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8089
|
8177
|
}
|
|
8090
|
8178
|
else if (model.F_Type == "3")
|
|
8091
|
8179
|
{
|
|
8092
|
|
- if (deptmodel.F_DeptId == 37)
|
|
|
8180
|
+ if (markdepts.Contains(ua.F_DeptId.ToString()))
|
|
8093
|
8181
|
{
|
|
8094
|
8182
|
|
|
8095
|
8183
|
input.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
|
|
|
@@ -8097,9 +8185,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8097
|
8185
|
input.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
|
|
8098
|
8186
|
input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
|
|
8099
|
8187
|
}
|
|
8100
|
|
- else if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
|
|
|
8188
|
+ else if(qualdepts.Contains(ua.F_DeptId.ToString()))
|
|
8101
|
8189
|
{
|
|
8102
|
|
- input.F_IsVisit = isvisit.ToString();
|
|
|
8190
|
+ //input.F_IsVisit = isvisit.ToString();
|
|
8103
|
8191
|
input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
|
|
8104
|
8192
|
input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
|
|
8105
|
8193
|
}
|
|
|
@@ -8302,6 +8390,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8302
|
8390
|
input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
|
|
8303
|
8391
|
//input.F_EventReason = deptment.EventReason;// 事件原因
|
|
8304
|
8392
|
input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
|
|
|
8393
|
+ input.F_IsVisit = isvisit.ToString();
|
|
8305
|
8394
|
|
|
8306
|
8395
|
}
|
|
8307
|
8396
|
#region nouser
|
|
|
@@ -8957,6 +9046,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8957
|
9046
|
{
|
|
8958
|
9047
|
#region 工单处理
|
|
8959
|
9048
|
int sms = 0;
|
|
|
9049
|
+ string markdepts = "37,57,74,88,268,422,339";
|
|
8960
|
9050
|
var itemlasts = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoID=" + model.F_ID + " ");
|
|
8961
|
9051
|
if (itemlasts.Count > 0)
|
|
8962
|
9052
|
{
|
|
|
@@ -8998,9 +9088,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
8998
|
9088
|
strsql = "";
|
|
8999
|
9089
|
}
|
|
9000
|
9090
|
|
|
9001
|
|
- var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_IsUsed=0 and F_WoState =" + F_OptType + " and F_WoID='" + model.F_ID + "'"+strsql+" order by F_ID desc");
|
|
|
9091
|
+ var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_IsUsed=0 and F_WoState =" + F_OptType + " and F_WoID='" + model.F_ID + "'and F_CreateUser='"+nowUser.F_UserCode+"' order by F_ID desc");
|
|
9002
|
9092
|
if (itemlast != null && itemlast.Count>0)
|
|
9003
|
|
- {
|
|
|
9093
|
+ {
|
|
|
9094
|
+ if (markdepts.Contains(nowUser.F_DeptId.ToString()))
|
|
|
9095
|
+ {
|
|
|
9096
|
+ var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =" + F_OptType + " and F_WoID='" + model.F_ID + "'and F_NextUser like '%" + nowUser.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
|
|
|
9097
|
+ if (itemlast.Count == 2 || itemnext.F_Flag == 9)
|
|
|
9098
|
+ {
|
|
|
9099
|
+ flag = 3;
|
|
|
9100
|
+ model.F_Flag = 9;
|
|
|
9101
|
+ }
|
|
|
9102
|
+ }
|
|
9004
|
9103
|
foreach (var item in itemlast)
|
|
9005
|
9104
|
{
|
|
9006
|
9105
|
touser = item.F_NextUser;
|
|
|
@@ -9129,12 +9228,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9129
|
9228
|
var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
|
|
9130
|
9229
|
if (itemlast != null)
|
|
9131
|
9230
|
touser = itemlast.F_CreateUser;
|
|
9132
|
|
- var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
|
|
9133
|
|
- if (itemid > 0)
|
|
|
9231
|
+ var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}");
|
|
|
9232
|
+ if (itemlist.Count > 0)
|
|
|
9233
|
+ {
|
|
|
9234
|
+ foreach (var item in itemlist)
|
|
|
9235
|
+ {
|
|
|
9236
|
+ if (item.F_Type == 1)
|
|
|
9237
|
+ {
|
|
|
9238
|
+ model.F_State = wostate;
|
|
|
9239
|
+ }
|
|
|
9240
|
+ else if (item.F_Type == 2)
|
|
|
9241
|
+ {
|
|
|
9242
|
+ model.F_State2 = wostate;
|
|
|
9243
|
+ }
|
|
|
9244
|
+ }
|
|
|
9245
|
+ AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
|
|
|
9246
|
+ }
|
|
|
9247
|
+ //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
|
|
|
9248
|
+ if (itemlist.Count > 0)
|
|
9134
|
9249
|
{
|
|
9135
|
9250
|
#region 处理工单
|
|
9136
|
|
- model.F_State = wostate;
|
|
9137
|
|
- model.F_State2 = wostate;
|
|
|
9251
|
+ //model.F_State = wostate;
|
|
|
9252
|
+ //model.F_State2 = wostate;
|
|
9138
|
9253
|
model.F_VisitOn = DateTime.Now;
|
|
9139
|
9254
|
model.F_VisitResult = cont;
|
|
9140
|
9255
|
model.F_VisitBy = nowUser.F_UserCode;
|
|
|
@@ -9148,7 +9263,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9148
|
9263
|
#region 向上一级操作人员推送消息
|
|
9149
|
9264
|
if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
|
|
9150
|
9265
|
{//排除上一级指派人是自己
|
|
9151
|
|
- sendsysmsg(model, nowUser, touser, (int)itemid, opt);
|
|
|
9266
|
+ sendsysmsg(model, nowUser, touser, 0, opt);
|
|
9152
|
9267
|
var lastUser = sysUserAccountBll.GetModel(touser);
|
|
9153
|
9268
|
//if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
|
|
9154
|
9269
|
// sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
|
|
|
@@ -9202,20 +9317,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9202
|
9317
|
var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
|
|
9203
|
9318
|
if (itemlast != null)
|
|
9204
|
9319
|
touser = itemlast.F_CreateUser;
|
|
9205
|
|
- var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
|
|
9206
|
|
- if (itemid > 0)
|
|
|
9320
|
+ var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}");
|
|
|
9321
|
+ if (itemlist.Count > 0)
|
|
|
9322
|
+ {
|
|
|
9323
|
+ foreach (var item in itemlist)
|
|
|
9324
|
+ {
|
|
|
9325
|
+ if (item.F_Type == 1 && model.F_State!=(int)EnumWorkOrderState.evaluate)
|
|
|
9326
|
+ {
|
|
|
9327
|
+ model.F_State = wostate;
|
|
|
9328
|
+ AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 1);
|
|
|
9329
|
+ }
|
|
|
9330
|
+ else if (item.F_Type == 2 && model.F_State2 != (int)EnumWorkOrderState.evaluate)
|
|
|
9331
|
+ {
|
|
|
9332
|
+ model.F_State2 = wostate;
|
|
|
9333
|
+ AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 2);
|
|
|
9334
|
+ }
|
|
|
9335
|
+ }
|
|
|
9336
|
+ }
|
|
|
9337
|
+ //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
|
|
|
9338
|
+ if (itemlist.Count > 0)
|
|
9207
|
9339
|
{
|
|
9208
|
9340
|
#region 处理工单
|
|
9209
|
9341
|
model.F_VisitOn = DateTime.Now;
|
|
9210
|
|
- model.F_State = wostate;
|
|
9211
|
|
- model.F_State2 = wostate;
|
|
|
9342
|
+ //model.F_State = wostate;
|
|
|
9343
|
+ //model.F_State2 = wostate;
|
|
9212
|
9344
|
workOrder.Update(model);
|
|
9213
|
9345
|
#endregion
|
|
9214
|
9346
|
#region 推送消息
|
|
9215
|
9347
|
#region 向上一级操作人员推送消息
|
|
9216
|
9348
|
if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
|
|
9217
|
9349
|
{//排除上一级指派人是自己
|
|
9218
|
|
- sendsysmsg(model, nowUser, touser, (int)itemid, opt);
|
|
|
9350
|
+ sendsysmsg(model, nowUser, touser, 0, opt);
|
|
9219
|
9351
|
// var lastUser = sysUserAccountBll.GetModel(touser);
|
|
9220
|
9352
|
//if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
|
|
9221
|
9353
|
// sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
|
|
|
@@ -9233,7 +9365,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9233
|
9365
|
/// <summary>
|
|
9234
|
9366
|
/// 处理工单
|
|
9235
|
9367
|
/// </summary>
|
|
9236
|
|
- public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,string eventreason="")
|
|
|
9368
|
+ public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,string eventreason="",int flagstate=0)
|
|
9237
|
9369
|
{
|
|
9238
|
9370
|
#region 工单处理
|
|
9239
|
9371
|
int sms = 0;
|
|
|
@@ -9283,7 +9415,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9283
|
9415
|
if (!string.IsNullOrEmpty(cont))
|
|
9284
|
9416
|
optcont = "，处理内容：" + cont;
|
|
9285
|
9417
|
var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
|
|
9286
|
|
- var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag);
|
|
|
9418
|
+ var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag, flagstate);
|
|
9287
|
9419
|
if (itemid > 0)
|
|
9288
|
9420
|
{
|
|
9289
|
9421
|
#region 处理工单
|
|
|
@@ -9616,7 +9748,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9616
|
9748
|
/// <summary>
|
|
9617
|
9749
|
/// 转派工单
|
|
9618
|
9750
|
/// </summary>
|
|
9619
|
|
- public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "", int isbl = 0, int flag = 1)
|
|
|
9751
|
+ public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "", int isbl = 0, int flag = 1,int flagstate=0)
|
|
9620
|
9752
|
{
|
|
9621
|
9753
|
#region 系统升级派单时限可修改2021/12/24
|
|
9622
|
9754
|
//if (model.F_limit > 0)
|
|
|
@@ -9769,7 +9901,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9769
|
9901
|
if (!string.IsNullOrEmpty(cont))
|
|
9770
|
9902
|
optcont = "，说明：" + cont;
|
|
9771
|
9903
|
var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
|
|
9772
|
|
- var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat, 0, flag);
|
|
|
9904
|
+ var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat, 0, flag, flagstate);
|
|
9773
|
9905
|
if (itemid > 0)
|
|
9774
|
9906
|
{
|
|
9775
|
9907
|
#region 处理工单
|
