|
|
@@ -374,10 +374,11 @@ func (s DeliverOrderProgressService) StartDeliverGoodsProgress(ctx context.Conte
|
|
|
assembleProgress.StartDate = deliverProgress.StartDate
|
|
|
assembleProgress.EndDate = deliverProgress.EndDate
|
|
|
assembleProgress.ProgressLevel = deliverProgress.ProgressLevel
|
|
|
- assembleProgress.PrincipalPersonId, assembleProgress.PrincipalPerson, err = s.getUserInfo("王志强")
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //assembleProgress.PrincipalPersonId, assembleProgress.PrincipalPerson, err = s.getUserInfo("于洋")
|
|
|
+ //if err != nil {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
+ assembleProgress.PrincipalPersonId, assembleProgress.PrincipalPerson = 1052, "于洋"
|
|
|
service.SetCreatedInfo(&assembleProgress, s.userInfo.Id, s.userInfo.NickName)
|
|
|
|
|
|
var indexArr []int
|
|
|
@@ -513,10 +514,11 @@ func (s DeliverOrderProgressService) DeliverGoods(ctx context.Context, req *work
|
|
|
insProgress.ProgressLevel = "10" // 优先级
|
|
|
insProgress.ProgressType = "30" // 10发货任务单/20组装任务单/30部署安装单
|
|
|
if insProgress.PrincipalPerson == "" {
|
|
|
- insProgress.PrincipalPersonId, insProgress.PrincipalPerson, err = s.getUserInfo("王志强")
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //insProgress.PrincipalPersonId, insProgress.PrincipalPerson, err = s.getUserInfo("于洋")
|
|
|
+ //if err != nil {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
+ insProgress.PrincipalPersonId, insProgress.PrincipalPerson = 1052, "于洋"
|
|
|
}
|
|
|
service.SetCreatedInfo(&insProgress, s.userInfo.Id, s.userInfo.NickName)
|
|
|
|
|
|
@@ -570,10 +572,11 @@ func (s DeliverOrderProgressService) StartInstallProgress(ctx context.Context, r
|
|
|
progress.ProgressStatus = "10" // 状态(10未开始20进行中30已完成)
|
|
|
progress.ProgressType = "30" // 10发货任务单/20组装任务单/30部署安装单
|
|
|
if progress.PrincipalPerson == "" {
|
|
|
- progress.PrincipalPersonId, progress.PrincipalPerson, err = s.getUserInfo("王志强")
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
+ //progress.PrincipalPersonId, progress.PrincipalPerson, err = s.getUserInfo("于洋")
|
|
|
+ //if err != nil {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
+ progress.PrincipalPersonId, progress.PrincipalPerson = 1052, "于洋"
|
|
|
}
|
|
|
service.SetCreatedInfo(&progress, s.userInfo.Id, s.userInfo.NickName)
|
|
|
|