mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
Merge branch 'fix/edit-receipt' into 'development'
[FIX][BE]: fix edit receipt purchase See merge request mbugroup/lti-api!404
This commit is contained in:
@@ -1061,6 +1061,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
|
||||
supplierID uint
|
||||
transportPerItem *float64
|
||||
vehicleNumber *string
|
||||
clearVehicle bool
|
||||
overrideWarehouse bool
|
||||
receivedQty float64
|
||||
}
|
||||
@@ -1153,12 +1154,16 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
|
||||
}
|
||||
|
||||
var vehicleNumber *string
|
||||
if payload.VehicleNumber != nil && strings.TrimSpace(*payload.VehicleNumber) != "" {
|
||||
clearVehicle := false
|
||||
if payload.VehicleNumber != nil {
|
||||
val := strings.TrimSpace(*payload.VehicleNumber)
|
||||
vehicleNumber = &val
|
||||
} else if item.VehicleNumber != nil && strings.TrimSpace(*item.VehicleNumber) != "" {
|
||||
val := strings.TrimSpace(*item.VehicleNumber)
|
||||
vehicleNumber = &val
|
||||
if val != "" {
|
||||
vehicleNumber = &val
|
||||
} else {
|
||||
clearVehicle = true
|
||||
}
|
||||
} else {
|
||||
clearVehicle = true
|
||||
}
|
||||
|
||||
prepared = append(prepared, preparedReceiving{
|
||||
@@ -1169,6 +1174,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
|
||||
supplierID: supplierID,
|
||||
transportPerItem: transportPerItem,
|
||||
vehicleNumber: vehicleNumber,
|
||||
clearVehicle: clearVehicle,
|
||||
overrideWarehouse: overrideWarehouse,
|
||||
receivedQty: receivedQty,
|
||||
})
|
||||
@@ -1282,7 +1288,8 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
|
||||
ReceivedDate: &dateCopy,
|
||||
TravelNumber: prep.payload.TravelNumber,
|
||||
TravelDocumentPath: prep.payload.TravelDocumentPath,
|
||||
VehicleNumber: prep.payload.VehicleNumber,
|
||||
VehicleNumber: prep.vehicleNumber,
|
||||
ClearVehicleNumber: prep.clearVehicle,
|
||||
ReceivedQty: &qtyCopy,
|
||||
ProductWarehouseID: newPWID,
|
||||
ClearProductWarehouse: false,
|
||||
|
||||
Reference in New Issue
Block a user