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

liujiandao

2023-10-26 201be38fd71ee487d887e686cf07773ec750a8de

 controllers/operation.go

@@ -369,7 +369,7 @@
               operationTransfer := &models.Operation{
                  Number:            operation.Number,
                  SourceNumber:      operation.SourceNumber,
                  OperationTypeId:   operation.OperationTypeId,
                  OperationTypeId:   0,
                  OperationTypeName: operation.OperationTypeName,
                  Status:            constvar.OperationStatus_Finish,
                  FromLocationID:    locationRule.AreaId,
@@ -380,7 +380,7 @@
                  CompanyID:         operation.CompanyID,
                  CompanyName:       operation.CompanyName,
                  Comment:           operation.Comment,
                  BaseOperationType: operation.BaseOperationType,
                  BaseOperationType: constvar.BaseOperationTypeInternal,
                  Details: []*models.OperationDetails{
                     &models.OperationDetails{
                        ProductId: v.ID,