|
|
@@ -350,26 +350,32 @@ namespace CallCenterApi.Interface.Controllers.archives
|
|
350
|
350
|
|
|
351
|
351
|
//根据获取到的状态id修改物资状态
|
|
352
|
352
|
var upstate = archivesbll.updateState(Convert.ToInt32(customerBorrow.archivesid), stateid);
|
|
|
353
|
+ //获取用户名称
|
|
|
354
|
+ var customername = "";
|
|
|
355
|
+ if (archivesbll.GetCustomerName(customerBorrow.openid) != "")
|
|
|
356
|
+ {
|
|
|
357
|
+ customername = archivesbll.GetCustomerName(customerBorrow.openid);
|
|
|
358
|
+ }
|
|
353
|
359
|
|
|
354
|
360
|
///添加客户操作信息
|
|
355
|
361
|
model.archivesid = customerBorrow.archivesid;//物品编号
|
|
356
|
362
|
model.BorrowOreturn = customerBorrow.BorrowOreturn;//区分借阅还是归还
|
|
357
|
363
|
model.BorrowDate = DateTime.Now;//客户操作时间
|
|
358
|
|
- model.BorrowPeople = CurrentUser.UserData.F_UserCode;// CurrentUser.UserData.F_UserCode ; //操作人customerBorrow.BorrowPeople
|
|
|
364
|
+ model.BorrowPeople = customername;// CurrentUser.UserData.F_UserCode ; //操作人customerBorrow.BorrowPeople
|
|
359
|
365
|
var archivesid = customerBorrow.archivesid;
|
|
360
|
366
|
if (archivesbll.AddCustomerBorrow(model) > 0)
|
|
361
|
367
|
{
|
|
362
|
368
|
var Operationlogmodel = new CallCenterApi.Interface.Models.Input.OperationlogInput();
|
|
363
|
|
- Operationlogmodel.Operator = CurrentUser.UserData.F_UserCode;
|
|
|
369
|
+ Operationlogmodel.Operator = customername;// CurrentUser.UserData.F_UserCode;
|
|
364
|
370
|
Operationlogmodel.OperationDate = DateTime.Now;
|
|
365
|
371
|
Operationlogmodel.OperationContent = "添加了一条借阅归还信息";
|
|
366
|
372
|
Operationlogmodel.archivesid = archivesid;
|
|
367
|
373
|
AddorUpdOperationlog(Operationlogmodel);
|
|
368
|
|
- return Success("添加成功" + ",操作人:" + CurrentUser.UserData.F_UserCode);
|
|
|
374
|
+ return Success("添加成功" + ",操作人:" + customername);
|
|
369
|
375
|
}
|
|
370
|
376
|
else
|
|
371
|
377
|
{
|
|
372
|
|
- return Error("添加失败" + ",操作人:" + CurrentUser.UserData.F_UserCode);
|
|
|
378
|
+ return Error("添加失败" + ",操作人:" + customername);
|
|
373
|
379
|
}
|
|
374
|
380
|
}
|
|
375
|
381
|
else
|
|
|
@@ -643,13 +649,13 @@ namespace CallCenterApi.Interface.Controllers.archives
|
|
643
|
649
|
|
|
644
|
650
|
|
|
645
|
651
|
var model = new CallCenterApi.Model.Operationlog();
|
|
646
|
|
- model.Operator = CurrentUser.UserData.F_UserCode;//操作人
|
|
|
652
|
+ model.Operator = Operationlog.Operator;//操作人
|
|
647
|
653
|
model.OperationContent = Operationlog.OperationContent;//操作内容
|
|
648
|
654
|
model.OperationDate = DateTime.Now;//操作时间
|
|
649
|
655
|
model.archivesid = Operationlog.archivesid;
|
|
650
|
656
|
if (archivesbll.AddOperationlog(model) > 0)
|
|
651
|
|
- return Success("添加成功" + ",操作人:" + CurrentUser.UserData.F_UserCode);
|
|
652
|
|
- return Error("添加失败" + ",操作人:" + CurrentUser.UserData.F_UserCode);
|
|
|
657
|
+ return Success("添加成功" + ",操作人:" + Operationlog.Operator);
|
|
|
658
|
+ return Error("添加失败" + ",操作人:" + Operationlog.Operator);
|
|
653
|
659
|
|
|
654
|
660
|
}
|
|
655
|
661
|
|