Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
songguoqiang 4 months ago
parent
commit
af2039d643
  1. 61
      src/api/wms/processproductionRecordDetail/index.ts
  2. 57
      src/api/wms/processproductionRecordMain/index.ts
  3. 286
      src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
  4. 342
      src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts

61
src/api/wms/processproductionRecordDetail/index.ts

@ -0,0 +1,61 @@
import request from '@/config/axios'
export interface ProcessproductionRecordDetailVO {
masterId: number
number: string
processCode: string
productionLine: string
locationCode: string
componentItemCode: string
batch: string
componentItemcodeQty: number
effectiveDate: Date
available: string
remark: string
deletionTime: Date
deleterId: string
extraProperties: string
concurrencyStamp: number
siteId: string
}
// 查询工序报产记录子列表
export const getProcessproductionRecordDetailPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/processproduction-record-detail/senior', data })
} else {
return await request.get({ url: `/wms/processproduction-record-detail/page`, params })
}
}
// 查询工序报产记录子详情
export const getProcessproductionRecordDetail = async (id: number) => {
return await request.get({ url: `/wms/processproduction-record-detail/get?id=` + id })
}
// 新增工序报产记录子
export const createProcessproductionRecordDetail = async (data: ProcessproductionRecordDetailVO) => {
return await request.post({ url: `/wms/processproduction-record-detail/create`, data })
}
// 修改工序报产记录子
export const updateProcessproductionRecordDetail = async (data: ProcessproductionRecordDetailVO) => {
return await request.put({ url: `/wms/processproduction-record-detail/update`, data })
}
// 删除工序报产记录子
export const deleteProcessproductionRecordDetail = async (id: number) => {
return await request.delete({ url: `/wms/processproduction-record-detail/delete?id=` + id })
}
// 导出工序报产记录子 Excel
export const exportProcessproductionRecordDetail = async (params) => {
return await request.download({ url: `/wms/processproduction-record-detail/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/processproduction-record-detail/get-import-template' })
}

57
src/api/wms/processproductionRecordMain/index.ts

@ -0,0 +1,57 @@
import request from '@/config/axios'
export interface ProcessproductionRecordMainVO {
number: string
requestNumber: string
itemCode: string
completedQuantity: number
scrapQuantity: number
available: string
remark: string
deletionTime: Date
deleterId: string
extraProperties: string
concurrencyStamp: number
siteId: string
}
// 查询工序报产记录主列表
export const getProcessproductionRecordMainPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/processproduction-record-main/senior', data })
} else {
return await request.get({ url: `/wms/processproduction-record-main/page`, params })
}
}
// 查询工序报产记录主详情
export const getProcessproductionRecordMain = async (id: number) => {
return await request.get({ url: `/wms/processproduction-record-main/get?id=` + id })
}
// 新增工序报产记录主
export const createProcessproductionRecordMain = async (data: ProcessproductionRecordMainVO) => {
return await request.post({ url: `/wms/processproduction-record-main/create`, data })
}
// 修改工序报产记录主
export const updateProcessproductionRecordMain = async (data: ProcessproductionRecordMainVO) => {
return await request.put({ url: `/wms/processproduction-record-main/update`, data })
}
// 删除工序报产记录主
export const deleteProcessproductionRecordMain = async (id: number) => {
return await request.delete({ url: `/wms/processproduction-record-main/delete?id=` + id })
}
// 导出工序报产记录主 Excel
export const exportProcessproductionRecordMain = async (params) => {
return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/processproduction-record-main/get-import-template' })
}

286
src/views/wms/productionManage/processproduction/processproductionRecord/index.vue

@ -0,0 +1,286 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProcessproductionRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProcessproductionRecordMain.allSchemas"
:detailAllSchemas="ProcessproductionRecordDetail.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ProcessproductionRecordMainRules"
:formAllSchemas="ProcessproductionRecordMain.allSchemas"
:apiUpdate="ProcessproductionRecordMainApi.updateProcessproductionRecordMain"
:apiCreate="ProcessproductionRecordMainApi.createProcessproductionRecordMain"
@searchTableSuccess="searchTableSuccess"
:isBusiness="true"
:tableAllSchemas="ProcessproductionRecordDetail.allSchemas"
:tableFormRules="ProcessproductionRecordDetailRules"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="ProcessproductionRecordMain.allSchemas"
:detailAllSchemas="ProcessproductionRecordDetail.allSchemas"
:detailAllSchemasRules="ProcessproductionRecordDetailRules"
:apiCreate="ProcessproductionRecordDetailApi.createProcessproductionRecordDetail"
:apiUpdate="ProcessproductionRecordDetailApi.updateProcessproductionRecordDetail"
:apiPage="ProcessproductionRecordDetailApi.getProcessproductionRecordDetailPage"
:apiDelete="ProcessproductionRecordDetailApi.deleteProcessproductionRecordDetail"
@searchTableSuccessDetail="searchTableSuccessDetail"
:buttondataTable="buttondataTable"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/request/processproduction-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { ProcessproductionRecordMain,ProcessproductionRecordMainRules,ProcessproductionRecordDetail,ProcessproductionRecordDetailRules } from './processproductionRecordMain.data'
import * as ProcessproductionRecordMainApi from '@/api/wms/processproductionRecordMain'
import * as ProcessproductionRecordDetailApi from '@/api/wms/processproductionRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'ProcessproductionRequestMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...ProcessproductionRecordMain.allSchemas.tableColumns,...ProcessproductionRecordDetail.allSchemas.tableMainColumns])
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: ProcessproductionRecordDetailApi.getProcessproductionRecordDetailPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:processproduction-record-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:processproduction-record-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:processproduction-record-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){
return []
}
return [
defaultButtons.mainListEditBtn({hasPermi:'wms:processproduction-record-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:processproduction-record-main:delete'}), //
]
}
const buttondataTable = ref()
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =ProcessproductionRecordMain.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await ProcessproductionRecordMainApi.createProcessproductionRecordMain(data)
message.success(t('common.createSuccess'))
} else {
await ProcessproductionRecordMainApi.updateProcessproductionRecordMain(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
//
const { wsCache } = useCache()
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue, 'basicProcessproductionRequestMain')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ProcessproductionRecordMainApi.deleteProcessproductionRecordMain(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProcessproductionRecordMainApi.exportProcessproductionRecordMain(tableObject.params)
download.excel(data, '工序报产申请主.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '工序报产申请主导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ProcessproductionRecordMainApi.importTemplate()
})
</script>

342
src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts

@ -0,0 +1,342 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { fa } from 'element-plus/es/locale'
export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
},
{
label: '申请单据号',
field: 'requestNumber',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
},
{
label: '完工数量',
field: 'completedQuantity',
sort: 'custom',
table: {
width: 150
},
},
{
label: '报废数量',
field: 'scrapQuantity',
sort: 'custom',
table: {
width: 150
},
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
table: {
width: 150
},
isTable:false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isTable: false,
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
table: {
width: 150
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '删除者ID',
field: 'deleterId',
sort: 'custom',
isSearch: false,
table: {
width: 150
},
isTable: false,
},
{
label: '扩展属性',
field: 'extraProperties',
sort: 'custom',
isSearch: false,
isTable: false,
table: {
width: 150
},
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isSearch: false,
isTable: false,
form: {
component: 'InputNumber',
value: 0
},
table: {
width: 150
},
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isTable: false,
isSearch: false,
},
{
label: '操作',
field: 'action',
isForm: false,
isTable: false,
table: {
width: 150,
fixed: 'right'
}
}
]))
// 表单校验
export const ProcessproductionRecordMainRules = reactive({
available: [required],
})
export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '主表ID',
field: 'masterId',
sort: 'custom',
isTable:false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: false,
table: {
width: 150
},
},
{
label: '工序',
field: 'processCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '生产线',
field: 'productionLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '库位代码',
field: 'locationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '子物料代码',
field: 'componentItemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '子物料数量',
field: 'componentItemcodeQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '生效日期',
field: 'effectiveDate',
sort: 'custom',
formatter: dateFormatter,
table: {
width: 150
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
table: {
width: 150
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 150
},
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isTable: false,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '删除者ID',
field: 'deleterId',
sort: 'custom',
isSearch: false,
isTable: false,
},
{
label: '扩展属性',
field: 'extraProperties',
sort: 'custom',
isSearch: false,
isTable: false,
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isSearch: false,
isTable: false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isSearch: false,
isTable: false,
},
{
label: '操作',
field: 'action',
isForm: false,
hiddenInMain:true,
table: {
width: 150,
fixed: 'right'
}
}
]))
// 表单校验
export const ProcessproductionRecordDetailRules = reactive({
available: [required],
})
Loading…
Cancel
Save