报废数量bug

jiangshuai

2023-11-16 a0125ef3d6ce35be7b6dc4919c4192dba4a7329a

 models/operation.go

@@ -2,6 +2,7 @@

import (
   "fmt"
   "github.com/shopspring/decimal"
   "gorm.io/gorm"
   "wms/constvar"
   "wms/pkg/mysqlx"
@@ -27,6 +28,11 @@
      CompanyID         int                      `json:"companyID" gorm:"type:int;comment:公司ID-客户"`
      CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称-客户"`
      Comment           string                   `json:"comment" gorm:"type:text;comment:备注"`
      LogisticCompanyId string                   `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:物流公司id"`
      LogisticCompany   LogisticCompany          `json:"logisticCompany"      gorm:"foreignKey:LogisticCompanyId"`
      WaybillNumber     string                   `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`    //运单号
      Weight            decimal.Decimal          `gorm:"type:decimal(20,2);comment:重量" json:"weight"`           //重量
      LogisticWeight    decimal.Decimal          `gorm:"type:decimal(20,2);comment:物流重量" json:"logisticWeight"` //物流重量

      Details           []*OperationDetails        `json:"details" gorm:"foreignKey:OperationID;references:Id"`
      BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
@@ -145,7 +151,8 @@
   }

   if slf.Preload {
      db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").Preload("ToLocation")
      db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").
         Preload("ToLocation").Preload("LogisticCompany")
   }

   if slf.Disuse {
@@ -264,7 +271,7 @@
   if slf.PageNum*slf.PageSize > 0 {
      db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
   }
   if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
   if err := db.Preload("FromLocation").Preload("ToLocation").Order("created_at desc").Find(&records).Error; err != nil {
      return records, total, fmt.Errorf("find records err: %v", err)
   }