|
|
@ -790,10 +790,10 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) |
|
|
|
} |
|
|
|
poDataMap := make(map[string]*baseModel.Process) |
|
|
|
poDataMap := make(map[string]baseModel.Process) |
|
|
|
allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) |
|
|
|
for _, po := range usedPoLi { |
|
|
|
poDataMap[po.PO] = &po |
|
|
|
poDataMap[po.PO] = po |
|
|
|
allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) |
|
|
|
} |
|
|
|
sfpUsedPoMap := make(map[string]interface{}) |
|
|
@ -2153,11 +2153,10 @@ func (impl *SerialOrderServiceImplement) ChangeOrderSchedKey(user *global.User, |
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
|
// GetOrderPOLi 获取工序所有的后序
|
|
|
|
func (impl *SerialOrderServiceImplement) GetOrderPOLi(poData *baseModel.Process, allPoMap map[string]*baseModel.Process) []*baseModel.Process { |
|
|
|
prePoLi := strings.Split(",", poData.PrePO) |
|
|
|
|
|
|
|
prePoDataLi := make([]*baseModel.Process, 0, len(prePoLi)) |
|
|
|
// GetOrderPOLi 获取工序所有的前序
|
|
|
|
func (impl *SerialOrderServiceImplement) GetOrderPOLi(poData baseModel.Process, allPoMap map[string]baseModel.Process) []baseModel.Process { |
|
|
|
prePoLi := strings.Split(poData.PrePO, ",") |
|
|
|
prePoDataLi := make([]baseModel.Process, 0, len(prePoLi)) |
|
|
|
for _, poId := range prePoLi { |
|
|
|
prePoData, exist := allPoMap[poId] |
|
|
|
if exist { |
|
|
@ -2287,11 +2286,11 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) |
|
|
|
} |
|
|
|
poDataMap := make(map[string]*baseModel.Process) |
|
|
|
poDataMap := make(map[string]baseModel.Process) |
|
|
|
allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) |
|
|
|
|
|
|
|
for _, po := range usedPoLi { |
|
|
|
poDataMap[po.PO] = &po |
|
|
|
poDataMap[po.PO] = po |
|
|
|
allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) |
|
|
|
} |
|
|
|
sfpUsedPoMap := make(map[string]interface{}) |
|
|
@ -2781,11 +2780,11 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se |
|
|
|
if err != nil { |
|
|
|
return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) |
|
|
|
} |
|
|
|
poDataMap := make(map[string]*baseModel.Process) |
|
|
|
poDataMap := make(map[string]baseModel.Process) |
|
|
|
allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) |
|
|
|
|
|
|
|
for _, po := range usedPoLi { |
|
|
|
poDataMap[po.PO] = &po |
|
|
|
poDataMap[po.PO] = po |
|
|
|
allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) |
|
|
|
} |
|
|
|
sfpUsedPoMap := make(map[string]interface{}) |
|
|
|