2801-опция для перетаскивания строк в черновике.

пофиксил синк накладных
свайп убрал
внешний номер теперь ок

internal/infrastructure/rms/client.go

@@ -573,7 +573,7 @@ func (c *Client) CreateIncomingInvoice(inv invoices.Invoice) (string, error) {
 
 	reqDTO := IncomingInvoiceImportXML{
 		DocumentNumber:         inv.DocumentNumber,
-		IncomingDocumentNumber: inv.IncomingDocumentNumber, // Присваиваем входящий номер документа из домена
+		IncomingDocumentNumber: inv.IncomingDocumentNumber,
 		DateIncoming:           inv.DateIncoming.Format("02.01.2006"),
 		DefaultStore:           inv.DefaultStoreID.String(),
 		Supplier:               inv.SupplierID.String(),
@@ -581,6 +581,13 @@ func (c *Client) CreateIncomingInvoice(inv invoices.Invoice) (string, error) {
 		Comment:                comment,
 	}
 
+	logger.Log.Info("RMS Invoice Import Debug",
+		zap.String("document_number", inv.DocumentNumber),
+		zap.String("incoming_document_number", inv.IncomingDocumentNumber),
+		zap.String("supplier_id", inv.SupplierID.String()),
+		zap.String("store_id", inv.DefaultStoreID.String()),
+	)
+
 	if inv.ID != uuid.Nil {
 		reqDTO.ID = inv.ID.String()
 	}

internal/services/drafts/service.go

@@ -422,6 +422,14 @@ func (s *Service) CommitDraft(draftID, userID uuid.UUID) (string, error) {
 	if err != nil {
 		logger.Log.Warn("Не удалось получить список накладных для поиска UUID", zap.Error(err), zap.Time("date", *draft.DateIncoming))
 	} else {
+		// ВАЖНО: Сохраняем полученные накладные, чтобы они сразу появились в базе как SYNCED
+		for i := range invoices {
+			invoices[i].RMSServerID = server.ID
+		}
+		if err := s.invoiceRepo.SaveInvoices(invoices); err != nil {
+			logger.Log.Error("Failed to save committed invoices", zap.Error(err))
+		}
+
 		found := false
 		for _, invoice := range invoices {
 			if invoice.DocumentNumber == docNum {

internal/services/sync/service.go

@@ -211,7 +211,7 @@ func (s *Service) syncInvoices(c rms.ClientI, serverID uuid.UUID, force bool) er
 			return err
 		}
 		if lastDate != nil {
-			from = *lastDate
+			from = lastDate.AddDate(0, 0, -7)
 		} else {
 			from = time.Now().AddDate(0, 0, -45)
 		}

internal/transport/http/handlers/drafts.go

@@ -195,7 +195,7 @@ type CommitRequestDTO struct {
 	StoreID        string `json:"store_id"`
 	SupplierID     string `json:"supplier_id"`
 	Comment        string `json:"comment"`
-	IncomingDocNum string `json:"incoming_doc_num"`
+	IncomingDocNum string `json:"incoming_document_number"`
 }
 
 func (h *DraftsHandler) CommitDraft(c *gin.Context) {

rmser-view/project_context.md

@@ -1,6 +1,6 @@
 # ===================================================================
 # Полный контекст React Typescript проекта
-# Сгенерировано: 2026-01-27 11:40:29
+# Сгенерировано: 2026-01-28 02:48:31
 # ===================================================================
 
 Это полный дамп исходного кода React Typescript (Vite) проекта.
@@ -5106,6 +5106,7 @@ interface Props {
   onDelete: (itemId: string) => void;
   isUpdating: boolean;
   recommendations?: Recommendation[];
+  isReordering: boolean;
 }
 
 type FieldType = "quantity" | "price" | "sum";
@@ -5117,6 +5118,7 @@ export const DraftItemRow: React.FC<Props> = ({
   onDelete,
   isUpdating,
   recommendations = [],
+  isReordering,
 }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -5359,15 +5361,9 @@ export const DraftItemRow: React.FC<Props> = ({
 
   return (
     <>
-      <Draggable draggableId={item.id} index={index}>
+      <Draggable draggableId={item.id} index={index} isDragDisabled={!isReordering}>
-        {(provided, snapshot) => (
+        {(provided, snapshot) => {
-          <div
+          const style = {
-            ref={provided.innerRef}
-            {...provided.draggableProps}
-            style={{
-              ...provided.draggableProps.style,
-              display: "table",
-              width: "100%",
             marginBottom: "8px",
             backgroundColor: snapshot.isDragging ? "#e6f7ff" : "transparent",
             boxShadow: snapshot.isDragging
@@ -5375,7 +5371,14 @@ export const DraftItemRow: React.FC<Props> = ({
               : "none",
             borderRadius: "4px",
             transition: "background-color 0.2s ease, box-shadow 0.2s ease",
-            }}
+            ...provided.draggableProps.style,
+          };
+
+          return (
+            <div
+              ref={provided.innerRef}
+              {...provided.draggableProps}
+              style={style}
             >
               <Card
                 size="small"
@@ -5392,7 +5395,8 @@ export const DraftItemRow: React.FC<Props> = ({
                 }}
                 bodyStyle={{ padding: 0 }}
               >
-              {/* Drag handle - иконка для перетаскивания */}
+                {/* Drag handle - иконка для перетаскивания (показываем только в режиме перетаскивания) */}
+                {isReordering && (
                   <div
                     {...provided.dragHandleProps}
                     style={{
@@ -5412,6 +5416,7 @@ export const DraftItemRow: React.FC<Props> = ({
                   >
                     <GripVertical size={20} />
                   </div>
+                )}
 
                 <Flex vertical gap={10} style={{ flex: 1 }}>
                   <Flex justify="space-between" align="start">
@@ -5576,7 +5581,8 @@ export const DraftItemRow: React.FC<Props> = ({
                 </Flex>
               </Card>
             </div>
-        )}
+          );
+        }}
       </Draggable>
       {activeProduct && (
         <CreateContainerModal
@@ -7135,7 +7141,7 @@ export const Dashboard: React.FC = () => {
 ```
 // src/pages/DraftsList.tsx
 
-import React, { useState, useMemo, useCallback, useRef } from "react";
+import React, { useState, useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   List,
@@ -7209,9 +7215,6 @@ export const DraftsList: React.FC = () => {
   );
   const [endDate, setEndDate] = useState<dayjs.Dayjs | null>(dayjs());
 
-  const touchStartX = useRef<number>(0);
-  const touchEndX = useRef<number>(0);
-
   const {
     data: invoices,
     isLoading,
@@ -7316,14 +7319,6 @@ export const DraftsList: React.FC = () => {
     setCurrentPage(1);
   };
 
-  const handleTouchStart = useCallback((e: React.TouchEvent) => {
-    touchStartX.current = e.changedTouches[0].screenX;
-  }, []);
-
-  const handleTouchMove = useCallback((e: React.TouchEvent) => {
-    touchEndX.current = e.changedTouches[0].screenX;
-  }, []);
-
   const getItemDate = (item: UnifiedInvoice) =>
     item.type === "DRAFT" ? item.created_at : item.date_incoming;
 
@@ -7361,21 +7356,6 @@ export const DraftsList: React.FC = () => {
     return result;
   }, [invoices, filterType]);
 
-  const handleTouchEnd = useCallback(() => {
-    const diff = touchStartX.current - touchEndX.current;
-    const totalPages = Math.ceil(
-      (filteredAndSortedInvoices.length || 0) / pageSize
-    );
-
-    if (Math.abs(diff) > 50) {
-      if (diff > 0 && currentPage < totalPages) {
-        setCurrentPage((prev) => prev + 1);
-      } else if (diff < 0 && currentPage > 1) {
-        setCurrentPage((prev) => prev - 1);
-      }
-    }
-  }, [currentPage, pageSize, filteredAndSortedInvoices]);
-
   const paginatedInvoices = useMemo(() => {
     const startIndex = (currentPage - 1) * pageSize;
     return filteredAndSortedInvoices.slice(startIndex, startIndex + pageSize);
@@ -7482,11 +7462,7 @@ export const DraftsList: React.FC = () => {
         <Empty description="Нет данных" />
       ) : (
         <>
-          <div
+          <div>
-            onTouchStart={handleTouchStart}
-            onTouchMove={handleTouchMove}
-            onTouchEnd={handleTouchEnd}
-          >
             {Object.entries(groupedInvoices).map(([dateKey, items]) => (
               <div key={dateKey}>
                 <DayDivider date={dateKey} />
@@ -7707,6 +7683,7 @@ import {
   RestOutlined,
   PlusOutlined,
   FileImageOutlined,
+  SwapOutlined,
 } from "@ant-design/icons";
 import dayjs from "dayjs";
 import { api, getStaticUrl } from "../services/api";
@@ -7730,6 +7707,8 @@ export const InvoiceDraftPage: React.FC = () => {
 
   const [updatingItems, setUpdatingItems] = useState<Set<string>>(new Set());
   const [itemsOrder, setItemsOrder] = useState<Record<string, number>>({});
+  const [isDragging, setIsDragging] = useState(false);
+  const [isReordering, setIsReordering] = useState(false);
 
   // Состояние для просмотра фото чека
   const [previewVisible, setPreviewVisible] = useState(false);
@@ -7752,6 +7731,7 @@ export const InvoiceDraftPage: React.FC = () => {
     queryFn: () => api.getDraft(id!),
     enabled: !!id,
     refetchInterval: (query) => {
+      if (isDragging) return false;
       const status = query.state.data?.status;
       return status === "PROCESSING" ? 3000 : false;
     },
@@ -7849,6 +7829,7 @@ export const InvoiceDraftPage: React.FC = () => {
   });
 
   // --- ЭФФЕКТЫ ---
+
   useEffect(() => {
     if (draft) {
       const currentValues = form.getFieldsValue();
@@ -7939,7 +7920,12 @@ export const InvoiceDraftPage: React.FC = () => {
     });
   };
 
+  const handleDragStart = () => {
+    setIsDragging(true);
+  };
+
   const handleDragEnd = async (result: DropResult) => {
+    setIsDragging(false);
     const { source, destination } = result;
 
     // Если нет назначения или позиция не изменилась
@@ -8059,7 +8045,7 @@ export const InvoiceDraftPage: React.FC = () => {
           </div>
         </div>
 
-        {/* Правая часть хедера: Кнопка чека и Кнопка удаления */}
+        {/* Правая часть хедера: Кнопка чека, Кнопка перетаскивания и Кнопка удаления */}
         <div style={{ display: "flex", gap: 8 }}>
           {/* Кнопка просмотра чека (только если есть URL) */}
           {draft.photo_url && (
@@ -8072,6 +8058,16 @@ export const InvoiceDraftPage: React.FC = () => {
             </Button>
           )}
 
+          {/* Кнопка переключения режима перетаскивания */}
+          <Button
+            type={isReordering ? "primary" : "default"}
+            icon={<SwapOutlined rotate={90} />}
+            onClick={() => setIsReordering(!isReordering)}
+            size="small"
+          >
+            {isReordering ? "Ок" : ""}
+          </Button>
+
           <Button
             danger={isCanceled}
             type={isCanceled ? "primary" : "default"}
@@ -8195,7 +8191,7 @@ export const InvoiceDraftPage: React.FC = () => {
       </div>
 
       {/* Items List */}
-      <DragDropContext onDragEnd={handleDragEnd}>
+      <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
         <Droppable droppableId="draft-items">
           {(provided, snapshot) => (
             <div
@@ -8222,6 +8218,7 @@ export const InvoiceDraftPage: React.FC = () => {
                   onDelete={(itemId) => deleteItemMutation.mutate(itemId)}
                   isUpdating={updatingItems.has(item.id)}
                   recommendations={recommendationsQuery.data || []}
+                  isReordering={isReordering}
                 />
               ))}
               {provided.placeholder}
@@ -8700,6 +8697,7 @@ import {
   Spin,
   message,
   Tabs,
+  Popconfirm,
 } from "antd";
 import {
   SaveOutlined,
@@ -8758,6 +8756,17 @@ export const SettingsPage: React.FC = () => {
     },
   });
 
+  const deleteAllDraftsMutation = useMutation({
+    mutationFn: () => api.deleteAllDrafts(),
+    onSuccess: (data) => {
+      message.success(`Удалено черновиков: ${data.count}`);
+      queryClient.invalidateQueries({ queryKey: ["stats"] });
+    },
+    onError: () => {
+      message.error("Не удалось удалить черновики");
+    },
+  });
+
   // --- Эффекты ---
 
   useEffect(() => {
@@ -8871,6 +8880,33 @@ export const SettingsPage: React.FC = () => {
       >
         Сохранить настройки
       </Button>
+
+      {currentUserRole === "OWNER" && (
+        <Card
+          size="small"
+          style={{
+            marginTop: 24,
+            borderColor: "#ff4d4f",
+            borderWidth: 2,
+          }}
+        >
+          <Title level={5} style={{ color: "#ff4d4f", marginBottom: 16 }}>
+            Опасная зона
+          </Title>
+          <Popconfirm
+            title="Вы уверены?"
+            description="Это удалит ВСЕ черновики, которые еще не были отправлены в iiko. Это действие необратимо."
+            onConfirm={() => deleteAllDraftsMutation.mutate()}
+            okText="Удалить"
+            cancelText="Отмена"
+            okButtonProps={{ danger: true }}
+          >
+            <Button danger block loading={deleteAllDraftsMutation.isPending}>
+              Удалить все черновики
+            </Button>
+          </Popconfirm>
+        </Card>
+      )}
     </Form>
   );
 
@@ -9194,6 +9230,11 @@ export const api = {
     await apiClient.delete(`/drafts/${id}`);
   },
 
+  deleteAllDrafts: async (): Promise<{ count: number }> => {
+    const { data } = await apiClient.delete<{ count: number }>('/drafts');
+    return data;
+  },
+  
   // --- Настройки и Статистика ---
 
   getSettings: async (): Promise<UserSettings> => {

rmser-view/src/components/invoices/DraftItemRow.tsx

@@ -38,6 +38,7 @@ interface Props {
   onDelete: (itemId: string) => void;
   isUpdating: boolean;
   recommendations?: Recommendation[];
+  isReordering: boolean;
 }
 
 type FieldType = "quantity" | "price" | "sum";
@@ -49,6 +50,7 @@ export const DraftItemRow: React.FC<Props> = ({
   onDelete,
   isUpdating,
   recommendations = [],
+  isReordering,
 }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -291,7 +293,7 @@ export const DraftItemRow: React.FC<Props> = ({
 
   return (
     <>
-      <Draggable draggableId={item.id} index={index}>
+      <Draggable draggableId={item.id} index={index} isDragDisabled={!isReordering}>
         {(provided, snapshot) => {
           const style = {
             marginBottom: "8px",
@@ -325,7 +327,8 @@ export const DraftItemRow: React.FC<Props> = ({
                 }}
                 bodyStyle={{ padding: 0 }}
               >
-                {/* Drag handle - иконка для перетаскивания */}
+                {/* Drag handle - иконка для перетаскивания (показываем только в режиме перетаскивания) */}
+                {isReordering && (
                   <div
                     {...provided.dragHandleProps}
                     style={{
@@ -345,6 +348,7 @@ export const DraftItemRow: React.FC<Props> = ({
                   >
                     <GripVertical size={20} />
                   </div>
+                )}
 
                 <Flex vertical gap={10} style={{ flex: 1 }}>
                   <Flex justify="space-between" align="start">

rmser-view/src/pages/DraftsList.tsx

@@ -1,6 +1,6 @@
 // src/pages/DraftsList.tsx
 
-import React, { useState, useMemo, useCallback, useRef } from "react";
+import React, { useState, useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   List,
@@ -74,9 +74,6 @@ export const DraftsList: React.FC = () => {
   );
   const [endDate, setEndDate] = useState<dayjs.Dayjs | null>(dayjs());
 
-  const touchStartX = useRef<number>(0);
-  const touchEndX = useRef<number>(0);
-
   const {
     data: invoices,
     isLoading,
@@ -181,14 +178,6 @@ export const DraftsList: React.FC = () => {
     setCurrentPage(1);
   };
 
-  const handleTouchStart = useCallback((e: React.TouchEvent) => {
-    touchStartX.current = e.changedTouches[0].screenX;
-  }, []);
-
-  const handleTouchMove = useCallback((e: React.TouchEvent) => {
-    touchEndX.current = e.changedTouches[0].screenX;
-  }, []);
-
   const getItemDate = (item: UnifiedInvoice) =>
     item.type === "DRAFT" ? item.created_at : item.date_incoming;
 
@@ -226,21 +215,6 @@ export const DraftsList: React.FC = () => {
     return result;
   }, [invoices, filterType]);
 
-  const handleTouchEnd = useCallback(() => {
-    const diff = touchStartX.current - touchEndX.current;
-    const totalPages = Math.ceil(
-      (filteredAndSortedInvoices.length || 0) / pageSize
-    );
-
-    if (Math.abs(diff) > 50) {
-      if (diff > 0 && currentPage < totalPages) {
-        setCurrentPage((prev) => prev + 1);
-      } else if (diff < 0 && currentPage > 1) {
-        setCurrentPage((prev) => prev - 1);
-      }
-    }
-  }, [currentPage, pageSize, filteredAndSortedInvoices]);
-
   const paginatedInvoices = useMemo(() => {
     const startIndex = (currentPage - 1) * pageSize;
     return filteredAndSortedInvoices.slice(startIndex, startIndex + pageSize);
@@ -347,11 +321,7 @@ export const DraftsList: React.FC = () => {
         <Empty description="Нет данных" />
       ) : (
         <>
-          <div
+          <div>
-            onTouchStart={handleTouchStart}
-            onTouchMove={handleTouchMove}
-            onTouchEnd={handleTouchEnd}
-          >
             {Object.entries(groupedInvoices).map(([dateKey, items]) => (
               <div key={dateKey}>
                 <DayDivider date={dateKey} />

rmser-view/src/pages/InvoiceDraftPage.tsx

@@ -26,6 +26,7 @@ import {
   RestOutlined,
   PlusOutlined,
   FileImageOutlined,
+  SwapOutlined,
 } from "@ant-design/icons";
 import dayjs from "dayjs";
 import { api, getStaticUrl } from "../services/api";
@@ -50,6 +51,7 @@ export const InvoiceDraftPage: React.FC = () => {
   const [updatingItems, setUpdatingItems] = useState<Set<string>>(new Set());
   const [itemsOrder, setItemsOrder] = useState<Record<string, number>>({});
   const [isDragging, setIsDragging] = useState(false);
+  const [isReordering, setIsReordering] = useState(false);
 
   // Состояние для просмотра фото чека
   const [previewVisible, setPreviewVisible] = useState(false);
@@ -386,7 +388,7 @@ export const InvoiceDraftPage: React.FC = () => {
           </div>
         </div>
 
-        {/* Правая часть хедера: Кнопка чека и Кнопка удаления */}
+        {/* Правая часть хедера: Кнопка чека, Кнопка перетаскивания и Кнопка удаления */}
         <div style={{ display: "flex", gap: 8 }}>
           {/* Кнопка просмотра чека (только если есть URL) */}
           {draft.photo_url && (
@@ -399,6 +401,16 @@ export const InvoiceDraftPage: React.FC = () => {
             </Button>
           )}
 
+          {/* Кнопка переключения режима перетаскивания */}
+          <Button
+            type={isReordering ? "primary" : "default"}
+            icon={<SwapOutlined rotate={90} />}
+            onClick={() => setIsReordering(!isReordering)}
+            size="small"
+          >
+            {isReordering ? "Ок" : ""}
+          </Button>
+
           <Button
             danger={isCanceled}
             type={isCanceled ? "primary" : "default"}
@@ -549,6 +561,7 @@ export const InvoiceDraftPage: React.FC = () => {
                   onDelete={(itemId) => deleteItemMutation.mutate(itemId)}
                   isUpdating={updatingItems.has(item.id)}
                   recommendations={recommendationsQuery.data || []}
+                  isReordering={isReordering}
                 />
               ))}
               {provided.placeholder}

rmser-view/src/pages/SettingsPage.tsx

@@ -13,6 +13,7 @@ import {
   Spin,
   message,
   Tabs,
+  Popconfirm,
 } from "antd";
 import {
   SaveOutlined,
@@ -71,6 +72,17 @@ export const SettingsPage: React.FC = () => {
     },
   });
 
+  const deleteAllDraftsMutation = useMutation({
+    mutationFn: () => api.deleteAllDrafts(),
+    onSuccess: (data) => {
+      message.success(`Удалено черновиков: ${data.count}`);
+      queryClient.invalidateQueries({ queryKey: ["stats"] });
+    },
+    onError: () => {
+      message.error("Не удалось удалить черновики");
+    },
+  });
+
   // --- Эффекты ---
 
   useEffect(() => {
@@ -184,6 +196,33 @@ export const SettingsPage: React.FC = () => {
       >
         Сохранить настройки
       </Button>
+
+      {currentUserRole === "OWNER" && (
+        <Card
+          size="small"
+          style={{
+            marginTop: 24,
+            borderColor: "#ff4d4f",
+            borderWidth: 2,
+          }}
+        >
+          <Title level={5} style={{ color: "#ff4d4f", marginBottom: 16 }}>
+            Опасная зона
+          </Title>
+          <Popconfirm
+            title="Вы уверены?"
+            description="Это удалит ВСЕ черновики, которые еще не были отправлены в iiko. Это действие необратимо."
+            onConfirm={() => deleteAllDraftsMutation.mutate()}
+            okText="Удалить"
+            cancelText="Отмена"
+            okButtonProps={{ danger: true }}
+          >
+            <Button danger block loading={deleteAllDraftsMutation.isPending}>
+              Удалить все черновики
+            </Button>
+          </Popconfirm>
+        </Card>
+      )}
     </Form>
   );
 

rmser-view/src/services/api.ts

@@ -222,6 +222,11 @@ export const api = {
     await apiClient.delete(`/drafts/${id}`);
   },
 
+  deleteAllDrafts: async (): Promise<{ count: number }> => {
+    const { data } = await apiClient.delete<{ count: number }>('/drafts');
+    return data;
+  },
+  
   // --- Настройки и Статистика ---
 
   getSettings: async (): Promise<UserSettings> => {