Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

liujiandao

2023-10-21 26a2ae9619dfff4c43487ca39307c06be635c23f

Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

 controllers/location_product_amount.go

@@ -77,10 +77,12 @@
                return
            }
        } else {
            records[k].AdjustAmount = operation.Details[0].Amount
            if len(operation.Details) > 0 {
                records[k].AdjustAmount = operation.Details[0].Amount
                records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
            }
            records[k].OperationId = operation.Id
            records[k].Status = operation.Status
            records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
        }
    }
    util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)

 controllers/product_controller.go

@@ -535,6 +535,10 @@
        util.ResponseFormat(c, code.RequestParamError, "该信息无法修改")
        return
    }
    if params.ProductId == "" {
        util.ResponseFormat(c, code.RequestParamError, "请选择报废产品")
        return
    }
    detail := &models.OperationDetails{
        ProductId: params.ProductId,
        //ProductName: params.ProductName,
@@ -542,15 +546,16 @@
        //Unit:        params.Unit,
    }
    operation := models.Operation{
        Id:              params.Id,
        Number:          params.Number,
        SourceNumber:    params.SourceNumber,
        OperationTypeId: 0,
        Status:          params.Status,
        FromLocationID:  params.FromLocationId,
        ToLocationID:    params.ToLocationId,
        OperationDate:   params.OperationDate,
        Details:         []*models.OperationDetails{detail},
        Id:                params.Id,
        Number:            params.Number,
        SourceNumber:      params.SourceNumber,
        OperationTypeId:   0,
        Status:            params.Status,
        FromLocationID:    params.FromLocationId,
        ToLocationID:      params.ToLocationId,
        OperationDate:     params.OperationDate,
        Details:           []*models.OperationDetails{detail},
        BaseOperationType: params.BaseOperationType,
    }
    if err := models.WithTransaction(func(tx *gorm.DB) error {
        if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {

 models/material.go

@@ -493,24 +493,25 @@
}

type ResponseDisuseList struct {
    Id             int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
    Number         string                   `json:"number" gorm:"type:varchar(255)"`                                 //单号
    SourceNumber   string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
    Status         constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`                  //状态
    FromLocationID int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
    FromLocation   Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
    ToLocation     Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
    ToLocationID   int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
    OperationDate  string                   `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
    ContacterID    int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
    ContacterName  string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
    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:备注"`
    ProductId      string                   `json:"productId" gorm:"type:varchar(191);not null;comment:产品id"`   //产品id
    ProductName    string                   `json:"productName" gorm:"type:varchar(255);not null;comment:产品名称"` //产品名称
    Amount         decimal.Decimal          `json:"amount" gorm:"type:decimal(20,2);not null;comment:数量"`       //数量
    Unit           string                   `json:"unit" gorm:"type:varchar(31);comment:单位"`
    Id                int                        `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
    Number            string                     `json:"number" gorm:"type:varchar(255)"`                                 //单号
    SourceNumber      string                     `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
    Status            constvar.OperationStatus   `json:"status" gorm:"type:int(11);not null;comment:状态"`                  //状态
    FromLocationID    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
    FromLocation      Location                   `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
    ToLocation        Location                   `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
    ToLocationID      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
    OperationDate     string                     `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
    ContacterID       int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`
    ContacterName     string                     `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
    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:备注"`
    ProductId         string                     `json:"productId" gorm:"type:varchar(191);not null;comment:产品id"`   //产品id
    ProductName       string                     `json:"productName" gorm:"type:varchar(255);not null;comment:产品名称"` //产品名称
    Amount            decimal.Decimal            `json:"amount" gorm:"type:decimal(20,2);not null;comment:数量"`       //数量
    Unit              string                     `json:"unit" gorm:"type:varchar(31);comment:单位"`
    BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
}

func (slf *MaterialSearch) Update(record *Material) error {