From 994b33ae7d12fc0970ade9d2dc0635922847bf78 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Fri, 11 Mar 2022 11:36:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=8C=85=E8=A3=85=E5=8D=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/implments/PackOrder.service.impl.go | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index 804a204..c0cbad9 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -816,17 +816,12 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o return nil, grmi.NewBusinessError("生成包装流水号失败!") } - artId := article.ArtId - artInfos := strings.Split(artId, "-") - if len(artInfos) >= 2 { - artId = artInfos[0] + artInfos[1] - } packOrderIds := strings.Split(packOrderId, "-") if len(packOrderIds) <2{ - packsession.Rollback() - return nil, grmi.NewBusinessError("生成包装流水号格式错误!") + return nil,grmi.NewBusinessError("生成包装流水号格式错误!") } - packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1] + qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) @@ -1059,17 +1054,12 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord packsession.Rollback() return nil, grmi.NewBusinessError("生成包装流水号失败!") } - artId := article.ArtId - artInfos := strings.Split(artId, "-") - if len(artInfos) >= 2 { - artId = artInfos[0] + artInfos[1] - } packOrderIds := strings.Split(packOrderId, "-") if len(packOrderIds) <2{ - packsession.Rollback() - return nil, grmi.NewBusinessError("生成包装流水号格式错误!") + return nil,grmi.NewBusinessError("生成包装流水号格式错误!") } - packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1] + qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) packTemplateItems, err := packTemplateItemlstDAO.Select([]grmi.Predicate{ @@ -1185,16 +1175,12 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us return grmi.NewBusinessError("生成包装流水号失败!") } - artId := article.ArtId - artInfos := strings.Split(artId, "-") - if len(artInfos) >= 2 { - artId = artInfos[0] + artInfos[1] - } packOrderIds := strings.Split(packOrderId, "-") if len(packOrderIds) <2{ return grmi.NewBusinessError("生成包装流水号格式错误!") } - packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1] + qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] packOrderDAO := dal.NewPackOrderDAO(session, user.Pid, user.Userid) err = packOrderDAO.InsertOne(&model.PackOrder{ -- 2.30.1.windows.1 From c9546ad24e1c4afb8b58c0ab0f82b8537226cdd5 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Mon, 21 Mar 2022 15:12:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=8D=87=E7=BA=A72.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/log/implments/PackOrder.service.impl.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index c0cbad9..c0020be 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -820,8 +820,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o if len(packOrderIds) <2{ return nil,grmi.NewBusinessError("生成包装流水号格式错误!") } - qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) - packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) @@ -1058,8 +1057,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord if len(packOrderIds) <2{ return nil,grmi.NewBusinessError("生成包装流水号格式错误!") } - qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) - packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) packTemplateItems, err := packTemplateItemlstDAO.Select([]grmi.Predicate{ @@ -1179,8 +1177,8 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us if len(packOrderIds) <2{ return grmi.NewBusinessError("生成包装流水号格式错误!") } - qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) - packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] + + packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] packOrderDAO := dal.NewPackOrderDAO(session, user.Pid, user.Userid) err = packOrderDAO.InsertOne(&model.PackOrder{ -- 2.30.1.windows.1