|
|
@ -3,10 +3,8 @@ |
|
|
|
package implments |
|
|
|
|
|
|
|
import ( |
|
|
|
apiDal "LAPP_LF_MOM_BACKEND/dao/api" |
|
|
|
baseDal "LAPP_LF_MOM_BACKEND/dao/base" |
|
|
|
meDal "LAPP_LF_MOM_BACKEND/dao/me" |
|
|
|
apiMeta "LAPP_LF_MOM_BACKEND/meta/api" |
|
|
|
baseMeta "LAPP_LF_MOM_BACKEND/meta/base" |
|
|
|
"github.com/go-xorm/xorm" |
|
|
|
"strings" |
|
|
@ -853,44 +851,6 @@ func (impl WorkOrderServiceImplement) CancelWorkOrder(user *models.Usertab, work |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
slaves := db.Eloquent.Slaves() |
|
|
|
if len(slaves) == 0 { |
|
|
|
return grmi.NewBusinessError("未获取到mes的数据库") |
|
|
|
} |
|
|
|
mesEngine := slaves[0] |
|
|
|
mesSession := mesEngine.NewSession() |
|
|
|
defer mesSession.Close() |
|
|
|
if err = mesSession.Begin(); err != nil { |
|
|
|
_ = session.Rollback() |
|
|
|
_ = mesSession.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
headerDao := apiDal.NewACCWOWORKORDERHEADERDAO(mesSession, user.Userid) |
|
|
|
mesWorkOrderLi, err := headerDao.Select([]grmi.Predicate{apiMeta.ACCWOWORKORDERHEADER_WONO.NewPredicate(grmi.Equal, workOrderId)}, nil, 1) |
|
|
|
if err != nil { |
|
|
|
_ = mesSession.Rollback() |
|
|
|
_ = session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
if len(mesWorkOrderLi) == 0 { |
|
|
|
_ = mesSession.Rollback() |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError("未从mes系统获取到workOrder") |
|
|
|
} |
|
|
|
mesWorkOrder := mesWorkOrderLi[0] |
|
|
|
preQty := mesWorkOrder.QUANTITY |
|
|
|
mesWorkOrder.QUANTITY += int(qty) |
|
|
|
if mesWorkOrder.QUANTITY == mesWorkOrder.PLANQUANTITY { |
|
|
|
mesWorkOrder.STATUS = model.MesOrderStatusAccomplished |
|
|
|
mesWorkOrder.FINISHTIME = grmi.DateTime(time.Now()) |
|
|
|
} |
|
|
|
err = headerDao.UpdateForQty(&mesWorkOrder, preQty) |
|
|
|
if err != nil { |
|
|
|
_ = mesSession.Rollback() |
|
|
|
_ = session.Rollback() |
|
|
|
return err |
|
|
|
} |
|
|
|
_ = mesSession.Commit() |
|
|
|
_ = session.Commit() |
|
|
|
return nil |
|
|
|
|
|
|
|