feat: 完成客户第12条需求+多系统改造
1. 新增预警表添加工单号字段,支持按工单号检索预警 2. 添加工单过滤在制品/绩效报表/预警中心查询 3. 补全WMS台账字段口径与权限配置 4. 修复备料单与数量不符处理流程 5. 新增配送进度/库位联动/自动出库功能 6. 修复AGV配送状态更新逻辑 7. 优化退料与库存管理细节
This commit is contained in:
@@ -26,7 +26,8 @@ const todayStr = new Date().toLocaleDateString('sv-SE')
|
||||
function newInForm() {
|
||||
return {
|
||||
materialCode: '', zoneCode: '', orderNo: '', completedProcess: '',
|
||||
ownershipType: 'workorder', ownershipNo: '',
|
||||
// 归属:与入库管理同口径——必选(无「无」选项),选其他可不填编号,工单号/科技项目号必填编号
|
||||
ownershipType: '', ownershipNo: '',
|
||||
productStatus: '', relatedStandard: '', testRecordNo: '',
|
||||
recordedBy: operator, recordedAt: todayStr
|
||||
}
|
||||
@@ -64,6 +65,15 @@ async function submitInbound(cat) {
|
||||
ElMessage.warning('成品入库请选择产品状态(已通过/部分通过/返修)')
|
||||
return
|
||||
}
|
||||
// 归属必选(与入库管理同口径,不再有「无」);选其他可不填编号,工单号/科技项目号必须填编号
|
||||
if (!f.ownershipType) {
|
||||
ElMessage.warning('请选择归属(工单号 / 科技项目号 / 其他)')
|
||||
return
|
||||
}
|
||||
if ((f.ownershipType === 'workorder' || f.ownershipType === 'project') && !f.ownershipNo.trim()) {
|
||||
ElMessage.warning('请填写归属编号(工单号 / 科技项目号)')
|
||||
return
|
||||
}
|
||||
inbounding[cat] = true
|
||||
let ok = 0
|
||||
try {
|
||||
@@ -209,12 +219,12 @@ onMounted(() => {
|
||||
</el-form-item>
|
||||
<el-form-item label="归属">
|
||||
<div style="display:flex;gap:8px;width:100%">
|
||||
<el-select v-model="inForms[2].ownershipType" style="width:150px">
|
||||
<el-select v-model="inForms[2].ownershipType" placeholder="请选择" style="width:150px">
|
||||
<el-option value="workorder" label="工单号" />
|
||||
<el-option value="project" label="科技项目号" />
|
||||
<el-option value="none" label="无" />
|
||||
<el-option value="other" label="其他" />
|
||||
</el-select>
|
||||
<el-input v-model="inForms[2].ownershipNo" placeholder="归属编号(可空)" clearable />
|
||||
<el-input v-model="inForms[2].ownershipNo" placeholder="归属编号" clearable />
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="相关标准">
|
||||
@@ -276,12 +286,12 @@ onMounted(() => {
|
||||
</el-form-item>
|
||||
<el-form-item label="归属">
|
||||
<div style="display:flex;gap:8px;width:100%">
|
||||
<el-select v-model="inForms[3].ownershipType" style="width:150px">
|
||||
<el-select v-model="inForms[3].ownershipType" placeholder="请选择" style="width:150px">
|
||||
<el-option value="workorder" label="工单号" />
|
||||
<el-option value="project" label="科技项目号" />
|
||||
<el-option value="none" label="无" />
|
||||
<el-option value="other" label="其他" />
|
||||
</el-select>
|
||||
<el-input v-model="inForms[3].ownershipNo" placeholder="归属编号(可空)" clearable />
|
||||
<el-input v-model="inForms[3].ownershipNo" placeholder="归属编号" clearable />
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="相关标准">
|
||||
|
||||
Reference in New Issue
Block a user