[FIX/BE-US] adjustment purchase,closing hpp expedition,supplier filter flags

internal/modules/purchases/services/expense_bridge.go

@@ -36,6 +36,7 @@ type ExpenseReceivingPayload struct {
 	TransportPerItem *float64
 	ReceivedQty      float64
 	ReceivedDate     *time.Time
+	VehicleNumber    *string
 }
 
 type groupedItem struct {
@@ -182,6 +183,22 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 	}
 
 	ctx := c.Context()
+	filtered := make([]ExpenseReceivingPayload, 0, len(updates))
+	for _, upd := range updates {
+		if upd.SupplierID == 0 {
+			continue
+		}
+		if upd.TransportPerItem == nil || *upd.TransportPerItem <= 0 {
+			continue
+		}
+		if upd.VehicleNumber == nil || strings.TrimSpace(*upd.VehicleNumber) == "" {
+			continue
+		}
+		filtered = append(filtered, upd)
+	}
+	if len(filtered) == 0 {
+		return nil
+	}
 
 	// Load current links to decide whether to update in place or recreate.
 	type itemLink struct {
@@ -205,9 +222,9 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 
 	itemLinks := make(map[uint]itemLink)
 	updatedExpenses := make(map[uint64]struct{})
-	if len(updates) > 0 {
-		ids := make([]uint, 0, len(updates))
-		for _, upd := range updates {
+	if len(filtered) > 0 {
+		ids := make([]uint, 0, len(filtered))
+		for _, upd := range filtered {
 			if upd.PurchaseItemID != 0 {
 				ids = append(ids, upd.PurchaseItemID)
 			}
@@ -252,7 +269,7 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 
 	groups := make(map[string][]groupedItem)
 
-	for _, payload := range updates {
+	for _, payload := range filtered {
 		if payload.ReceivedDate == nil {
 			return fiber.NewError(fiber.StatusBadRequest, "received_date is required")
 		}

internal/modules/purchases/services/purchase.service.go

@@ -702,6 +702,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		warehouseID       uint
 		supplierID        uint
 		transportPerItem  *float64
+		vehicleNumber     *string
 		overrideWarehouse bool
 		receivedQty       float64
 	}
@@ -756,7 +757,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		}
 		visitedItems[payload.PurchaseItemID] = struct{}{}
 
-		supplierID := purchase.SupplierId
+		var supplierID uint
 		if payload.ExpeditionVendorID != nil && *payload.ExpeditionVendorID != 0 {
 			supplierID = *payload.ExpeditionVendorID
 		}
@@ -770,6 +771,15 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			transportPerItem = &val
 		}
 
+		var vehicleNumber *string
+		if payload.VehicleNumber != nil && strings.TrimSpace(*payload.VehicleNumber) != "" {
+			val := strings.TrimSpace(*payload.VehicleNumber)
+			vehicleNumber = &val
+		} else if item.VehicleNumber != nil && strings.TrimSpace(*item.VehicleNumber) != "" {
+			val := strings.TrimSpace(*item.VehicleNumber)
+			vehicleNumber = &val
+		}
+
 		prepared = append(prepared, preparedReceiving{
 			item:              item,
 			payload:           payload,
@@ -777,6 +787,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			warehouseID:       warehouseID,
 			supplierID:        supplierID,
 			transportPerItem:  transportPerItem,
+			vehicleNumber:     vehicleNumber,
 			overrideWarehouse: overrideWarehouse,
 			receivedQty:       receivedQty,
 		})
@@ -964,6 +975,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			TransportPerItem: prep.transportPerItem,
 			ReceivedQty:      prep.receivedQty,
 			ReceivedDate:     &date,
+			VehicleNumber:    prep.vehicleNumber,
 		}
 		receivingPayloads = append(receivingPayloads, payload)
 	}