Merge pull request 'fix/tabla_unidades_medida' (#66) from fix/tabla_unidades_medida into development
Reviewed-on: ADUANASOFT/anexo76#66
This commit is contained in:
@@ -36,14 +36,8 @@ class UnitOfMeasureBase(BaseModel):
|
||||
oma_code: Optional[str] = Field(None, max_length=20)
|
||||
|
||||
|
||||
class UnitOfMeasureGeneralBase(BaseModel):
|
||||
code: str = Field(..., max_length=20, description="Unit Code")
|
||||
description: Optional[str] = Field(None, max_length=100)
|
||||
conversion_factor: Optional[Decimal] = None
|
||||
mexico_unit: Optional[str] = Field(None, max_length=20)
|
||||
american_unit_code: Optional[str] = Field(None, max_length=20)
|
||||
customs_code: Optional[int] = Field(None)
|
||||
ace_code: Optional[str] = Field(None, max_length=20)
|
||||
class UnitOfMeasureGeneralBase(UnitOfMeasureBase):
|
||||
pass
|
||||
|
||||
# --- Create DTOs ---
|
||||
|
||||
@@ -105,14 +99,8 @@ class UnitOfMeasureUpdate(BaseModel):
|
||||
oma_code: Optional[str] = Field(None, max_length=20)
|
||||
|
||||
|
||||
class UnitOfMeasureGeneralUpdate(BaseModel):
|
||||
code: Optional[str] = Field(None, max_length=20)
|
||||
description: Optional[str] = Field(None, max_length=100)
|
||||
conversion_factor: Optional[Decimal] = None
|
||||
mexico_unit: Optional[str] = Field(None, max_length=20)
|
||||
american_unit_code: Optional[str] = Field(None, max_length=20)
|
||||
customs_code: Optional[int] = Field(None)
|
||||
ace_code: Optional[str] = Field(None, max_length=20)
|
||||
class UnitOfMeasureGeneralUpdate(UnitOfMeasureUpdate):
|
||||
pass
|
||||
|
||||
# --- Response DTOs ---
|
||||
|
||||
@@ -142,6 +130,5 @@ class UnitOfMeasureResponse(UnitOfMeasureBase):
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class UnitOfMeasureGeneralResponse(UnitOfMeasureGeneralBase):
|
||||
id: int
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
class UnitOfMeasureGeneralResponse(UnitOfMeasureResponse):
|
||||
pass
|
||||
|
||||
@@ -154,7 +154,7 @@ class UnitOfMeasureService(BaseService):
|
||||
|
||||
|
||||
class UnitOfMeasureGeneralService(BaseService):
|
||||
model = UnitOfMeasureGeneral
|
||||
model = UnitOfMeasure
|
||||
|
||||
|
||||
def get_all_uom_general(session: Session, skip: int = 0, limit: int = 100) -> Sequence[UnitOfMeasureGeneral]:
|
||||
|
||||
Reference in New Issue
Block a user