|
|
@ -438,18 +438,36 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta |
|
|
|
serialOrderStatusLi = append(serialOrderStatusLi, serialStatus) |
|
|
|
} |
|
|
|
log.Debug("InsertFromWorkOrder SerialOrder insert serial order, workOrderID:"+workOrderId+" length: "+strconv.Itoa(len(serialOrderLi))+" workOrder.PlanQty: ", strconv.Itoa(int(workOrder.PlanQty))) |
|
|
|
err = dao.Insert(&serialOrderLi) |
|
|
|
if err != nil { |
|
|
|
log.Error("InsertFromWorkOrder SerialOrder Insert serialOrderLi failed, error: " + err.Error()) |
|
|
|
session.Rollback() |
|
|
|
return nil, err |
|
|
|
for _, serialOrder := range serialOrderLi { |
|
|
|
err = dao.InsertOne(&serialOrder) |
|
|
|
if err != nil { |
|
|
|
log.Error("InsertFromWorkOrder SerialOrder Insert serialOrder failed, error: " + err.Error()) |
|
|
|
session.Rollback() |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
err = serialOrderStatusDao.Insert(&serialOrderStatusLi) |
|
|
|
if err != nil { |
|
|
|
log.Error("InsertFromWorkOrder SerialOrder Insert serialOrderStatusLi failed, error: " + err.Error()) |
|
|
|
session.Rollback() |
|
|
|
return nil, err |
|
|
|
for _, serialOrderStatus := range serialOrderStatusLi { |
|
|
|
err = serialOrderStatusDao.InsertOne(&serialOrderStatus) |
|
|
|
if err != nil { |
|
|
|
log.Error("InsertFromWorkOrder SerialOrder Insert serialOrderStatus failed, error: " + err.Error()) |
|
|
|
session.Rollback() |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//err = dao.Insert(&serialOrderLi)
|
|
|
|
//if err != nil {
|
|
|
|
// log.Error("InsertFromWorkOrder SerialOrder Insert serialOrderLi failed, error: " + err.Error())
|
|
|
|
// session.Rollback()
|
|
|
|
// return nil, err
|
|
|
|
//}
|
|
|
|
|
|
|
|
//err = serialOrderStatusDao.Insert(&serialOrderStatusLi)
|
|
|
|
//if err != nil {
|
|
|
|
// log.Error("InsertFromWorkOrder SerialOrder Insert serialOrderStatusLi failed, error: " + err.Error())
|
|
|
|
// session.Rollback()
|
|
|
|
// return nil, err
|
|
|
|
//}
|
|
|
|
workOrderStatusRec := model.WorkOrderStatusRecLst{ |
|
|
|
WorkOrderId: workOrderId, |
|
|
|
PrevStatus: workOrderStatus.Status, |
|
|
|