From 9693da40a8f7d91b7014d115f8dc0a6723dbb0f5 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 20 Jul 2021 11:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddaoceng=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/wm/implments/ArticlePickingRate.dao.impl.go | 11 ++++++++--- dao/wm/implments/ArticleReplenish.dao.impl.go | 11 ++++++++--- dao/wm/implments/AssertArtLst.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsIssueDetail.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsIssueHead.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsIssueLst.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsReceiptDetail.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsReceiptHead.dao.impl.go | 11 ++++++++--- dao/wm/implments/GoodsReceiptLst.dao.impl.go | 11 ++++++++--- dao/wm/implments/InventoryBook.dao.impl.go | 11 ++++++++--- dao/wm/implments/InventoryCheckDetail.dao.impl.go | 11 ++++++++--- dao/wm/implments/InventoryCheckHead.dao.impl.go | 11 ++++++++--- dao/wm/implments/InventoryCheckLst.dao.impl.go | 11 ++++++++--- dao/wm/implments/ReplenishOrder.dao.impl.go | 11 ++++++++--- dao/wm/implments/StockTransferDetail.dao.impl.go | 11 ++++++++--- dao/wm/implments/StockTransferHead.dao.impl.go | 11 ++++++++--- dao/wm/implments/StorageArea.dao.impl.go | 11 ++++++++--- dao/wm/implments/StorageBin.dao.impl.go | 11 ++++++++--- dao/wm/implments/StorageRack.dao.impl.go | 11 ++++++++--- dao/wm/implments/Warehouse.dao.impl.go | 11 ++++++++--- dao/wm/implments/WorkArea.dao.impl.go | 15 ++++++++++----- dao/wm/implments/WorkAreaUserLst.dao.impl.go | 11 ++++++++--- 22 files changed, 178 insertions(+), 68 deletions(-) diff --git a/dao/wm/implments/ArticlePickingRate.dao.impl.go b/dao/wm/implments/ArticlePickingRate.dao.impl.go index f4fd514..9cef01f 100644 --- a/dao/wm/implments/ArticlePickingRate.dao.impl.go +++ b/dao/wm/implments/ArticlePickingRate.dao.impl.go @@ -233,10 +233,15 @@ func (impl *ArticlePickingRateDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/ArticleReplenish.dao.impl.go b/dao/wm/implments/ArticleReplenish.dao.impl.go index 66cd85c..f17887e 100644 --- a/dao/wm/implments/ArticleReplenish.dao.impl.go +++ b/dao/wm/implments/ArticleReplenish.dao.impl.go @@ -233,10 +233,15 @@ func (impl *ArticleReplenishDAOImplement) SelectAndPaging(paging *grmi.Paging, p return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/AssertArtLst.dao.impl.go b/dao/wm/implments/AssertArtLst.dao.impl.go index e71eee4..28bfd7e 100644 --- a/dao/wm/implments/AssertArtLst.dao.impl.go +++ b/dao/wm/implments/AssertArtLst.dao.impl.go @@ -233,10 +233,15 @@ func (impl *AssertArtLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsIssueDetail.dao.impl.go b/dao/wm/implments/GoodsIssueDetail.dao.impl.go index c06b9e4..e2a0a43 100644 --- a/dao/wm/implments/GoodsIssueDetail.dao.impl.go +++ b/dao/wm/implments/GoodsIssueDetail.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsIssueDetailDAOImplement) SelectAndPaging(paging *grmi.Paging, p return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsIssueHead.dao.impl.go b/dao/wm/implments/GoodsIssueHead.dao.impl.go index 4acd356..9aa7be4 100644 --- a/dao/wm/implments/GoodsIssueHead.dao.impl.go +++ b/dao/wm/implments/GoodsIssueHead.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsIssueHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pre return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsIssueLst.dao.impl.go b/dao/wm/implments/GoodsIssueLst.dao.impl.go index c7d4e98..5bbd7f8 100644 --- a/dao/wm/implments/GoodsIssueLst.dao.impl.go +++ b/dao/wm/implments/GoodsIssueLst.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsIssueLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pred return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsReceiptDetail.dao.impl.go b/dao/wm/implments/GoodsReceiptDetail.dao.impl.go index 6064fe4..140e545 100644 --- a/dao/wm/implments/GoodsReceiptDetail.dao.impl.go +++ b/dao/wm/implments/GoodsReceiptDetail.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsReceiptDetailDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsReceiptHead.dao.impl.go b/dao/wm/implments/GoodsReceiptHead.dao.impl.go index 189e346..c77433a 100644 --- a/dao/wm/implments/GoodsReceiptHead.dao.impl.go +++ b/dao/wm/implments/GoodsReceiptHead.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsReceiptHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, p return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/GoodsReceiptLst.dao.impl.go b/dao/wm/implments/GoodsReceiptLst.dao.impl.go index cbe183e..3fcfb59 100644 --- a/dao/wm/implments/GoodsReceiptLst.dao.impl.go +++ b/dao/wm/implments/GoodsReceiptLst.dao.impl.go @@ -233,10 +233,15 @@ func (impl *GoodsReceiptLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pr return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/InventoryBook.dao.impl.go b/dao/wm/implments/InventoryBook.dao.impl.go index b9cdf46..7fea397 100644 --- a/dao/wm/implments/InventoryBook.dao.impl.go +++ b/dao/wm/implments/InventoryBook.dao.impl.go @@ -233,10 +233,15 @@ func (impl *InventoryBookDAOImplement) SelectAndPaging(paging *grmi.Paging, pred return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/InventoryCheckDetail.dao.impl.go b/dao/wm/implments/InventoryCheckDetail.dao.impl.go index a5b9f88..00a96f8 100644 --- a/dao/wm/implments/InventoryCheckDetail.dao.impl.go +++ b/dao/wm/implments/InventoryCheckDetail.dao.impl.go @@ -233,10 +233,15 @@ func (impl *InventoryCheckDetailDAOImplement) SelectAndPaging(paging *grmi.Pagin return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/InventoryCheckHead.dao.impl.go b/dao/wm/implments/InventoryCheckHead.dao.impl.go index 32bd43f..2ca49a9 100644 --- a/dao/wm/implments/InventoryCheckHead.dao.impl.go +++ b/dao/wm/implments/InventoryCheckHead.dao.impl.go @@ -233,10 +233,15 @@ func (impl *InventoryCheckHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/InventoryCheckLst.dao.impl.go b/dao/wm/implments/InventoryCheckLst.dao.impl.go index e5ef5c1..2867267 100644 --- a/dao/wm/implments/InventoryCheckLst.dao.impl.go +++ b/dao/wm/implments/InventoryCheckLst.dao.impl.go @@ -233,10 +233,15 @@ func (impl *InventoryCheckLstDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/ReplenishOrder.dao.impl.go b/dao/wm/implments/ReplenishOrder.dao.impl.go index ab2bfea..b2f2b98 100644 --- a/dao/wm/implments/ReplenishOrder.dao.impl.go +++ b/dao/wm/implments/ReplenishOrder.dao.impl.go @@ -233,10 +233,15 @@ func (impl *ReplenishOrderDAOImplement) SelectAndPaging(paging *grmi.Paging, pre return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/StockTransferDetail.dao.impl.go b/dao/wm/implments/StockTransferDetail.dao.impl.go index 50dc0b9..3069e18 100644 --- a/dao/wm/implments/StockTransferDetail.dao.impl.go +++ b/dao/wm/implments/StockTransferDetail.dao.impl.go @@ -233,10 +233,15 @@ func (impl *StockTransferDetailDAOImplement) SelectAndPaging(paging *grmi.Paging return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/StockTransferHead.dao.impl.go b/dao/wm/implments/StockTransferHead.dao.impl.go index ba78a9f..594cd5f 100644 --- a/dao/wm/implments/StockTransferHead.dao.impl.go +++ b/dao/wm/implments/StockTransferHead.dao.impl.go @@ -233,10 +233,15 @@ func (impl *StockTransferHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/StorageArea.dao.impl.go b/dao/wm/implments/StorageArea.dao.impl.go index 5ceccf4..b2ac28a 100644 --- a/dao/wm/implments/StorageArea.dao.impl.go +++ b/dao/wm/implments/StorageArea.dao.impl.go @@ -233,10 +233,15 @@ func (impl *StorageAreaDAOImplement) SelectAndPaging(paging *grmi.Paging, predic return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/StorageBin.dao.impl.go b/dao/wm/implments/StorageBin.dao.impl.go index 87e6d4f..62bc6d5 100644 --- a/dao/wm/implments/StorageBin.dao.impl.go +++ b/dao/wm/implments/StorageBin.dao.impl.go @@ -233,10 +233,15 @@ func (impl *StorageBinDAOImplement) SelectAndPaging(paging *grmi.Paging, predica return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/StorageRack.dao.impl.go b/dao/wm/implments/StorageRack.dao.impl.go index 64633c2..9b7169a 100644 --- a/dao/wm/implments/StorageRack.dao.impl.go +++ b/dao/wm/implments/StorageRack.dao.impl.go @@ -233,10 +233,15 @@ func (impl *StorageRackDAOImplement) SelectAndPaging(paging *grmi.Paging, predic return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/Warehouse.dao.impl.go b/dao/wm/implments/Warehouse.dao.impl.go index f472e97..a2c7890 100644 --- a/dao/wm/implments/Warehouse.dao.impl.go +++ b/dao/wm/implments/Warehouse.dao.impl.go @@ -233,10 +233,15 @@ func (impl *WarehouseDAOImplement) SelectAndPaging(paging *grmi.Paging, predicat return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) diff --git a/dao/wm/implments/WorkArea.dao.impl.go b/dao/wm/implments/WorkArea.dao.impl.go index 486e8e4..ddd070c 100644 --- a/dao/wm/implments/WorkArea.dao.impl.go +++ b/dao/wm/implments/WorkArea.dao.impl.go @@ -234,10 +234,15 @@ func (impl *WorkAreaDAOImplement) SelectAndPaging(paging *grmi.Paging, predicate return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size) @@ -307,11 +312,11 @@ func (impl *WorkAreaDAOImplement) UpdateWhere(predicates []grmi.Predicate, entit func (impl *WorkAreaDAOImplement) DeleteWorkAreaLst(selectType string, relId1 string, relId2 string) error { var err error if selectType == model.WORK_AREA_TYPE_WARE_HOUSE { - sql := fmt.Sprintf(`select %s from %s where %s = %s and %s = %s`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1) + sql := fmt.Sprintf(`select %s from %s where %s = '%s' and %s = '%s'`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1) where := fmt.Sprintf(`%s in (%s)`, meta.WorkAreaUserLst_WorkAreaId.ColumnName, sql) _, err = impl.session.Table(meta.WorkAreaUserLst.TableName).Where(where).Delete(impl.meta.Indicator) } else { - sql := fmt.Sprintf(`select %s from %s where %s = %s and %s = %s and %s = %s`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1, meta.WorkArea_WACtrlPara3.ColumnName, relId2) + sql := fmt.Sprintf(`select %s from %s where %s = '%s' and %s = '%s' and %s = '%s'`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1, meta.WorkArea_WACtrlPara3.ColumnName, relId2) where := fmt.Sprintf(`%s in (%s)`, meta.WorkAreaUserLst_WorkAreaId.ColumnName, sql) _, err = impl.session.Table(meta.WorkAreaUserLst.TableName).Where(where).Delete(impl.meta.Indicator) } diff --git a/dao/wm/implments/WorkAreaUserLst.dao.impl.go b/dao/wm/implments/WorkAreaUserLst.dao.impl.go index 168ffa0..d1a575d 100644 --- a/dao/wm/implments/WorkAreaUserLst.dao.impl.go +++ b/dao/wm/implments/WorkAreaUserLst.dao.impl.go @@ -233,10 +233,15 @@ func (impl *WorkAreaUserLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pr return grmi.EmptyPagingResult, err } - orderBy := " order by " + var orderBy string if orderByFields != nil { - for _, field := range orderByFields { - orderBy += ", " + field.ColumnName + orderBy = " order by " + for index, field := range orderByFields { + if index == 0 { + orderBy += field.ColumnName + } else { + orderBy += ", " + field.ColumnName + } } } parameters = append(parameters, paging.Offset(), paging.Size)