|
|
@ -428,7 +428,7 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta |
|
|
PlanEndTime: grmi.DateTime(planEndTime), |
|
|
PlanEndTime: grmi.DateTime(planEndTime), |
|
|
ActStartTime: workOrder.ActStartTime, |
|
|
ActStartTime: workOrder.ActStartTime, |
|
|
ActEndTime: workOrder.ActEndTime, |
|
|
ActEndTime: workOrder.ActEndTime, |
|
|
ProjectId: workOrderId, |
|
|
|
|
|
|
|
|
ProjectId: workOrder.ProjectId, |
|
|
} |
|
|
} |
|
|
serialOrderLi = append(serialOrderLi, serialOrder) |
|
|
serialOrderLi = append(serialOrderLi, serialOrder) |
|
|
serialStatus := model.SerialOrderStatus{ |
|
|
serialStatus := model.SerialOrderStatus{ |
|
|
@ -450,15 +450,8 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta |
|
|
session.Rollback() |
|
|
session.Rollback() |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
//maxPos, err := workOrderStatusRecDao.GetMaxPos(workOrderId)
|
|
|
|
|
|
//if err != nil {
|
|
|
|
|
|
// log.Error("InsertFromWorkOrder SerialOrder workOrderStatusRecDao GetMaxPos failed, error: " + err.Error())
|
|
|
|
|
|
// session.Rollback()
|
|
|
|
|
|
// return nil, err
|
|
|
|
|
|
//}
|
|
|
|
|
|
workOrderStatusRec := model.WorkOrderStatusRecLst{ |
|
|
workOrderStatusRec := model.WorkOrderStatusRecLst{ |
|
|
WorkOrderId: workOrderId, |
|
|
WorkOrderId: workOrderId, |
|
|
//Pos: maxPos + 1,
|
|
|
|
|
|
PrevStatus: workOrderStatus.Status, |
|
|
PrevStatus: workOrderStatus.Status, |
|
|
Status: baseModel.WO_STATUS_LOCKED, |
|
|
Status: baseModel.WO_STATUS_LOCKED, |
|
|
StartTime: workOrder.PlanStartTime, |
|
|
StartTime: workOrder.PlanStartTime, |
|
|
|
