From d58fe5f0957664780f1da03d520cbecab374c3f6 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 21 Jul 2022 13:25:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=93=81=E6=97=B6=E8=B7=A8=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E8=A3=85=E4=B8=8D=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/implments/SerialOrder.Logic.impl.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/om/implments/SerialOrder.Logic.impl.go b/services/om/implments/SerialOrder.Logic.impl.go index 9f1cef8..3c267b5 100644 --- a/services/om/implments/SerialOrder.Logic.impl.go +++ b/services/om/implments/SerialOrder.Logic.impl.go @@ -253,7 +253,11 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error()) } impl.ReplaceData(&serialOrder, serialNumber, product.CtrlStr1==meModel.PRODUCT_TYPE_PRE) - for index, preOrder := range serialOrder.PreOrderLi { + preOrderLi := make([]model.SerialOrder, 0) + for _, preOrder := range serialOrder.PreOrderLi { + if preOrder.OrderType == baseModel.ORDER_TYPE_CROSS { + continue + } preOrder.MainOrderId = serialOrder.SerialOrderId preOrder.SchedKey = serialOrder.SchedKey preOrder.Priority = serialOrder.Priority @@ -263,8 +267,9 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use return grmi.NewBusinessError("获取流水号失败，错误:" + err.Error()) } impl.ReplaceData(&preOrder, serialNumber, true) - serialOrder.PreOrderLi[index] = preOrder + preOrderLi = append(preOrderLi, preOrder) } + serialOrder.PreOrderLi = preOrderLi writeSerialOrderLi = append(writeSerialOrderLi, serialOrder) writeSerialOrderStatusLi = append(writeSerialOrderStatusLi, serialOrder.SerialOrderStatus) writeSerialOrderPoLi = append(writeSerialOrderPoLi, serialOrder.SerialOrderPOLstLi...) From 82c30acb7827636b4a7d85b8d51e5a6b145f8841 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 26 Jul 2022 14:23:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=A3=85=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=97=A5=E6=9C=9F=E4=B8=80=E4=B8=AA=E5=8F=B0?= =?UTF-8?q?=E5=A5=97=E4=BD=BF=E7=94=A8=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/SerialOrder.service.go | 2 +- services/om/implments/SerialOrder.Logic.impl.go | 10 ++++++---- services/pln/implments/CustOrderLogic.service.impl.go | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) 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)