优化采购单

2026-08-13 12:34:32 +08:00
parent 099e92b1ff
commit 61a70319a0
14 changed files with 628 additions and 276 deletions
@@ -27,15 +27,6 @@ export async function batchUpdateOrderStatus(ids: number[], status: number) {
  });
 }

-/** 修改周转框/周转托盘数量（自动重算附加金额与订单总金额，仅已接单/采购中/配送中可改） */
-export async function updateOrderContainer(id: number, data: { box_num: number; tray_num: number }) {
-  return createAxios({
-    url: `/order/store/${id}/container`,
-    method: 'put',
-    data,
-  });
-}
-
 /** 删除订单 */
 export async function deleteStoreOrder(id: number) {
  return createAxios({
@@ -23,6 +23,13 @@ export interface PurchaseCellUpdateParams {
  weight?: number;
 }

+/** 采购单周转框/托盘合并记录修改：单笔订单的框/托盘数量 */
+export interface PurchaseContainerOrderParams {
+  order_id: number;
+  box_num: number;
+  tray_num: number;
+}
+

 /** 生成采购单 */
 export async function generatePurchase(purchase_date: string, order_ids?: number[]) {
@@ -77,6 +84,19 @@ export async function getPurchaseStoreSummary(purchaseId: number, storeId: numbe
  });
 }

+/** 采购单周转框/托盘合并记录修改：按门店覆盖全部订单逐笔更新（自动重算附加金额与订单总金额） */
+export async function updatePurchaseContainer(
+  purchaseId: number,
+  storeId: number,
+  orders: PurchaseContainerOrderParams[],
+) {
+  return createAxios({
+    url: `/purchase/order/${purchaseId}/container/${storeId}`,
+    method: 'put',
+    data: { orders },
+  });
+}
+
 /** C2/C3 导出采购单（Excel 表格）：type=all 全品类 / category 仅蔬果分类 */
 export async function exportPurchase(id: number, type: PurchaseExportType = 'all') {
  return downloadBlob(
@@ -48,6 +48,34 @@ export interface IPurchaseDetail {
  purchase: IPurchaseOrder;
  stores: { id: number; name: string }[];
  items: IPurchaseDetailRow[];
+  /** 周转框/托盘合并记录（按门店聚合） */
+  containers: IPurchaseContainerStore[];
+}
+
+/** 合并记录中的底层门店订单（订单号 + 框/托盘数量） */
+export interface IPurchaseContainerOrder {
+  order_id: number;
+  order_no: string;
+  box_num: number;
+  tray_num: number;
+}
+
+/** 门店周转框/托盘合并记录（该门店在本采购单下全部订单的合计） */
+export interface IPurchaseContainerStore {
+  store_id: number;
+  store_name: string;
+  /** 周转框合计 */
+  box_num: number;
+  /** 周转托盘合计 */
+  tray_num: number;
+  /** 周转框单价（站点配置） */
+  box_price: string;
+  /** 周转托盘单价（站点配置） */
+  tray_price: string;
+  /** 附加金额合计 = 框合计×框单价 + 托盘合计×托盘单价 */
+  added_amount: string;
+  order_count: number;
+  orders: IPurchaseContainerOrder[];
 }

 /** 单元格下钻明细行（溯源订货单明细，附订单号/状态/可编辑标记） */
@@ -6,7 +6,6 @@ import {
  Drawer,
  Empty,
  Form,
-  InputNumber,
  message,
  Modal,
  Popconfirm,
@@ -27,7 +26,6 @@ import type IStoreOrder from '@/domain/iStoreOrder.ts';
 import { STORE_ORDER_STATUS_MAP } from '@/domain/iStoreOrder.ts';
 import {
  getStoreOrder,
-  updateOrderContainer,
  updateOrderStatus,
  batchUpdateOrderStatus,
  deleteStoreOrder,
@@ -36,14 +34,11 @@ import { generatePurchase } from '@/api/purchase/order.ts';
 import { getStoreOptions } from '@/api/customer/store.ts';
 import type IStore from '@/domain/iStore.ts';
 import AuthButton from '@/components/AuthButton';
-import { DeleteOutlined, SettingOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import { DeleteOutlined, UnorderedListOutlined } from '@ant-design/icons';
 import {PURCHASE_STATUS_MAP} from "@/domain/iPurchaseOrder.ts";

 const { Title, Text } = Typography;

-/** 允许修改周转框/托盘数量的订单状态：已接单、采购中、配送中 */
-const CONTAINER_EDITABLE_STATUS = [1, 2, 3];
-

 /**
 * 状态流转合法路径：待接单→已接单/已取消；采购中→配送中/已完成；配送中→已完成
@@ -74,11 +69,6 @@ const StoreOrderPage: React.FC = () => {
  const [detail, setDetail] = useState<IStoreOrder | null>(null);
  const [detailLoading, setDetailLoading] = useState(false);

-  const [containerOpen, setContainerOpen] = useState(false);
-  const [containerOrder, setContainerOrder] = useState<IStoreOrder | null>(null);
-  const [containerSaving, setContainerSaving] = useState(false);
-  const [containerForm] = Form.useForm<{ box_num: number; tray_num: number }>();
-
  /** 勾选行（批量流转/生成采购单用） */
  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
  const [batchOpen, setBatchOpen] = useState(false);
@@ -147,25 +137,6 @@ const StoreOrderPage: React.FC = () => {
    }
  };

-  const openContainer = (record: IStoreOrder) => {
-    setContainerOrder(record);
-    containerForm.setFieldsValue({ box_num: record.box_num, tray_num: record.tray_num });
-    setContainerOpen(true);
-  };
-
-  const handleContainerSave = async (values: { box_num: number; tray_num: number }) => {
-    if (!containerOrder?.id) return;
-    setContainerSaving(true);
-    try {
-      await updateOrderContainer(containerOrder.id, values);
-      message.success('周转框/托盘数量已更新');
-      setContainerOpen(false);
-      await tableRef.current?.reload();
-    } finally {
-      setContainerSaving(false);
-    }
-  };
-
  /** 删除订单（软删除，仅已取消订单可删；删除后后台/小程序端均不可见） */
  const handleDelete = async (id: number) => {
    await deleteStoreOrder(id);
@@ -174,13 +145,6 @@ const StoreOrderPage: React.FC = () => {
    await tableRef.current?.reload();
  };

-  // 弹窗内实时预览：附加金额 = 框×单价 + 托盘×单价；订单总金额 = 商品金额 + 附加金额
-  const watchBoxNum = Number(Form.useWatch('box_num', containerForm) ?? 0);
-  const watchTrayNum = Number(Form.useWatch('tray_num', containerForm) ?? 0);
-  const previewAdded = watchBoxNum * Number(containerOrder?.box_price ?? 0)
-    + watchTrayNum * Number(containerOrder?.tray_price ?? 0);
-  const previewTotal = Number(containerOrder?.product_amount ?? 0) + previewAdded;
-
  const columns: XinTableColumn<IStoreOrder>[] = [
    {
      title: '订单号',
@@ -387,15 +351,6 @@ const StoreOrderPage: React.FC = () => {
            icon={<UnorderedListOutlined />}
            onClick={() => openDetail(record.id!)}
          />
-          { CONTAINER_EDITABLE_STATUS.includes(record.status ?? -1) && (
-            <AuthButton key="container" auth="order.store.update">
-              <Button
-                icon={<SettingOutlined />}
-                type={'primary'}
-                onClick={() => openContainer(record)}
-              />
-            </AuthButton>
-          )}
          { NEXT_STATUS[record.status!] && (
            <AuthButton auth="order.store.update">
              <Popconfirm
@@ -487,13 +442,6 @@ const StoreOrderPage: React.FC = () => {
        footer={
          detail ? (
            <Space className="flex justify-end" wrap>
-              {CONTAINER_EDITABLE_STATUS.includes(detail.status ?? -1) && (
-                <AuthButton auth="order.store.update">
-                  <Button icon={<SettingOutlined />} onClick={() => openContainer(detail)}>
-                    设置附加信息
-                  </Button>
-                </AuthButton>
-              )}
              { NEXT_STATUS[detail.status!] && (
                <AuthButton auth="order.store.update">
                  <Popconfirm
@@ -715,50 +663,6 @@ const StoreOrderPage: React.FC = () => {
          </Space>
        </Radio.Group>
      </Modal>
-
-      {/* 修改周转框/托盘数量 */}
-      <Modal
-        title="修改周转框/托盘"
-        open={containerOpen}
-        onCancel={() => setContainerOpen(false)}
-        onOk={() => containerForm.submit()}
-        confirmLoading={containerSaving}
-        okText="保存"
-        destroyOnHidden
-      >
-        <div className="py-2 text-gray-500">
-          订单 {containerOrder?.order_no}，保存后将按单价自动重算附加金额与订单总金额。
-        </div>
-        <Form form={containerForm} layout="vertical" onFinish={handleContainerSave}>
-          <Form.Item
-            label={`周转框数量（单价 ¥${containerOrder?.box_price ?? '0.00'}）`}
-            name="box_num"
-            rules={[{ required: true, message: '请输入周转框数量' }]}
-          >
-            <InputNumber className="w-full" min={0} precision={0} placeholder="请输入周转框数量" />
-          </Form.Item>
-          <Form.Item
-            label={`周转托盘数量（单价 ¥${containerOrder?.tray_price ?? '0.00'}）`}
-            name="tray_num"
-            rules={[{ required: true, message: '请输入周转托盘数量' }]}
-          >
-            <InputNumber className="w-full" min={0} precision={0} placeholder="请输入周转托盘数量" />
-          </Form.Item>
-        </Form>
-        <Space orientation="vertical" className="w-full rounded bg-gray-50 p-3">
-          <div>
-            <Text type="secondary">商品总金额：</Text>¥{containerOrder?.product_amount ?? '0.00'}
-          </div>
-          <div>
-            <Text type="secondary">附加总金额：</Text>
-            <Text strong>¥{previewAdded.toFixed(2)}</Text>
-          </div>
-          <div>
-            <Text type="secondary">订单总金额：</Text>
-            <Text strong type="danger">¥{previewTotal.toFixed(2)}</Text>
-          </div>
-        </Space>
-      </Modal>
    </>
  );
 };
@@ -32,6 +32,7 @@ import type IPurchaseOrder from '@/domain/iPurchaseOrder.ts';
 import type {
  IPurchaseCell,
  IPurchaseCellItem,
+  IPurchaseContainerStore,
  IPurchaseDetail,
  IPurchaseDetailRow,
  IPurchaseStoreItem,
@@ -44,8 +45,9 @@ import {
  getPurchaseCell,
  getPurchaseDetail,
  getPurchaseStoreSummary,
-  type PurchaseCellUpdateParams, type PurchaseRowUpdateParams,
+  type PurchaseCellUpdateParams, type PurchaseContainerOrderParams, type PurchaseRowUpdateParams,
  updatePurchaseCellItem,
+  updatePurchaseContainer,
  updatePurchaseRow,
 } from '@/api/purchase/order.ts';
 import { Update } from '@/api/common/table.ts';
@@ -98,6 +100,26 @@ const PurchaseOrderPage: React.FC = () => {
  const [storeSummary, setStoreSummary] = useState<IPurchaseStoreSummary | null>(null);
  const [storeLoading, setStoreLoading] = useState(false);

+  // 周转框/托盘合并记录修改（按门店覆盖全部订单逐笔修改）
+  const [containerOpen, setContainerOpen] = useState(false);
+  const [containerStore, setContainerStore] = useState<IPurchaseContainerStore | null>(null);
+  const [containerSaving, setContainerSaving] = useState(false);
+  const [containerForm] = Form.useForm<{ orders: PurchaseContainerOrderParams[] }>();
+
+  // 弹窗内实时预览：合并合计 = Σ 各订单框/托盘数量，附加金额 = 合计 × 单价
+  const watchContainerOrders = Form.useWatch('orders', containerForm) ?? [];
+  const previewContainerBox = watchContainerOrders.reduce(
+    (sum, order) => sum + Number(order?.box_num ?? 0),
+    0,
+  );
+  const previewContainerTray = watchContainerOrders.reduce(
+    (sum, order) => sum + Number(order?.tray_num ?? 0),
+    0,
+  );
+  const previewContainerAdded =
+    previewContainerBox * Number(containerStore?.box_price ?? 0) +
+    previewContainerTray * Number(containerStore?.tray_price ?? 0);
+
  useEffect(() => {
    getSupplierOptions().then((res) => setSuppliers(res.data.data ?? []));
  }, []);
@@ -242,6 +264,37 @@ const PurchaseOrderPage: React.FC = () => {
    }
  };

+  /** 打开周转框/托盘合并记录修改（初始化该门店全部订单的当前数量） */
+  const openContainerEdit = (store: IPurchaseContainerStore) => {
+    setContainerStore(store);
+    containerForm.setFieldsValue({
+      orders: store.orders.map((order) => ({
+        order_id: order.order_id,
+        box_num: order.box_num,
+        tray_num: order.tray_num,
+      })),
+    });
+    setContainerOpen(true);
+  };
+
+  /** 提交合并记录修改：逐笔更新订单，自动重算附加金额与订单总金额 */
+  const handleContainerSave = async (values: { orders: PurchaseContainerOrderParams[] }) => {
+    if (!detail || !containerStore) {
+      return;
+    }
+    setContainerSaving(true);
+    try {
+      await updatePurchaseContainer(detail.purchase.id!, containerStore.store_id, values.orders);
+      message.success('周转框/托盘已更新，订单金额已重算');
+      setContainerOpen(false);
+      setContainerStore(null);
+      await loadDetail(detail.purchase.id!);
+      await tableRef.current?.reload();
+    } finally {
+      setContainerSaving(false);
+    }
+  };
+
  const handleComplete = async (id: number) => {
    setCompleting(true);
    try {
@@ -420,6 +473,61 @@ const PurchaseOrderPage: React.FC = () => {
    );
  };

+  /** 周转框/托盘合并记录列：门店/订单数/框合计/托盘合计/附加金额（合计可点击下钻逐订单修改） */
+  const containerColumns: TableProps<IPurchaseContainerStore>['columns'] = [
+    { title: '门店', dataIndex: 'store_name', width: 180, align: 'center' },
+    { title: '订单数', dataIndex: 'order_count', width: 90, align: 'center' },
+    {
+      title: '周转框合计',
+      dataIndex: 'box_num',
+      width: 110,
+      align: 'center',
+      render: (_, row) => (
+        <Typography.Link onClick={() => openContainerEdit(row)}>{row.box_num}</Typography.Link>
+      ),
+    },
+    {
+      title: '周转托盘合计',
+      dataIndex: 'tray_num',
+      width: 120,
+      align: 'center',
+      render: (_, row) => (
+        <Typography.Link onClick={() => openContainerEdit(row)}>{row.tray_num}</Typography.Link>
+      ),
+    },
+    {
+      title: '附加金额',
+      dataIndex: 'added_amount',
+      width: 110,
+      align: 'center',
+      render: (_, row) => <Text strong type="danger">¥{row.added_amount}</Text>,
+    },
+  ];
+
+  /** 周转框/托盘合并记录合计行 */
+  const renderContainerSummary = () => {
+    const containers = detail?.containers ?? [];
+    const totalBox = containers.reduce((sum, row) => sum + row.box_num, 0);
+    const totalTray = containers.reduce((sum, row) => sum + row.tray_num, 0);
+    const totalAdded = containers.reduce((sum, row) => sum + Number(row.added_amount), 0);
+    return (
+      <Table.Summary.Row>
+        <Table.Summary.Cell index={0} colSpan={2} align="center">
+          <Text strong>合计</Text>
+        </Table.Summary.Cell>
+        <Table.Summary.Cell index={2} align="center">
+          <Text strong>{totalBox}</Text>
+        </Table.Summary.Cell>
+        <Table.Summary.Cell index={3} align="center">
+          <Text strong>{totalTray}</Text>
+        </Table.Summary.Cell>
+        <Table.Summary.Cell index={4} align="center">
+          <Text strong type="danger">¥{totalAdded.toFixed(2)}</Text>
+        </Table.Summary.Cell>
+      </Table.Summary.Row>
+    );
+  };
+
  const columns: XinTableColumn<IPurchaseOrder>[] = [
    {
      title: '采购单号',
@@ -588,6 +696,7 @@ const PurchaseOrderPage: React.FC = () => {
              items={[
                { key: 'items', label: '商品明细' },
                { key: 'stores', label: '门店购买详情' },
+                { key: 'containers', label: '周转框/托盘' },
              ]}
            />

@@ -627,6 +736,24 @@ const PurchaseOrderPage: React.FC = () => {
                  )}
                </Spin>
              </>
+            ) : detailTab === 'containers' ? (
+              detail.containers.length > 0 ? (
+                <Table<IPurchaseContainerStore>
+                  rowKey="store_id"
+                  size="small"
+                  bordered
+                  columns={containerColumns}
+                  dataSource={detail.containers}
+                  pagination={false}
+                  summary={renderContainerSummary}
+                />
+              ) : (
+                <Empty
+                  image={Empty.PRESENTED_IMAGE_SIMPLE}
+                  description="该采购单暂无门店订单"
+                  className="py-8!"
+                />
+              )
            ) : (
              <>
                <Space style={{ marginBottom: 20 }}>
@@ -877,6 +1004,101 @@ const PurchaseOrderPage: React.FC = () => {
          </Form.Item>
        </Form>
      </Modal>
+
+      {/* 周转框/托盘合并记录下钻：按门店展示全部订单逐笔修改（采购单已完成则只读） */}
+      <Modal
+        title={
+          containerStore
+            ? `${containerStore.store_name} · 周转框/托盘`
+            : '周转框/托盘'
+        }
+        open={containerOpen}
+        onCancel={() => {
+          setContainerOpen(false);
+          setContainerStore(null);
+        }}
+        onOk={() => containerForm.submit()}
+        confirmLoading={containerSaving}
+        okText="保存"
+        okButtonProps={{ disabled: detail?.purchase.status !== 0 }}
+        width={760}
+        destroyOnHidden
+      >
+        <div className="py-2 text-gray-500">
+          该门店在本采购单下的全部订单（{containerStore?.order_count ?? 0} 笔）：
+          {detail?.purchase.status === 0
+            ? '逐笔修改后保存，系统将自动重算每笔订单的附加金额与订单总金额。'
+            : '采购单已完成，仅可查看。'}
+        </div>
+        <Form form={containerForm} layout="vertical" onFinish={handleContainerSave}>
+          <Form.List name="orders">
+            {(fields) => (
+              <div className="overflow-hidden rounded border border-gray-200">
+                <div className="flex bg-gray-50 px-4 py-2 text-sm text-gray-500">
+                  <div className="flex-1">订单号</div>
+                  <div className="w-36 shrink-0 text-center">
+                    周转框（单价 ¥{containerStore?.box_price ?? '0.00'}）
+                  </div>
+                  <div className="w-36 shrink-0 text-center">
+                    周转托盘（单价 ¥{containerStore?.tray_price ?? '0.00'}）
+                  </div>
+                </div>
+                {fields.map((field) => {
+                  const order = containerStore?.orders[field.name];
+                  return (
+                    <div key={field.key} className="flex items-center border-t border-gray-100 px-4 py-2">
+                      <div className="min-w-0 flex-1 pr-2 text-sm">
+                        <Text copyable={{ text: order?.order_no ?? '' }}>{order?.order_no ?? '-'}</Text>
+                      </div>
+                      <Form.Item name={[field.name, 'order_id']} hidden>
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        className="m-0! w-36 shrink-0"
+                        name={[field.name, 'box_num']}
+                        rules={[{ required: true, message: '请输入周转框数量' }]}
+                      >
+                        <InputNumber
+                          className="w-full"
+                          min={0}
+                          precision={0}
+                          disabled={detail?.purchase.status !== 0}
+                          placeholder="周转框数量"
+                        />
+                      </Form.Item>
+                      <Form.Item
+                        className="m-0! w-36 shrink-0"
+                        name={[field.name, 'tray_num']}
+                        rules={[{ required: true, message: '请输入周转托盘数量' }]}
+                      >
+                        <InputNumber
+                          className="w-full"
+                          min={0}
+                          precision={0}
+                          disabled={detail?.purchase.status !== 0}
+                          placeholder="周转托盘数量"
+                        />
+                      </Form.Item>
+                    </div>
+                  );
+                })}
+              </div>
+            )}
+          </Form.List>
+        </Form>
+        <Space orientation="vertical" className="mt-3! w-full rounded bg-gray-50 p-3">
+          <div>
+            <Text type="secondary">周转框合计：</Text>
+            <Text strong>{previewContainerBox}</Text>
+            <Text type="secondary" className="ml-6!">周转托盘合计：</Text>
+            <Text strong>{previewContainerTray}</Text>
+          </div>
+          <div>
+            <Text type="secondary">附加金额合计：</Text>
+            <Text strong type="danger">¥{previewContainerAdded.toFixed(2)}</Text>
+          </div>
+        </Space>
+      </Modal>
    </>
  );
 };