handle batch plan

main
chenshuichuan 2 years ago
parent 9db47424dd
commit 70ed143d1c

@ -30,6 +30,7 @@
"@form-create/element-ui": "^3.1.24",
"@iconify/iconify": "^3.1.1",
"@videojs-player/vue": "^1.0.0",
"@vuepic/vue-datepicker": "^8.8.0",
"@vueuse/core": "^10.9.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.10",
@ -83,8 +84,8 @@
"@types/qs": "^6.9.12",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.1.0",
"@unocss/transformer-variant-group": "^0.58.5",
"@unocss/eslint-config": "^0.57.4",
"@unocss/transformer-variant-group": "^0.58.5",
"@vitejs/plugin-legacy": "^5.3.1",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^3.1.0",

File diff suppressed because it is too large Load Diff

@ -52,5 +52,9 @@ export const PlanApi = {
// 导出生产计划 Excel
exportPlan: async (params) => {
return await request.download({ url: `/mes/plan/export-excel`, params })
},
// 批量新增生产计划
saveBatchPlan: async (data: any) => {
return await request.post({ url: `/mes/plan/saveBatchPlan`, data })
}
}

@ -118,4 +118,9 @@ export const TaskApi = {
getProductItemNeedList: async (productId, number) => {
return await request.get({ url: `/mes/task/item-need/product?productId=` + productId +`&number=`+number})
},
// 或得生产任务单排程计划列表
generatePlanByTask: async (params) => {
return await request.get({ url: `/mes/task/generate-plan/byTask`, params })
},
}

@ -43,7 +43,7 @@
</el-select>
</el-form-item>
<el-form-item label="计划数量" prop="planNumber">
<el-input v-model="formData.planNumber" placeholder="请输入数量" />
<el-input-number v-model="formData.planNumber" :min="0" :precision="2" class="!w-1/1"/>
</el-form-item>
<el-form-item label="计划开始" prop="planStartTime">
@ -137,7 +137,8 @@ const formRules = reactive({
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number, taskId?: number, productId?: number) => {
const open = async (type: string, id?: number,
taskId?: number, productId?: number, number?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
@ -146,6 +147,8 @@ const open = async (type: string, id?: number, taskId?: number, productId?: numb
formData.value.taskId = taskId
if(productId)
formData.value.productId = productId
if(number)formData.value.planNumber = number
//
if (id) {

@ -0,0 +1,187 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
:default-sort="{ prop: 'sort_date', order: 'descending' }"
>
<el-table :data="formData" class="-mt-10px" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" type="index" width="60" />
<el-table-column disabled label="计划编码" min-width="170">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.code`" :rules="formRules.code" class="mb-0px!">
<el-input disabled v-model="row.code" placeholder="请输入计划编码" />
</el-form-item>
</template>
</el-table-column>
<el-table-column disabled="true" label="产品" min-width="150">
<template #default="{ row, $index }">
<el-form-item v-show="false" :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-input disabled v-model="row.productId" placeholder="请输入产品ID" />
</el-form-item>
<el-form-item :prop="`${$index}.productName`" :rules="formRules.productName" class="mb-0px!">
<el-input disabled v-model="row.productName" placeholder="请输入产品" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="数量" min-width="120">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.planNumber`" :rules="formRules.planNumber" class="mb-0px!">
<el-input v-model="row.planNumber" placeholder="请输入数量" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="sort_date" sortable label="计划开始时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.planStartTime`" :rules="formRules.planStartTime" class="mb-0px!">
<el-date-picker
v-model="row.planStartTime"
type="date"
value-format="x"
placeholder="选择计划开始时间"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="计划结束时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.planEndTime`" :rules="formRules.planEndTime" class="mb-0px!">
<el-date-picker
v-model="row.planEndTime"
type="date"
value-format="x"
placeholder="选择计划结束时间"
/>
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column label="生产主管" min-width="150">-->
<!-- <template #default="{ row, $index }">-->
<!-- <el-form-item :prop="`${$index}.productionManagerId`" :rules="formRules.productionManagerId" class="mb-0px!">-->
<!-- <el-input v-model="row.productionManagerId" placeholder="请输入生产主管" />-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
<el-input v-model="row.remark" placeholder="请输入备注" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="是否启用" min-width="140">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.isEnable`" :rules="formRules.isEnable" class="mb-0px!">
<el-radio-group v-model="row.isEnable">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="100">
<template #default="{row, $index }">
<el-button type="success" @click="handleCopy(row)" link>
<Icon icon="ep:document-copy" class="mr-5px"/>
</el-button>
<el-button type="danger" @click="handleDelete($index)" link>
<Icon icon="ep:delete" class="mr-5px"/>
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<!-- <el-row justify="center" class="mt-3">-->
<!-- <el-button @click="handleAdd" round>+ 添加生产计划</el-button>-->
<!-- </el-row>-->
</template>
<script setup lang="ts">
import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { TaskApi } from '@/api/mes/task'
const props = defineProps<{
taskId: undefined // ID
}>()
const formLoading = ref(false) //
const formData = ref([])
const formRules = reactive({
productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
taskId: [{ required: true, message: '任务单不能为空', trigger: 'blur' }],
planNumber: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
planStartTime: [{ required: true, message: '计划开始时间不能为空', trigger: 'blur' }],
planEndTime: [{ required: true, message: '计划结束时间不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 监听主表的关联字段的变化,加载对应的子表数据 */
watch(
() => props.taskId,
async (val) => {
// 1.
formData.value = []
// 2. val
if (!val) {
return;
}
},
{ immediate: true }
)
/** 新增按钮操作 */
// const handleAdd = () => {
// const row = {
// id: undefined,
// code: undefined,
// productId: undefined,
// taskDetailId: undefined,
// taskId: undefined,
// planNumber: undefined,
// finishNumber: undefined,
// status: undefined,
// planStartTime: undefined,
// planEndTime: undefined,
// startTime: undefined,
// endTime: undefined,
// productionManagerId: undefined,
// remark: undefined,
// isEnable: undefined,
// }
// row.taskId = props.taskId
// formData.value.push(row)
// }
/** 删除按钮操作 */
const handleDelete = (index) => {
formData.value.splice(index, 1)
}
/** 表单校验 */
const validate = () => {
return formRef.value.validate()
}
/** 表单值 */
const getData = () => {
return formData.value
}
/** 表单值 */
const setData = (data) => {
formData.value = data
}
defineExpose({ validate, getData , setData})
/** 删除按钮操作 */
const handleCopy = (row) => {
formData.value.push(row)
}
</script>

@ -1,17 +1,26 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="任务单" align="center" prop="taskCode" />
<el-table-column label="产品" align="center" prop="productName" />
<el-table-column label="任务总数" align="center" prop="totalNumber" />
<el-table-column label="已计划数" align="center" prop="planNumber" />
<el-table-column label="已计划" align="center" prop="planNumber" />
<el-table-column label="未计划" align="center">
<template #default="scope">
<span class="el-alert--warning" style="color: #e66126">
{{scope.row.totalNumber-scope.row.planNumber>0 ? scope.row.totalNumber-scope.row.planNumber : 0}}
</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="220px">
<template #default="scope">
<el-button
link
type="info"
@click="openItemNeed(scope.row.productName, scope.row.productId, scope.row.totalNumber-scope.row.planNumber)"
@click="openItemNeed(scope.row.productName, scope.row.productId,
scope.row.totalNumber-scope.row.planNumber)"
v-hasPermi="['mes:task:query']"
>
物料
@ -19,7 +28,8 @@
<el-button
link
type="primary"
@click="addPlanForm(scope.row.taskId, scope.row.productId)"
@click="addPlanForm(scope.row.taskId, scope.row.productId,
scope.row.totalNumber - scope.row.planNumber)"
v-hasPermi="['mes:task:update']"
>
新增计划
@ -92,12 +102,12 @@ const handleQuery = () => {
/** 添加/修改操作 */
const formRef = ref()
const addPlanForm = (taskId: number, productId: number) => {
const addPlanForm = (taskId: number, productId: number, number?: number) => {
if (!props.taskId) {
message.error('请选择一个生产任务单')
return
}
formRef.value.open('create', undefined, taskId, productId)
formRef.value.open('create', undefined, taskId, productId, number)
}
/** 跳转生产计划页面**/
const openPlan = (taskId: number, productId: number) => {
@ -109,6 +119,7 @@ const openPlan = (taskId: number, productId: number) => {
/** 物料需求 */
const itemFormRef = ref()
const openItemNeed = (productName:string, productId: number, number:number) => {
number = number>0 ? number : 0;
itemFormRef.value.open("product",productName, productId, number)
}
</script>

@ -0,0 +1,172 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1300px" v-loading="formLoading">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="120px"
>
<el-row :gutter="20" v-show="false">
<el-col :span="6">
<el-form-item label="任务单" prop="taskId">
<el-input readonly v-model="formData.taskId" placeholder="请输入"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务单" prop="taskCode">
<el-input readonly v-model="formData.taskCode" placeholder="请输入"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="计划产量" prop="productsOfPlan">
<el-input-number v-model="formData.productsOfPlan" :min="0" class="!w-1/1"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计划个数" prop="sizeOfPlan">
<el-input-number v-model="formData.sizeOfPlan" :min="0" class="!w-1/1"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="时间" prop="planDate">
<el-date-picker
v-model="formData.planDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="dates"
:default-time="[new Date('1 00:00:00')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item>
<el-button type="success" @click="handleQuery">
<Icon icon="ep:calendar" class="mr-5px"/>
自动排产
</el-button>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="danger" @click="resetQuery">
<Icon icon="ep:delete" class="mr-5px"/>
清空结果
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 子表的表单 -->
<el-tabs v-model="subTabsName">
<el-tab-pane label="预排产计划" name="plan">
<PlanForm ref="planFormRef" :task-id="formData.id"/>
</el-tab-pane>
<el-tab-pane label="已排产计划" name="finishPlan">
<el-text>hello</el-text>
</el-tab-pane>
</el-tabs>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import {TaskApi, TaskVO} from '@/api/mes/task'
import PlanForm from './PlanForm.vue'
import {PlanApi, PlanVO} from "@/api/mes/plan";
import {BomVO} from "@/api/mes/bom";
/** 生产任务单 表单 */
defineOptions({name: 'TaskPlanForm'})
const {t} = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formData = ref({
taskId: undefined,
taskCode: undefined,
sizeOfPlan: 0,
productsOfPlan: 20000,
planDate: []
})
const formRules = reactive({
taskId: [{required: true, message: '任务单不能为空', trigger: 'blur'}],
productsOfPlan: [{required: true, message: '单个计划生产数量不能为空', trigger: 'blur'}],
})
const formRef = ref() // Ref
/** 子表的表单 */
const subTabsName = ref('plan')
const planFormRef = ref()
/** 打开弹窗 */
const open = async (taskCode: string, taskId: number) => {
dialogVisible.value = true
dialogTitle.value = "任务单排产:" + taskCode
formData.value.taskId = taskId
formData.value.taskCode = taskCode
}
defineExpose({open}) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
try {
await planFormRef.value.validate()
} catch (e) {
subTabsName.value = 'plan'
return
}
//
formLoading.value = true
try {
//
let planList = planFormRef.value.getData()
await PlanApi.saveBatchPlan(planList)
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 排产 */
const handleQuery = async () => {
//
formLoading.value = true
try {
//const data = formData.value as unknown as TaskVO
const planData = await TaskApi.generatePlanByTask(formData.value)
planFormRef.value.setData(planData)
} finally {
formLoading.value = false
}
}
/** 清空列表 */
const resetQuery = () => {
planFormRef.value.setData(null)
}
</script>

@ -130,14 +130,21 @@
>
物料
</el-button>
<el-button
link
type="success"
@click="openPlan(scope.row.id)"
v-hasPermi="['mes:plan:query']"
>
生产计划
查看计划
</el-button>
<el-button
link
type="success"
@click="openTaskPlanForm(scope.row.id, scope.row.code)"
v-hasPermi="['mes:plan:query']"
>
排产
</el-button>
</template>
</el-table-column>
@ -161,6 +168,8 @@
</ContentWrap>
<!-- 物料列表 -->
<ItemNeedIndex ref="formRef" @success="getList" />
<!-- 排程弹窗 -->
<TaskPlanForm ref="taskPlanFormRef" @success="getList" />
</template>
<script setup lang="ts">
@ -171,6 +180,7 @@ import { TaskApi, TaskVO } from '@/api/mes/task'
import TaskDetailList from './components/TaskDetailList.vue'
import PlanForm from "@/views/mes/plan/PlanForm.vue";
import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
import TaskPlanForm from "@/views/mes/tasksummary/components/TaskPlan.vue";
/** 生产任务单 列表 */
defineOptions({ name: 'TaskSummary' })
@ -219,19 +229,6 @@ const resetQuery = () => {
handleQuery()
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await TaskApi.deleteTask(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
@ -269,4 +266,10 @@ const formRef = ref()
const openItemNeed = (taskCode:string, taskId: number) => {
formRef.value.open("task","任务单-"+taskCode, taskId)
}
/** 添加/修改操作 */
const taskPlanFormRef = ref()
const openTaskPlanForm = (taskId: number, taskCode:string) => {
taskPlanFormRef.value.open(taskCode, taskId )
}
</script>

Loading…
Cancel
Save