From 67eee24e23ecc672ad57b1e167e45fed1ae026d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 26 Dec 2023 08:15:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E6=8A=B1=20=E6=8B=86=E5=8C=85=20?= =?UTF-8?q?=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/packagemergeDetail/index.ts | 61 +++ src/api/wms/packagemergeMain/index.ts | 68 +++ src/api/wms/packageoverDetail/index.ts | 61 +++ src/api/wms/packageoverMain/index.ts | 63 +++ src/api/wms/packagesplitDetail/index.ts | 61 +++ src/api/wms/packagesplitMain/index.ts | 63 +++ .../packageManage/packagemergeMain/index.vue | 157 +++++++ .../packagemergeMain/packagemergeMain.data.ts | 415 +++++++++++++++++ .../packageManage/packageoverMain/index.vue | 157 +++++++ .../packageoverMain/packageoverMain.data.ts | 417 ++++++++++++++++++ .../packageManage/packagesplitMain/index.vue | 157 +++++++ .../packagesplitMain/packagesplitMain.data.ts | 417 ++++++++++++++++++ 12 files changed, 2097 insertions(+) create mode 100644 src/api/wms/packagemergeDetail/index.ts create mode 100644 src/api/wms/packagemergeMain/index.ts create mode 100644 src/api/wms/packageoverDetail/index.ts create mode 100644 src/api/wms/packageoverMain/index.ts create mode 100644 src/api/wms/packagesplitDetail/index.ts create mode 100644 src/api/wms/packagesplitMain/index.ts create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/index.vue create mode 100644 src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue create mode 100644 src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts diff --git a/src/api/wms/packagemergeDetail/index.ts b/src/api/wms/packagemergeDetail/index.ts new file mode 100644 index 000000000..c2d89ad88 --- /dev/null +++ b/src/api/wms/packagemergeDetail/index.ts @@ -0,0 +1,61 @@ +import request from '@/config/axios' + +export interface PackagemergeDetailVO { + id: number + locationCode: string + locationGroupCode: string + areaCode: string + fromPackingNumber: string + toPackingNumber: string + fromBatch: string + toBatch: string + fromInventoryStatus: string + toInventoryStatus: string + fromContainerNumber: string + toContainerNumber: string + fromOwnerCode: string + toOwnerCode: string + masterId: number + number: string + itemCode: string + remark: string + siteId: string + itemName: string + itemDesc1: string + itemDesc2: string + projectCode: string + toQty: number + fromQty: number + uom: string + interfaceType: string +} + +// 查询合包记录子列表 +export const getPackagemergeDetailPage = async (params) => { + return await request.get({ url: '/wms/packagemerge-detail/page', params }) +} + +// 查询合包记录子详情 +export const getPackagemergeDetail = async (id: number) => { + return await request.get({ url: '/wms/packagemerge-detail/get?id=' + id }) +} + +// 新增合包记录子 +export const createPackagemergeDetail = async (data: PackagemergeDetailVO) => { + return await request.post({ url: '/wms/packagemerge-detail/create', data }) +} + +// 修改合包记录子 +export const updatePackagemergeDetail = async (data: PackagemergeDetailVO) => { + return await request.put({ url: '/wms/packagemerge-detail/update', data }) +} + +// 删除合包记录子 +export const deletePackagemergeDetail = async (id: number) => { + return await request.delete({ url: '/wms/packagemerge-detail/delete?id=' + id }) +} + +// 导出合包记录子 Excel +export const exportPackagemergeDetailApi = async (params) => { + return await request.download({ url: '/wms/packagemerge-detail/export-excel', params }) +} diff --git a/src/api/wms/packagemergeMain/index.ts b/src/api/wms/packagemergeMain/index.ts new file mode 100644 index 000000000..263829285 --- /dev/null +++ b/src/api/wms/packagemergeMain/index.ts @@ -0,0 +1,68 @@ +import request from '@/config/axios' + +export interface PackagemergeMainVO { + id: number + warehouseCode: string + details: string + outTransactionType: string + inTransactionType: string + executeTime: Date + activeDate: Date + available: string + requestTime: Date + dueTime: Date + departmentCode: string + userGroupCode: string + interfaceType: string + number: string + businessType: string + remark: string + extraProperties: string + siteId: string +} + +// 查询合包记录主列表 +export const getPackagemergeMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packagemerge-main/senior', data }) + } else { + return await request.get({ url: `/wms/packagemerge-main/page`, params }) + } +} + +// 查询合包记录主详情 +export const getPackagemergeMain = async (id: number) => { + return await request.get({ url: `/wms/packagemerge-main/get?id=` + id }) +} + +// 新增合包记录主 +export const createPackagemergeMain = async (data: PackagemergeMainVO) => { + return await request.post({ url: `/wms/packagemerge-main/create`, data }) +} + +// 修改合包记录主 +export const updatePackagemergeMain = async (data: PackagemergeMainVO) => { + return await request.put({ url: `/wms/packagemerge-main/update`, data }) +} + +// 删除合包记录主 +export const deletePackagemergeMain = async (id: number) => { + return await request.delete({ url: `/wms/packagemerge-main/delete?id=` + id }) +} + +// 导出合包记录主 Excel +export const exportPackagemergeMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/packagemerge-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/packagemerge-main/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/packagemerge-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/packageoverDetail/index.ts b/src/api/wms/packageoverDetail/index.ts new file mode 100644 index 000000000..fe3c007a1 --- /dev/null +++ b/src/api/wms/packageoverDetail/index.ts @@ -0,0 +1,61 @@ +import request from '@/config/axios' + +export interface PackageoverDetailVO { + id: number + locationCode: string + locationGroupCode: string + areaCode: string + fromPackingNumber: string + toPackingNumber: string + fromBatch: string + toBatch: string + fromInventoryStatus: string + toInventoryStatus: string + fromContainerNumber: string + toContainerNumber: string + fromOwnerCode: string + toOwnerCode: string + masterId: number + number: string + itemCode: string + remark: string + siteId: string + itemName: string + itemDesc1: string + itemDesc2: string + projectCode: string + toQty: number + fromQty: number + uom: string + interfaceType: string +} + +// 查询翻包记录子列表 +export const getPackageoverDetailPage = async (params) => { + return await request.get({ url: '/wms/packageover-detail/page', params }) +} + +// 查询翻包记录子详情 +export const getPackageoverDetail = async (id: number) => { + return await request.get({ url: '/wms/packageover-detail/get?id=' + id }) +} + +// 新增翻包记录子 +export const createPackageoverDetail = async (data: PackageoverDetailVO) => { + return await request.post({ url: '/wms/packageover-detail/create', data }) +} + +// 修改翻包记录子 +export const updatePackageoverDetail = async (data: PackageoverDetailVO) => { + return await request.put({ url: '/wms/packageover-detail/update', data }) +} + +// 删除翻包记录子 +export const deletePackageoverDetail = async (id: number) => { + return await request.delete({ url: '/wms/packageover-detail/delete?id=' + id }) +} + +// 导出翻包记录子 Excel +export const exportPackageoverDetailApi = async (params) => { + return await request.download({ url: '/wms/packageover-detail/export-excel', params }) +} diff --git a/src/api/wms/packageoverMain/index.ts b/src/api/wms/packageoverMain/index.ts new file mode 100644 index 000000000..2950c3ba0 --- /dev/null +++ b/src/api/wms/packageoverMain/index.ts @@ -0,0 +1,63 @@ +import request from '@/config/axios' + +export interface PackageoverMainVO { + id: number + warehouseCode: string + details: string + outTransactionType: string + inTransactionType: string + executeTime: Date + activeDate: Date + available: string + requestTime: Date + dueTime: Date + departmentCode: string + userGroupCode: string + interfaceType: string + number: string + businessType: string + remark: string + extraProperties: string + siteId: string +} + +// 查询翻包记录主列表 +export const getPackageoverMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packageover-main/senior', data }) + } else { + return await request.get({ url: `/wms/packageover-main/page`, params }) + } +} + +// 查询翻包记录主详情 +export const getPackageoverMain = async (id: number) => { + return await request.get({ url: '/wms/packageover-main/get?id=' + id }) +} + +// 新增翻包记录主 +export const createPackageoverMain = async (data: PackageoverMainVO) => { + return await request.post({ url: '/wms/packageover-main/create', data }) +} + +// 修改翻包记录主 +export const updatePackageoverMain = async (data: PackageoverMainVO) => { + return await request.put({ url: '/wms/packageover-main/update', data }) +} + +// 删除翻包记录主 +export const deletePackageoverMain = async (id: number) => { + return await request.delete({ url: '/wms/packageover-main/delete?id=' + id }) +} + +// 导出翻包记录主 Excel +export const exportPackageoverMainApi = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/packageover-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/packageover-main/export-excel`, params }) + } +} diff --git a/src/api/wms/packagesplitDetail/index.ts b/src/api/wms/packagesplitDetail/index.ts new file mode 100644 index 000000000..0a026f642 --- /dev/null +++ b/src/api/wms/packagesplitDetail/index.ts @@ -0,0 +1,61 @@ +import request from '@/config/axios' + +export interface PackagesplitDetailVO { + id: number + locationCode: string + locationGroupCode: string + areaCode: string + fromPackingNumber: string + toPackingNumber: string + fromBatch: string + toBatch: string + fromInventoryStatus: string + toInventoryStatus: string + fromContainerNumber: string + toContainerNumber: string + fromOwnerCode: string + toOwnerCode: string + masterId: number + number: string + itemCode: string + remark: string + siteId: string + itemName: string + itemDesc1: string + itemDesc2: string + projectCode: string + toQty: number + fromQty: number + uom: string + interfaceType: string +} + +// 查询拆包记录子列表 +export const getPackagesplitDetailPage = async (params) => { + return await request.get({ url: '/wms/packagesplit-detail/page', params }) +} + +// 查询拆包记录子详情 +export const getPackagesplitDetail = async (id: number) => { + return await request.get({ url: '/wms/packagesplit-detail/get?id=' + id }) +} + +// 新增拆包记录子 +export const createPackagesplitDetail = async (data: PackagesplitDetailVO) => { + return await request.post({ url: '/wms/packagesplit-detail/create', data }) +} + +// 修改拆包记录子 +export const updatePackagesplitDetail = async (data: PackagesplitDetailVO) => { + return await request.put({ url: '/wms/packagesplit-detail/update', data }) +} + +// 删除拆包记录子 +export const deletePackagesplitDetail = async (id: number) => { + return await request.delete({ url: '/wms/packagesplit-detail/delete?id=' + id }) +} + +// 导出拆包记录子 Excel +export const exportPackagesplitDetailApi = async (params) => { + return await request.download({ url: '/wms/packagesplit-detail/export-excel', params }) +} diff --git a/src/api/wms/packagesplitMain/index.ts b/src/api/wms/packagesplitMain/index.ts new file mode 100644 index 000000000..37fbedd40 --- /dev/null +++ b/src/api/wms/packagesplitMain/index.ts @@ -0,0 +1,63 @@ +import request from '@/config/axios' + +export interface PackagesplitMainVO { + id: number + warehouseCode: string + details: string + outTransactionType: string + inTransactionType: string + executeTime: Date + activeDate: Date + available: string + requestTime: Date + dueTime: Date + departmentCode: string + userGroupCode: string + interfaceType: string + number: string + businessType: string + remark: string + extraProperties: string + siteId: string +} + +// 查询拆包记录主列表 +export const getPackagesplitMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packagesplit-main/senior', data }) + } else { + return await request.get({ url: `/wms/packagesplit-main/page`, params }) + } +} + +// 查询拆包记录主详情 +export const getPackagesplitMain = async (id: number) => { + return await request.get({ url: '/wms/packagesplit-main/get?id=' + id }) +} + +// 新增拆包记录主 +export const createPackagesplitMain = async (data: PackagesplitMainVO) => { + return await request.post({ url: '/wms/packagesplit-main/create', data }) +} + +// 修改拆包记录主 +export const updatePackagesplitMain = async (data: PackagesplitMainVO) => { + return await request.put({ url: '/wms/packagesplit-main/update', data }) +} + +// 删除拆包记录主 +export const deletePackagesplitMain = async (id: number) => { + return await request.delete({ url: '/wms/packagesplit-main/delete?id=' + id }) +} + +// 导出拆包记录主 Excel +export const exportPackagesplitMainApi = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/packagesplit-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/packagesplit-main/export-excel`, params }) + } +} diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue new file mode 100644 index 000000000..8c4ac1040 --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue @@ -0,0 +1,157 @@ + + + \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts new file mode 100644 index 000000000..1a8344ce8 --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts @@ -0,0 +1,415 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +export const PackagemergeMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + width: 180 + }, + }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 120 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '执行时间', + field: 'executeTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '生效日期', + field: 'activeDate', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '申请时间', + field: 'requestTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '截止时间', + field: 'dueTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable:false + }, + { + label: '用户组', + field: 'userGroupCode', + sort: 'custom', + isTable:false + }, + { + label: '接口类型', + field: 'interfaceType', + sort: 'custom', + isTable:false + }, + + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isTable:false + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isTable:false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + } +])) + +// 表单校验 +export const PackagemergeMainRules = reactive({ +}) + +export const PackagemergeDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从器具号', + field: 'fromContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到器具号', + field: 'toContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到数量', + field: 'toQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从数量', + field: 'fromQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, +])) + +// 表单校验 +export const PackagemergeDetailRules = reactive({ +}) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/index.vue new file mode 100644 index 000000000..4c510d6a4 --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/index.vue @@ -0,0 +1,157 @@ + + + \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts new file mode 100644 index 000000000..e0f8ccd22 --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts @@ -0,0 +1,417 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +export const PackageoverMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + width: 180 + }, + }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 120 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '执行时间', + field: 'executeTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '生效日期', + field: 'activeDate', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '申请时间', + field: 'requestTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '截止时间', + field: 'dueTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable:false + }, + { + label: '用户组', + field: 'userGroupCode', + sort: 'custom', + isTable:false + }, + { + label: '接口类型', + field: 'interfaceType', + sort: 'custom', + isTable:false + }, + + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isTable:false + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isTable:false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + } +])) + + +// 表单校验 +export const PackageoverMainRules = reactive({ +}) + +// 翻包子 +export const PackageoverDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从器具号', + field: 'fromContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到器具号', + field: 'toContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到数量', + field: 'toQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从数量', + field: 'fromQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, +])) + +// 表单校验 +export const PackageoverDetailRules = reactive({ +}) diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue new file mode 100644 index 000000000..87e30bf4b --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue @@ -0,0 +1,157 @@ + + + \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts new file mode 100644 index 000000000..5cc6874f5 --- /dev/null +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts @@ -0,0 +1,417 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + + +export const PackagesplitMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + width: 180 + }, + }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 120 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '执行时间', + field: 'executeTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '生效日期', + field: 'activeDate', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '申请时间', + field: 'requestTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '截止时间', + field: 'dueTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable:false + }, + { + label: '用户组', + field: 'userGroupCode', + sort: 'custom', + isTable:false + }, + { + label: '接口类型', + field: 'interfaceType', + sort: 'custom', + isTable:false + }, + + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isTable:false + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isTable:false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + } +])) + + +// 表单校验 +export const PackagesplitMainRules = reactive({ +}) + +export const PackagesplitDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从器具号', + field: 'fromContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到器具号', + field: 'toContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到数量', + field: 'toQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从数量', + field: 'fromQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, +])) +// 表单校验 +export const PackagesplitDetailRules = reactive({ +}) + From 036df53c0e0c9a54b9d859aeba38ba361962e5dd Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 09:31:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/countManage/countadjust/countadjustRequestMain/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index c1b1a6dd5..1f1cc569d 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -185,7 +185,6 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:delete'}), // 删除 ] } // 列表-操作按钮事件 From f289cd8a25bd802b6170464fcbae3974ab2c0222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 26 Dec 2023 11:36:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/index.vue | 69 ++++++++++++------- .../purchasePlanMain/purchasePlanMain.data.ts | 15 +++- 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 89d43ca3b..fe4f9e7da 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -81,23 +81,39 @@ row['itemCode'] = val[0]['code'] row['poNumber'] = val[0]['number'] row['poLine'] = val[0]['lineNumber'] - - await PurchaseDetailApi.getPurchaseDetailPage({ - number: row['poNumber'], - available: 'TRUE', - // poLine: row['lineNumber'], - }).then(res => { - if (formField == 'poLine') { - row['itemCode'] = res.list[0].itemCode - row['uom'] = res.list[0].uom - row['orderQty'] = res.list[0].orderQty - row['planQty'] = res.list[0].orderQty-res.list[0].plannedQty - row['available'] = res.list[0].available - } - }) + if (formField == 'poLine') { + row['itemCode'] = val[0]['itemCode'] + row['uom'] = val[0]['uom'] + row['orderQty'] = val[0]['orderQty'] + row['planQty'] = val[0]['orderQty']-val[0]['plannedQty'] + row['available'] = val[0]['available'] + } + // await PurchaseDetailApi.getPurchaseDetailPage({ + // number: row['poNumber'], + // available: 'TRUE', + // // poLine: row['lineNumber'], + // }).then(res => { + // if (formField == 'poLine') { + // row['itemCode'] = res.list[0].itemCode + // row['uom'] = res.list[0].uom + // row['orderQty'] = res.list[0].orderQty + // row['planQty'] = res.list[0].orderQty-res.list[0].plannedQty + // row['available'] = res.list[0].available + // } + // }) } else { const setV = {} setV[formField] = val[0][searchField] + setV['itemCode'] = val[0]['code'] + setV['poNumber'] = val[0]['number'] + setV['poLine'] = val[0]['lineNumber'] + if (formField == 'poLine') { + setV['itemCode'] = val[0]['itemCode'] + setV['uom'] = val[0]['uom'] + setV['orderQty'] = val[0]['orderQty'] + setV['planQty'] = val[0]['orderQty']-val[0]['plannedQty'] + setV['available'] = val[0]['available'] + } formRef.setValues(setV) } }) @@ -109,16 +125,23 @@ setV[formField] = val[0][searchField] setV['poNumber'] = val[0]['number'] setV['poLine'] = val[0]['lineNumber'] + if (formField == 'poLine') { + setV['itemCode'] = val[0]['itemCode'] + setV['uom'] = val[0]['uom'] + setV['orderQty'] = val[0]['orderQty'] + setV['planQty'] = val[0]['orderQty']-val[0]['plannedQty'] + setV['available'] = val[0]['available'] + } + // await PurchaseDetailApi.getPurchaseDetailPage({ + // number: setV['poNumber'], + // lineNumber: setV['poLine'], + // }).then(res => { + // if (res.list.length == 1) { + // // 叶佳兴 + // setV['itemCode'] = res.list[0].itemCode + // } + // }) formRef.setValues(setV) - await PurchaseDetailApi.getPurchaseDetailPage({ - number: setV['poNumber'], - lineNumber: setV['poLine'], - }).then(res => { - if (res.list.length == 1) { - // 叶佳兴 - setV['itemCode'] = res.list[0].itemCode - } - }) }) } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 32e7bbd2e..fb5aae880 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -314,6 +314,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchTitle: '采购订单信息', searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseDetailApi.getPurchaseDetailPage, + searchCondition: [{ + key: 'number', + value: 'poNumber', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } }, tableForm: { @@ -323,10 +332,14 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ searchTitle: '采购订单信息', searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseDetailApi.getPurchaseDetailPage, - searchCondition: [ { + searchCondition: [{ key: 'number', value: 'poNumber', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } },