From b6d1154b8f3cf5a0b078ae5311dca184b85c3ec9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 30 May 2026 09:15:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E6=8F=90=E4=BA=A4=20wm=20stocktak?= =?UTF-8?q?ing=20=E7=9B=B8=E5=85=B3=E7=9A=84=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/package.json | 1 + .../wm/stocktaking/plan/components/index.ts | 2 + .../stock-taking-plan-select-dialog.vue | 210 +++++++ .../components/stock-taking-plan-select.vue | 137 ++++ .../src/views/mes/wm/stocktaking/plan/data.ts | 387 ++++++++++++ .../views/mes/wm/stocktaking/plan/index.vue | 184 ++++++ .../mes/wm/stocktaking/plan/modules/form.vue | 126 ++++ .../stocktaking/plan/modules/param-form.vue | 267 ++++++++ .../src/views/mes/wm/stocktaking/task/data.ts | 582 +++++++++++++++++ .../views/mes/wm/stocktaking/task/index.vue | 209 +++++++ .../mes/wm/stocktaking/task/modules/form.vue | 233 +++++++ .../wm/stocktaking/task/modules/line-list.vue | 147 +++++ .../stocktaking/task/modules/result-form.vue | 106 ++++ .../stocktaking/task/modules/result-list.vue | 140 +++++ apps/web-ele/package.json | 1 + .../src/api/mes/pro/card/process/index.ts | 62 ++ .../src/api/mes/pro/workorder/bom/index.ts | 62 ++ .../src/api/mes/wm/arrivalnotice/index.ts | 68 ++ .../api/mes/wm/arrivalnotice/line/index.ts | 58 ++ .../api/mes/wm/itemreceipt/detail/index.ts | 58 ++ .../api/mes/wm/productissue/detail/index.ts | 56 ++ .../src/api/mes/wm/productissue/index.ts | 87 +++ .../src/api/mes/wm/productissue/line/index.ts | 53 ++ .../api/mes/wm/productreceipt/detail/index.ts | 58 ++ .../src/api/mes/wm/productreceipt/index.ts | 91 +++ .../api/mes/wm/productreceipt/line/index.ts | 57 ++ .../api/mes/wm/productsales/detail/index.ts | 58 ++ .../api/mes/wm/returnissue/detail/index.ts | 56 ++ .../src/api/mes/wm/returnissue/index.ts | 78 +++ .../src/api/mes/wm/returnissue/line/index.ts | 58 ++ .../api/mes/wm/returnsales/detail/index.ts | 55 ++ .../src/api/mes/wm/returnsales/index.ts | 78 +++ .../src/api/mes/wm/returnsales/line/index.ts | 57 ++ .../api/mes/wm/returnvendor/detail/index.ts | 56 ++ .../src/api/mes/wm/returnvendor/index.ts | 88 +++ .../src/api/mes/wm/returnvendor/line/index.ts | 54 ++ .../src/api/mes/wm/salesnotice/index.ts | 65 ++ .../src/api/mes/wm/salesnotice/line/index.ts | 55 ++ .../src/api/mes/wm/stocktaking/plan/index.ts | 68 ++ .../mes/wm/stocktaking/plan/param/index.ts | 49 ++ .../src/api/mes/wm/stocktaking/task/index.ts | 86 +++ .../api/mes/wm/stocktaking/task/line/index.ts | 72 +++ .../mes/wm/stocktaking/task/result/index.ts | 64 ++ .../wm/stocktaking/plan/components/index.ts | 2 + .../stock-taking-plan-select-dialog.vue | 213 +++++++ .../components/stock-taking-plan-select.vue | 135 ++++ .../src/views/mes/wm/stocktaking/plan/data.ts | 388 ++++++++++++ .../views/mes/wm/stocktaking/plan/index.vue | 184 ++++++ .../mes/wm/stocktaking/plan/modules/form.vue | 126 ++++ .../stocktaking/plan/modules/param-form.vue | 288 +++++++++ .../stocktaking/plan/modules/param-list.vue | 131 ++++ .../src/views/mes/wm/stocktaking/task/data.ts | 584 ++++++++++++++++++ .../views/mes/wm/stocktaking/task/index.vue | 211 +++++++ .../mes/wm/stocktaking/task/modules/form.vue | 237 +++++++ .../wm/stocktaking/task/modules/line-list.vue | 147 +++++ .../stocktaking/task/modules/result-form.vue | 107 ++++ .../stocktaking/task/modules/result-list.vue | 140 +++++ pnpm-workspace.yaml | 1 + 58 files changed, 7433 insertions(+) create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/line-list.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-form.vue create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-list.vue create mode 100644 apps/web-ele/src/api/mes/pro/card/process/index.ts create mode 100644 apps/web-ele/src/api/mes/pro/workorder/bom/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/arrivalnotice/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/arrivalnotice/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/itemreceipt/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productissue/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productissue/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productissue/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/productsales/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/detail/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/salesnotice/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/salesnotice/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/plan/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/plan/param/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/line/index.ts create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/result/index.ts create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/index.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/form.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-list.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/line-list.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-form.vue create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-list.vue diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index a3ae11913..93a6f0e28 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -54,6 +54,7 @@ "camunda-bpmn-moddle": "catalog:", "cropperjs": "catalog:", "dayjs": "catalog:", + "dhtmlx-gantt": "catalog:", "diagram-js": "catalog:", "fast-xml-parser": "catalog:", "highlight.js": "catalog:", diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts new file mode 100644 index 000000000..d6289b11d --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts @@ -0,0 +1,2 @@ +export { default as StockTakingPlanSelectDialog } from './stock-taking-plan-select-dialog.vue'; +export { default as StockTakingPlanSelect } from './stock-taking-plan-select.vue'; diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue new file mode 100644 index 000000000..f46313f17 --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue @@ -0,0 +1,210 @@ + + + diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue new file mode 100644 index 000000000..82cf2f4ee --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue @@ -0,0 +1,137 @@ + + + diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts new file mode 100644 index 000000000..883fbff90 --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts @@ -0,0 +1,387 @@ +import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan'; +import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param'; + +import { h } from 'vue'; + +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { Button } from 'ant-design-vue'; + +import { z } from '#/adapter/form'; +import { generateAutoCode } from '#/api/mes/md/autocode/record'; +import { + MesAutoCodeRuleCode, + MesWmStockTakingTypeEnum, +} from '#/views/mes/utils/constants'; + +/** 表单类型 */ +export type FormType = 'create' | 'detail' | 'update'; + +/** 新增/修改的表单 */ +export function useFormSchema( + formType: FormType, + formApi?: VbenFormApi, +): VbenFormSchema[] { + return [ + { + fieldName: 'id', + component: 'Input', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, + { + fieldName: 'code', + label: '方案编码', + component: 'Input', + componentProps: { + placeholder: '请输入方案编码', + }, + rules: 'required', + suffix: + formType === 'detail' + ? undefined + : () => + h( + Button, + { + type: 'default', + onClick: async () => { + const code = await generateAutoCode( + MesAutoCodeRuleCode.WM_STOCK_TAKING_PLAN_CODE, + ); + await formApi?.setFieldValue('code', code); + }, + }, + { default: () => '生成' }, + ), + }, + { + fieldName: 'name', + label: '方案名称', + component: 'Input', + componentProps: { + placeholder: '请输入方案名称', + }, + rules: 'required', + }, + { + fieldName: 'type', + label: '盘点类型', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'), + placeholder: '请选择盘点类型', + }, + rules: 'selectRequired', + }, + { + fieldName: 'startTime', + label: '开始时间', + component: 'DatePicker', + componentProps: { + placeholder: '请选择开始时间', + showTime: true, + valueFormat: 'x', + }, + dependencies: { + triggerFields: ['type'], + show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC, + }, + }, + { + fieldName: 'endTime', + label: '结束时间', + component: 'DatePicker', + componentProps: { + placeholder: '请选择结束时间', + showTime: true, + valueFormat: 'x', + }, + dependencies: { + triggerFields: ['type'], + show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC, + }, + }, + { + fieldName: 'blindFlag', + label: '是否盲盘', + component: 'Switch', + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + rules: z.boolean().default(false), + }, + { + fieldName: 'frozen', + label: '冻结库存', + component: 'Switch', + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + rules: z.boolean().default(false), + }, + { + fieldName: 'remark', + label: '备注', + component: 'Textarea', + formItemClass: 'col-span-3', + componentProps: { + placeholder: '请输入备注', + rows: 3, + }, + }, + ]; +} + +/** 列表的搜索表单 */ +export function useGridFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'code', + label: '方案编码', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入方案编码', + }, + }, + { + fieldName: 'name', + label: '方案名称', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入方案名称', + }, + }, + { + fieldName: 'type', + label: '盘点类型', + component: 'Select', + componentProps: { + allowClear: true, + options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'), + placeholder: '请选择盘点类型', + }, + }, + ]; +} + +/** 列表的字段 */ +export function useGridColumns( + onStatusChange?: ( + newStatus: number, + row: MesWmStockTakingPlanApi.StockTakingPlan, + ) => Promise, +): VxeTableGridOptions['columns'] { + return [ + { + field: 'code', + title: '方案编码', + minWidth: 160, + slots: { default: 'code' }, + }, + { + field: 'name', + title: '方案名称', + minWidth: 160, + }, + { + field: 'type', + title: '盘点类型', + minWidth: 120, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE }, + }, + }, + { + field: 'startTime', + title: '开始时间', + width: 180, + formatter: 'formatDateTime', + }, + { + field: 'endTime', + title: '结束时间', + width: 180, + formatter: 'formatDateTime', + }, + { + field: 'blindFlag', + title: '是否盲盘', + width: 100, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING }, + }, + }, + { + field: 'frozen', + title: '是否冻结库存', + width: 120, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING }, + }, + }, + { + field: 'status', + title: '状态', + width: 120, + cellRender: { + attrs: { beforeChange: onStatusChange }, + name: 'CellSwitch', + props: { + checkedValue: CommonStatusEnum.ENABLE, + unCheckedValue: CommonStatusEnum.DISABLE, + }, + }, + }, + { + title: '操作', + width: 160, + fixed: 'right', + slots: { default: 'actions' }, + }, + ]; +} + +/** 盘点方案条件列表的字段 */ +export function useParamGridColumns( + editable = true, +): VxeTableGridOptions['columns'] { + return [ + { + field: 'type', + title: '条件类型', + minWidth: 120, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE }, + }, + }, + { + field: 'valueCode', + title: '条件值编码', + minWidth: 140, + }, + { + field: 'valueName', + title: '条件值名称', + minWidth: 160, + }, + ...(editable + ? [ + { + title: '操作', + width: 120, + fixed: 'right', + slots: { default: 'actions' }, + } as const, + ] + : []), + ]; +} + +/** 选择弹窗的搜索表单 */ +export function useSelectGridFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'code', + label: '方案编码', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入方案编码', + }, + }, + { + fieldName: 'name', + label: '方案名称', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入方案名称', + }, + }, + { + fieldName: 'type', + label: '盘点类型', + component: 'Select', + componentProps: { + allowClear: true, + options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'), + placeholder: '请选择盘点类型', + }, + }, + ]; +} + +/** 选择弹窗的字段 */ +export function useSelectGridColumns( + multiple = true, +): VxeTableGridOptions['columns'] { + return [ + { + type: multiple ? 'checkbox' : 'radio', + width: 50, + }, + { + field: 'code', + title: '方案编码', + width: 200, + }, + { + field: 'name', + title: '方案名称', + minWidth: 150, + }, + { + field: 'type', + title: '盘点类型', + width: 120, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE }, + }, + }, + { + field: 'startTime', + title: '开始时间', + width: 180, + formatter: 'formatDateTime', + }, + { + field: 'endTime', + title: '结束时间', + width: 180, + formatter: 'formatDateTime', + }, + { + field: 'blindFlag', + title: '是否盲盘', + width: 100, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING }, + }, + }, + { + field: 'frozen', + title: '是否冻结库存', + width: 120, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING }, + }, + }, + ]; +} diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue new file mode 100644 index 000000000..54b0cf182 --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue @@ -0,0 +1,184 @@ + + + diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue new file mode 100644 index 000000000..f0e7827f8 --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue @@ -0,0 +1,126 @@ + + + diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue new file mode 100644 index 000000000..49128ca83 --- /dev/null +++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue @@ -0,0 +1,267 @@ + + +