diff --git a/services/om/SerialOrder.service.go b/services/om/SerialOrder.service.go index d52ccbc..b350e52 100644 --- a/services/om/SerialOrder.service.go +++ b/services/om/SerialOrder.service.go @@ -454,7 +454,7 @@ type SerialOrderService interface { CancelMultiSerialOrder(user *global.User, serialOrderIdLi []string) error GetProductTraceDataReport(user *global.User, serialOrderId string) (interface{}, error) GenerateProductCraft(user *global.User, session *xorm.Session, serialOrder *model.SerialOrder) error - ReplaceData(serialOrder *model.SerialOrder, serialNumber string, isPre bool) + ReplaceData(serialOrder *model.SerialOrder, serialNumber string, day string, isPre bool) // BreakUp 骨架拆解 BreakUp(user *global.User, barcode string) (err error) diff --git a/services/om/implments/SerialOrder.Logic.impl.go b/services/om/implments/SerialOrder.Logic.impl.go index 3c267b5..1b6de45 100644 --- a/services/om/implments/SerialOrder.Logic.impl.go +++ b/services/om/implments/SerialOrder.Logic.impl.go @@ -252,7 +252,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use _ = session.Rollback() return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error()) } - impl.ReplaceData(&serialOrder, serialNumber, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE) + day := serialOrder.PlanStartTime.Restore().Format("060102") + impl.ReplaceData(&serialOrder, serialNumber, day, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE) preOrderLi := make([]model.SerialOrder, 0) for _, preOrder := range serialOrder.PreOrderLi { if preOrder.OrderType == baseModel.ORDER_TYPE_CROSS { @@ -266,7 +267,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use _ = session.Rollback() return grmi.NewBusinessError("获取流水号失败,错误:" + err.Error()) } - impl.ReplaceData(&preOrder, serialNumber, true) + day := preOrder.PlanStartTime.Restore().Format("060102") + impl.ReplaceData(&preOrder, serialNumber, day,true) preOrderLi = append(preOrderLi, preOrder) } serialOrder.PreOrderLi = preOrderLi @@ -425,8 +427,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use } // ReplaceData 替换工单数据中的工单ID -func (impl *SerialOrderServiceImplement) ReplaceData(serialOrder *model.SerialOrder, serialNumber string, isPre bool) { - day := serialOrder.PlanStartTime.Restore().Format("060102") +func (impl *SerialOrderServiceImplement) ReplaceData(serialOrder *model.SerialOrder, serialNumber string, day string, isPre bool) { + //day := serialOrder.PlanStartTime.Restore().Format("060102") serialOrderId := strings.Replace(serialOrder.SerialOrderId, "$serialNumber$", serialNumber, 1) if isPre { serialOrderId = strings.Replace(serialOrderId, "$date$", day, 1) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 4638d71..782b8f1 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -948,10 +948,12 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error() + ", 流水号Id:" + product.SerialOrderSnr) } } - serialOrderSvr.ReplaceData(&serialOrder, serialNumber, isPre) + waitReleaseSerialOrderLi[0].PlanStartTime.Restore() + day := waitReleaseSerialOrderLi[0].PlanStartTime.Restore().Format("060102") + serialOrderSvr.ReplaceData(&serialOrder, serialNumber, day, isPre) for index, preOrder := range serialOrder.PreOrderLi { preOrder.MainOrderId = serialOrder.SerialOrderId - serialOrderSvr.ReplaceData(&preOrder, preSerialNumber, true) + serialOrderSvr.ReplaceData(&preOrder, preSerialNumber, day, true) serialOrder.PreOrderLi[index] = preOrder } writeSerialOrderLi = append(writeSerialOrderLi, serialOrder)