Resolve merge conflicts: integrate supply order functionality with Wildberries features

src/graphql/typedefs.ts

@@ -36,7 +36,10 @@ export const typeDefs = gql`
 
     # Логистика организации
     myLogistics: [Logistics!]!
-
+    
+    # Поставки Wildberries
+    myWildberriesSupplies: [WildberriesSupply!]!
+    
     # Товары оптовика
     myProducts: [Product!]!
 
@@ -179,7 +182,12 @@ export const typeDefs = gql`
     updateEmployee(id: ID!, input: UpdateEmployeeInput!): EmployeeResponse!
     deleteEmployee(id: ID!): Boolean!
     updateEmployeeSchedule(input: UpdateScheduleInput!): Boolean!
-
+    
+    # Работа с поставками Wildberries
+    createWildberriesSupply(input: CreateWildberriesSupplyInput!): WildberriesSupplyResponse!
+    updateWildberriesSupply(id: ID!, input: UpdateWildberriesSupplyInput!): WildberriesSupplyResponse!
+    deleteWildberriesSupply(id: ID!): Boolean!
+    
     # Админ мутации
     adminLogin(username: String!, password: String!): AdminAuthResponse!
     adminLogout: Boolean!
@@ -782,4 +790,81 @@ export const typeDefs = gql`
     total: Int!
     hasMore: Boolean!
   }
+
+  # Типы для поставок Wildberries
+  type WildberriesSupply {
+    id: ID!
+    deliveryDate: DateTime
+    status: WildberriesSupplyStatus!
+    totalAmount: Float!
+    totalItems: Int!
+    cards: [WildberriesSupplyCard!]!
+    organization: Organization!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+  }
+
+  type WildberriesSupplyCard {
+    id: ID!
+    nmId: String!
+    vendorCode: String!
+    title: String!
+    brand: String
+    price: Float!
+    discountedPrice: Float
+    quantity: Int!
+    selectedQuantity: Int!
+    selectedMarket: String
+    selectedPlace: String
+    sellerName: String
+    sellerPhone: String
+    deliveryDate: DateTime
+    mediaFiles: [String!]!
+    selectedServices: [String!]!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+  }
+
+  enum WildberriesSupplyStatus {
+    DRAFT
+    CREATED
+    IN_PROGRESS
+    DELIVERED
+    CANCELLED
+  }
+
+  input CreateWildberriesSupplyInput {
+    deliveryDate: DateTime
+    cards: [WildberriesSupplyCardInput!]!
+  }
+
+  input WildberriesSupplyCardInput {
+    nmId: String!
+    vendorCode: String!
+    title: String!
+    brand: String
+    price: Float!
+    discountedPrice: Float
+    quantity: Int!
+    selectedQuantity: Int!
+    selectedMarket: String
+    selectedPlace: String
+    sellerName: String
+    sellerPhone: String
+    deliveryDate: DateTime
+    mediaFiles: [String!]
+    selectedServices: [String!]
+  }
+
+  input UpdateWildberriesSupplyInput {
+    deliveryDate: DateTime
+    status: WildberriesSupplyStatus
+    cards: [WildberriesSupplyCardInput!]
+  }
+
+  type WildberriesSupplyResponse {
+    success: Boolean!
+    message: String!
+    supply: WildberriesSupply
+  }
 `;