Browse Source

标签纠正

master
常熟吴彦祖 9 hours ago
parent
commit
fd3b9f717e
  1. 287
      src/views/modules/warehouse/labelChangeForDaPanDian.vue

287
src/views/modules/warehouse/labelChangeForDaPanDian.vue

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
<el-form-item label="子site">
<el-input style="width: 120px;" v-model="queryHeaderData.subSite" placeholder="请输入子site" @keyup.enter.native="getDataList()"></el-input>
</el-form-item>
<el-form-item label="入库状态"> <el-form-item label="入库状态">
<!-- 标签库存状态多选,空数组代表全部;修改库存不能改变隔离状态。- rqrq --> <!-- 标签库存状态多选,空数组代表全部;修改库存不能改变隔离状态。- rqrq -->
<el-select v-model="queryHeaderData.inStockFlags" multiple clearable placeholder="全部" style="width: 180px;"> <el-select v-model="queryHeaderData.inStockFlags" multiple clearable placeholder="全部" style="width: 180px;">
@ -30,13 +33,11 @@
<el-button @click="resetQuery()" type="default">{{ $t('warehouse.common.reset') }}</el-button> <el-button @click="resetQuery()" type="default">{{ $t('warehouse.common.reset') }}</el-button>
<!-- 去除非栈板库存按钮 - rqrq -->
<el-button @click="showRemoveNonPalletDialog()" type="danger" style="margin-left: 10px;">
<!-- 去除、恢复非栈板库存只给中山大site 55,其他大site不显示 - rqrq -->
<el-button v-if="showNonPalletInventoryActions" @click="showRemoveNonPalletDialog()" type="danger" style="margin-left: 10px;">
去除非栈板库存 去除非栈板库存
</el-button> </el-button>
<!-- 恢复非栈板库存按钮 - rqrq -->
<el-button @click="showRestoreNonPalletDialog()" type="warning" style="margin-left: 10px;">
<el-button v-if="showNonPalletInventoryActions" @click="showRestoreNonPalletDialog()" type="warning" style="margin-left: 10px;">
恢复非栈板库存 恢复非栈板库存
</el-button> </el-button>
<el-button @click="showOtherInboundDialog()" type="success">创建新标签</el-button> <el-button @click="showOtherInboundDialog()" type="success">创建新标签</el-button>
@ -74,6 +75,9 @@
<span v-else-if="item.columnProp === 'lastPrintDate' || item.columnProp === 'createdDate'"> <span v-else-if="item.columnProp === 'lastPrintDate' || item.columnProp === 'createdDate'">
{{ formatDate(scope.row[item.columnProp]) }} {{ formatDate(scope.row[item.columnProp]) }}
</span> </span>
<span v-else-if="item.columnProp === 'receiveDate' || item.columnProp === 'expiredDate'">
{{ formatDay(scope.row[item.columnProp]) }}
</span>
<span v-else-if="item.columnProp === 'reserveFlag'"> <span v-else-if="item.columnProp === 'reserveFlag'">
{{ scope.row.reserveFlag === 'Y' ? '是' : '否' }} {{ scope.row.reserveFlag === 'Y' ? '是' : '否' }}
</span> </span>
@ -91,7 +95,6 @@
重打标签 重打标签
</a> </a>
<a <a
v-if="scope.row.inStockFlag !== 'Q'"
@click="openEditInventoryDialog(scope.row)" @click="openEditInventoryDialog(scope.row)"
type="primary" type="primary"
style="margin-left: 10px; color: #409EFF;"> style="margin-left: 10px; color: #409EFF;">
@ -125,6 +128,25 @@
width="450px" width="450px"
:close-on-click-modal="false"> :close-on-click-modal="false">
<el-form :model="otherInboundForm" ref="otherInboundForm" class="other-inbound-form"> <el-form :model="otherInboundForm" ref="otherInboundForm" class="other-inbound-form">
<el-row :gutter="20">
<el-col :span="12">
<!-- 新标签必须落到授权小site,不能再写成登录大site - rqrq -->
<el-form-item label="工厂" prop="site" class="form-item-vertical">
<el-select
v-model="otherInboundForm.site"
placeholder="请选择工厂"
:loading="otherInboundSiteLoading"
style="width: 100%">
<el-option
v-for="item in otherInboundSiteOptions"
:key="item.siteCode"
:label="item.siteName"
:value="item.siteCode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="partNo" class="form-item-vertical"> <el-form-item label="物料编码" prop="partNo" class="form-item-vertical">
@ -352,19 +374,24 @@
:visible.sync="editInventoryDialogVisible" :visible.sync="editInventoryDialogVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
v-drag v-drag
width="700px">
width="900px">
<el-form :model="editInventoryForm" ref="editInventoryForm" label-position="top" style="margin-top: 1px; margin-left: 0px;"> <el-form :model="editInventoryForm" ref="editInventoryForm" label-position="top" style="margin-top: 1px; margin-left: 0px;">
<!-- 第一行:只读信息 - rqrq -->
<el-row :gutter="20">
<el-col :span="12">
<!-- 子site排在标签号前;原半宽改为三分之一,原四分之一改为六分之一 - rqrq -->
<el-row :gutter="12">
<el-col :span="8">
<el-form-item label="子site">
<el-input v-model="editInventoryForm.site" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标签号"> <el-form-item label="标签号">
<el-input v-model="editInventoryForm.unitId" disabled></el-input> <el-input v-model="editInventoryForm.unitId" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="物料编码"> <el-form-item label="物料编码">
<div style="display: flex; gap: 8px;"> <div style="display: flex; gap: 8px;">
<el-input v-model="editInventoryForm.partNo" disabled style="width: 100px;"></el-input>
<el-input v-model="editInventoryForm.partNo" disabled style="flex: 1; min-width: 0;"></el-input>
<el-button type="primary" @click="querySamePartInventory" :loading="samePartLoading" style="flex-shrink: 0;"> <el-button type="primary" @click="querySamePartInventory" :loading="samePartLoading" style="flex-shrink: 0;">
查询IFS库存 查询IFS库存
</el-button> </el-button>
@ -373,14 +400,13 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 第二行:批次号、库位 - rqrq -->
<el-row :gutter="20">
<el-col :span="12">
<el-row :gutter="12">
<el-col :span="8">
<el-form-item label="批次号" prop="batchNo"> <el-form-item label="批次号" prop="batchNo">
<el-input v-model="editInventoryForm.batchNo" placeholder="请输入批次号"></el-input> <el-input v-model="editInventoryForm.batchNo" placeholder="请输入批次号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="库位(选择)" prop="locationId"> <el-form-item label="库位(选择)" prop="locationId">
<el-select <el-select
v-model="editInventoryForm.locationId" v-model="editInventoryForm.locationId"
@ -398,35 +424,38 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="WDR" prop="wdr">
<el-input v-model="editInventoryForm.wdr" placeholder="请输入WDR"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第三行:仓库编码、WDR - rqrq -->
<el-row :gutter="20">
<el-col :span="6">
<el-row :gutter="12">
<el-col :span="4">
<el-form-item label="仓库编码"> <el-form-item label="仓库编码">
<el-input v-model="editInventoryForm.warehouseId" disabled placeholder="选择库位后自动带出"></el-input> <el-input v-model="editInventoryForm.warehouseId" disabled placeholder="选择库位后自动带出"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="库位编码(手输)"> <el-form-item label="库位编码(手输)">
<el-input v-model="editInventoryForm.locationId" @blur="handleManualLocationBlur"></el-input> <el-input v-model="editInventoryForm.locationId" @blur="handleManualLocationBlur"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="WDR" prop="wdr">
<el-input v-model="editInventoryForm.wdr" placeholder="请输入WDR"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第四行:engChgLevel、失效日期 - rqrq -->
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="8">
<el-form-item label="engChgLevel" prop="engChgLevel"> <el-form-item label="engChgLevel" prop="engChgLevel">
<el-input v-model="editInventoryForm.engChgLevel" placeholder="请输入engChgLevel"></el-input> <el-input v-model="editInventoryForm.engChgLevel" placeholder="请输入engChgLevel"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="数量" prop="qty">
<el-input v-model="editInventoryForm.qty" type="number" placeholder="请输入数量"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="8">
<el-form-item label="失效日期" prop="expiredDate"> <el-form-item label="失效日期" prop="expiredDate">
<el-date-picker <el-date-picker
v-model="editInventoryForm.expiredDate" v-model="editInventoryForm.expiredDate"
@ -437,29 +466,32 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- 第五行:数量、是否在库 - rqrq -->
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="数量" prop="qty">
<el-input v-model="editInventoryForm.qty" type="number" placeholder="请输入数量"></el-input>
<el-col :span="8">
<el-form-item label="接收日期" prop="receiveDate">
<el-date-picker
v-model="editInventoryForm.receiveDate"
type="date"
placeholder="请选择接收日期"
style="width: 100%"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="是否在库" prop="inStockFlag"> <el-form-item label="是否在库" prop="inStockFlag">
<el-select v-model="editInventoryForm.inStockFlag" placeholder="请选择" style="width: 100%">
<!-- 隔离只展示,不能在本弹窗改入或改出;解除隔离仍走专用功能 - rqrq -->
<el-select v-model="editInventoryForm.inStockFlag" placeholder="请选择" style="width: 100%" :disabled="editInventoryOriginalInStockFlag === 'Q'">
<el-option label="在库" value="Y"></el-option> <el-option label="在库" value="Y"></el-option>
<el-option label="已出库" value="N"></el-option> <el-option label="已出库" value="N"></el-option>
<el-option label="未入库" value="X"></el-option> <el-option label="未入库" value="X"></el-option>
<el-option v-if="editInventoryOriginalInStockFlag === 'Q'" label="隔离" value="Q"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第六行:AvailabilityControlId - rqrq -->
<el-row :gutter="20">
<el-col :span="12">
<el-row :gutter="12">
<el-col :span="8">
<el-form-item label="AvailabilityControlId" prop="availabilityControlId"> <el-form-item label="AvailabilityControlId" prop="availabilityControlId">
<el-input v-model="editInventoryForm.availabilityControlId" placeholder="请输入AvailabilityControlId"></el-input> <el-input v-model="editInventoryForm.availabilityControlId" placeholder="请输入AvailabilityControlId"></el-input>
</el-form-item> </el-form-item>
@ -541,6 +573,12 @@
height="400" height="400"
style="width: 100%" style="width: 100%"
@row-dblclick="handleSamePartRowDblClick"> @row-dblclick="handleSamePartRowDblClick">
<!-- IFS的Contract是子site,只展示,双击不回写到标签 - rqrq -->
<el-table-column prop="Contract" label="子site" min-width="90" align="center" header-align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.Contract || scope.row.contract || '' }}
</template>
</el-table-column>
<el-table-column prop="LotBatchNo" label="批次号" min-width="120" align="center" header-align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="LotBatchNo" label="批次号" min-width="120" align="center" header-align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="LocationNo" label="库位" min-width="100" align="center" header-align="center"></el-table-column> <el-table-column prop="LocationNo" label="库位" min-width="100" align="center" header-align="center"></el-table-column>
<el-table-column prop="Warehouse" label="仓库" min-width="80" align="center" header-align="center"></el-table-column> <el-table-column prop="Warehouse" label="仓库" min-width="80" align="center" header-align="center"></el-table-column>
@ -551,12 +589,17 @@
{{ scope.row.ExpirationDate ? scope.row.ExpirationDate.substring(0, 10) : '' }} {{ scope.row.ExpirationDate ? scope.row.ExpirationDate.substring(0, 10) : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ReceiptDate" label="接收日期" min-width="100" align="center" header-align="center">
<template slot-scope="scope">
{{ (scope.row.ReceiptDate || scope.row.receiptDate || '').toString().substring(0, 10) }}
</template>
</el-table-column>
<el-table-column prop="QtyOnhand" label="在库数量" min-width="100" align="right" header-align="center"></el-table-column> <el-table-column prop="QtyOnhand" label="在库数量" min-width="100" align="right" header-align="center"></el-table-column>
<el-table-column prop="QtyReserved" label="预留数量" min-width="100" align="right" header-align="center"></el-table-column> <el-table-column prop="QtyReserved" label="预留数量" min-width="100" align="right" header-align="center"></el-table-column>
<el-table-column prop="AvailabilityControlId" label="AvailabilityControlId" min-width="80" align="center" header-align="center"></el-table-column> <el-table-column prop="AvailabilityControlId" label="AvailabilityControlId" min-width="80" align="center" header-align="center"></el-table-column>
</el-table> </el-table>
<div style="margin-top: 10px; color: #909399; font-size: 12px;"> <div style="margin-top: 10px; color: #909399; font-size: 12px;">
<i class="el-icon-info"></i> 数据来源:IFS系统库存。双击行可将该记录的批次号、WDR、版本号、失效日期覆盖到编辑表单
<i class="el-icon-info"></i> 数据来源:IFS系统库存。双击行可将该记录的批次号、WDR、版本号、失效日期、接收日期覆盖到编辑表单
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="samePartInventoryDialogVisible = false">{{ $t('warehouse.common.close') }}</el-button> <el-button @click="samePartInventoryDialogVisible = false">{{ $t('warehouse.common.close') }}</el-button>
@ -571,6 +614,8 @@ import { getInventoryPartInStock } from '@/api/base/ifsInventoryQuery' // 查询
import { getLocationList } from '@/api/warehouse/location' import { getLocationList } from '@/api/warehouse/location'
import { searchSysLanguagePackList, saveUserFavorite, searchUserFavorite } from '@/api/sysLanguage' import { searchSysLanguagePackList, saveUserFavorite, searchUserFavorite } from '@/api/sysLanguage'
import { createOtherInboundHU, printLabel } from '@/api/warehouse/otherInbound' import { createOtherInboundHU, printLabel } from '@/api/warehouse/otherInbound'
import { getUserAuthorizedSubSiteCodes } from '@/api/factory/accessSite'
import { getAuthorizedSubSiteCodeList } from '@/utils/subSiteAuth'
export default { export default {
data() { data() {
@ -590,6 +635,16 @@ export default {
height: 500, height: 500,
// 表格列配置 - rqrq // 表格列配置 - rqrq
columnList: [ columnList: [
{
columnProp: "site",
headerAlign: "center",
align: "center",
columnLabel: "子site",
columnWidth: 90,
columnSortable: false,
showOverflowTooltip: true,
fixed: ""
},
{ {
columnProp: "unitId", columnProp: "unitId",
headerAlign: "center", headerAlign: "center",
@ -680,6 +735,16 @@ export default {
showOverflowTooltip: true, showOverflowTooltip: true,
fixed: "" fixed: ""
}, },
{
columnProp: "receiveDate",
headerAlign: "center",
align: "center",
columnLabel: "接收日期",
columnWidth: 120,
columnSortable: false,
showOverflowTooltip: true,
fixed: ""
},
{ {
columnProp: "qty", columnProp: "qty",
headerAlign: "center", headerAlign: "center",
@ -792,6 +857,7 @@ export default {
} }
], ],
queryHeaderData: { queryHeaderData: {
subSite: '',
inStockFlag: '', inStockFlag: '',
inStockFlags: [], inStockFlags: [],
partNo: '', partNo: '',
@ -809,7 +875,10 @@ export default {
// 其它入库标签打印相关 // 其它入库标签打印相关
otherInboundVisible: false, otherInboundVisible: false,
otherInboundLoading: false, otherInboundLoading: false,
otherInboundSiteOptions: [],
otherInboundSiteLoading: false,
otherInboundForm: { otherInboundForm: {
site: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
batchNo: '', batchNo: '',
@ -880,8 +949,10 @@ export default {
// 修改库存信息相关 - rqrq // 修改库存信息相关 - rqrq
editInventoryDialogVisible: false, editInventoryDialogVisible: false,
editInventoryLoading: false, editInventoryLoading: false,
editInventoryOriginalInStockFlag: '',
locationOptions: [], // 库位下拉选项 - rqrq locationOptions: [], // 库位下拉选项 - rqrq
editInventoryForm: { editInventoryForm: {
site: '',
unitId: '', unitId: '',
partNo: '', partNo: '',
batchNo: '', batchNo: '',
@ -890,6 +961,7 @@ export default {
wdr: '', wdr: '',
engChgLevel: '', engChgLevel: '',
expiredDate: '', expiredDate: '',
receiveDate: '',
qty: '', qty: '',
inStockFlag: '', inStockFlag: '',
availabilityControlId: '' // AvailabilityControlId - rqrq availabilityControlId: '' // AvailabilityControlId - rqrq
@ -908,6 +980,12 @@ export default {
samePartInventoryList: [], samePartInventoryList: [],
} }
}, },
computed: {
// 去除、恢复非栈板库存只在登录大site为55时显示 - rqrq
showNonPalletInventoryActions() {
return String(localStorage.getItem('site') || '').trim() === '55'
}
},
activated() { activated() {
this.getDataList() this.getDataList()
this.getHeight() this.getHeight()
@ -924,7 +1002,8 @@ export default {
page: this.pageIndex, page: this.pageIndex,
size: this.pageSize, size: this.pageSize,
site: localStorage.getItem('site'), site: localStorage.getItem('site'),
...this.queryHeaderData
...this.queryHeaderData,
subSite: String(this.queryHeaderData.subSite || '').trim()
} }
getHandlingUnitLabelList(params).then(({ data }) => { getHandlingUnitLabelList(params).then(({ data }) => {
@ -947,6 +1026,7 @@ export default {
// 重置查询条件 // 重置查询条件
resetQuery() { resetQuery() {
this.queryHeaderData = { this.queryHeaderData = {
subSite: '',
inStockFlag: '', inStockFlag: '',
inStockFlags: [], inStockFlags: [],
partNo: '', partNo: '',
@ -1016,8 +1096,13 @@ export default {
}).then(async () => { }).then(async () => {
try { try {
this.dataListLoading = true this.dataListLoading = true
if (!row.site) {
this.$alert('标签缺少所属工厂,无法删除', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') })
return
}
// 删除按标签自己的小site定位,不能用登录大site - rqrq
const { data } = await deleteLabel({ const { data } = await deleteLabel({
site: localStorage.getItem('site'),
site: row.site,
unitId: row.unitId unitId: row.unitId
}) })
if (data && data.code === 0) { if (data && data.code === 0) {
@ -1062,11 +1147,27 @@ export default {
const seconds = String(d.getSeconds()).padStart(2, '0') const seconds = String(d.getSeconds()).padStart(2, '0')
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}` return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
}, },
formatDay(date) {
if (!date) return ''
const text = String(date)
if (/^\d{4}-\d{2}-\d{2}/.test(text)) {
return text.substring(0, 10)
}
const parsed = new Date(date)
if (Number.isNaN(parsed.getTime())) {
return ''
}
const year = parsed.getFullYear()
const month = String(parsed.getMonth() + 1).padStart(2, '0')
const day = String(parsed.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
},
// 导出相关方法 - rqrq // 导出相关方法 - rqrq
async createExportData() { async createExportData() {
const queryParams = { const queryParams = {
site: localStorage.getItem('site'), site: localStorage.getItem('site'),
...this.queryHeaderData, ...this.queryHeaderData,
subSite: String(this.queryHeaderData.subSite || '').trim(),
page: 1, page: 1,
size: 999999 // 设置一个很大的数字来获取全部数据 - rqrq size: 999999 // 设置一个很大的数字来获取全部数据 - rqrq
} }
@ -1078,7 +1179,9 @@ export default {
inStockFlag: item.inStockFlag === 'Y' ? '在库' : item.inStockFlag === 'N' ? '已出库' : item.inStockFlag === 'X' ? '未入库' : item.inStockFlag === 'Q' ? '隔离' : item.inStockFlag, inStockFlag: item.inStockFlag === 'Y' ? '在库' : item.inStockFlag === 'N' ? '已出库' : item.inStockFlag === 'X' ? '未入库' : item.inStockFlag === 'Q' ? '隔离' : item.inStockFlag,
reserveFlag: item.reserveFlag === 'Y' ? '是' : '否', reserveFlag: item.reserveFlag === 'Y' ? '是' : '否',
lastPrintDate: this.formatDate(item.lastPrintDate), lastPrintDate: this.formatDate(item.lastPrintDate),
createdDate: this.formatDate(item.createdDate)
createdDate: this.formatDate(item.createdDate),
receiveDate: this.formatDay(item.receiveDate),
expiredDate: this.formatDay(item.expiredDate)
} }
}) })
} }
@ -1112,10 +1215,50 @@ export default {
}, },
// 显示其它入库标签打印对话框 // 显示其它入库标签打印对话框
normalizeSiteCodeList(siteCodeList) {
if (!Array.isArray(siteCodeList)) {
return []
}
return Array.from(new Set(siteCodeList.map(item => String(item || '').trim()).filter(item => !!item)))
},
applyOtherInboundAuthorizedSites(siteCodeList, parentSite) {
const normalizedSiteCodeList = this.normalizeSiteCodeList(siteCodeList)
const finalSiteCodeList = normalizedSiteCodeList.length > 0
? normalizedSiteCodeList
: this.normalizeSiteCodeList(parentSite ? [parentSite] : [])
this.otherInboundSiteOptions = finalSiteCodeList.map(siteCode => ({
siteCode,
siteName: siteCode
}))
if (!this.otherInboundSiteOptions.some(item => item.siteCode === this.otherInboundForm.site)) {
this.otherInboundForm.site = this.otherInboundSiteOptions.length > 0 ? this.otherInboundSiteOptions[0].siteCode : ''
}
},
async loadOtherInboundAuthorizedSites() {
const userName = String(localStorage.getItem('userName') || '').trim()
const parentSite = String(localStorage.getItem('site') || '').trim()
const cacheSubSiteCodeList = getAuthorizedSubSiteCodeList(this.$store.state.user.subSiteCodeList)
this.applyOtherInboundAuthorizedSites(cacheSubSiteCodeList, parentSite)
if (!userName || !parentSite) {
return
}
this.otherInboundSiteLoading = true
try {
const { data } = await getUserAuthorizedSubSiteCodes({ userName, site: parentSite })
if (data && data.code === 0) {
this.applyOtherInboundAuthorizedSites(data.data || [], parentSite)
}
} catch (error) {
console.error('获取用户授权site失败:', error)
} finally {
this.otherInboundSiteLoading = false
}
},
showOtherInboundDialog() { showOtherInboundDialog() {
this.otherInboundVisible = true this.otherInboundVisible = true
// 重置表单
// 重置表单,工厂留给授权小site加载后回填 - rqrq
this.otherInboundForm = { this.otherInboundForm = {
site: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
batchNo: '', batchNo: '',
@ -1130,6 +1273,7 @@ export default {
remark: '', remark: '',
height: '', height: '',
} }
this.loadOtherInboundAuthorizedSites()
this.$nextTick(() => { this.$nextTick(() => {
if (this.$refs['otherInboundForm']) { if (this.$refs['otherInboundForm']) {
this.$refs['otherInboundForm'].clearValidate() this.$refs['otherInboundForm'].clearValidate()
@ -1141,6 +1285,10 @@ export default {
async createOtherInboundHU() { async createOtherInboundHU() {
try { try {
// 基本验证 // 基本验证
if (!this.otherInboundForm.site) {
this.$alert('请选择工厂', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') })
return
}
if (!this.otherInboundForm.partNo) { if (!this.otherInboundForm.partNo) {
this.$alert('物料编码不能为空', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') }) this.$alert('物料编码不能为空', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') })
return return
@ -1166,7 +1314,7 @@ export default {
// 准备创建HU的数据 // 准备创建HU的数据
const createData = { const createData = {
site: localStorage.getItem('site'),
site: this.otherInboundForm.site,
warehouseId: this.otherInboundForm.warehouseId, warehouseId: this.otherInboundForm.warehouseId,
partNo: this.otherInboundForm.partNo, partNo: this.otherInboundForm.partNo,
partDesc: this.otherInboundForm.partDesc, partDesc: this.otherInboundForm.partDesc,
@ -1327,13 +1475,15 @@ export default {
* @param row 当前行数据 * @param row 当前行数据
*/ */
openEditInventoryDialog(row) { openEditInventoryDialog(row) {
// 页面提前拒绝隔离标签;后端仍会按当前状态再次复核,防止旧页面或并发绕过。- rqrq
if (row.inStockFlag === 'Q') {
this.$alert('隔离标签请先使用专用解除隔离功能', '提示')
if (!row.site) {
this.$alert('标签缺少所属工厂,无法修改', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') })
return return
} }
// 填充表单数据 - rqrq
// 隔离标签允许改其他字段,是否在库保持Q且不可改 - rqrq
this.editInventoryOriginalInStockFlag = row.inStockFlag || ''
// 填充表单数据;site保留标签小site,后续库位和IFS都用它 - rqrq
this.editInventoryForm = { this.editInventoryForm = {
site: row.site,
unitId: row.unitId || '', unitId: row.unitId || '',
partNo: row.partNo || '', partNo: row.partNo || '',
batchNo: row.batchNo || '', batchNo: row.batchNo || '',
@ -1341,7 +1491,8 @@ export default {
warehouseId: row.warehouseId || '', warehouseId: row.warehouseId || '',
wdr: row.wdr || '', wdr: row.wdr || '',
engChgLevel: row.engChgLevel || '', engChgLevel: row.engChgLevel || '',
expiredDate: row.expiredDate ? row.expiredDate.substring(0, 10) : '',
expiredDate: row.expiredDate ? String(row.expiredDate).substring(0, 10) : '',
receiveDate: this.formatDay(row.receiveDate),
qty: row.qty || '', qty: row.qty || '',
inStockFlag: row.inStockFlag || 'Y', inStockFlag: row.inStockFlag || 'Y',
availabilityControlId: row.availabilityControlId || '' // AvailabilityControlId - rqrq availabilityControlId: row.availabilityControlId || '' // AvailabilityControlId - rqrq
@ -1357,9 +1508,9 @@ export default {
*/ */
loadLocationOptions() { loadLocationOptions() {
const params = { const params = {
site: localStorage.getItem('site'),
site: this.editInventoryForm.site,
page: 1, page: 1,
limit: 9999
size: 9999
} }
getLocationList(params).then(({ data }) => { getLocationList(params).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -1400,8 +1551,13 @@ export default {
this.editInventoryLoading = true this.editInventoryLoading = true
if (!this.editInventoryForm.site) {
this.$alert('标签缺少所属工厂,无法保存', this.$t('warehouse.common.error'), { confirmButtonText: this.$t('warehouse.common.confirm') })
this.editInventoryLoading = false
return
}
const saveData = { const saveData = {
site: localStorage.getItem('site'),
site: this.editInventoryForm.site,
unitId: this.editInventoryForm.unitId, unitId: this.editInventoryForm.unitId,
batchNo: this.editInventoryForm.batchNo, batchNo: this.editInventoryForm.batchNo,
locationId: this.editInventoryForm.locationId, locationId: this.editInventoryForm.locationId,
@ -1409,6 +1565,7 @@ export default {
wdr: this.editInventoryForm.wdr, wdr: this.editInventoryForm.wdr,
engChgLevel: this.editInventoryForm.engChgLevel, engChgLevel: this.editInventoryForm.engChgLevel,
expiredDate: this.editInventoryForm.expiredDate, expiredDate: this.editInventoryForm.expiredDate,
receiveDate: this.editInventoryForm.receiveDate || null,
qty: this.editInventoryForm.qty ? parseFloat(this.editInventoryForm.qty) : null, qty: this.editInventoryForm.qty ? parseFloat(this.editInventoryForm.qty) : null,
inStockFlag: this.editInventoryForm.inStockFlag, inStockFlag: this.editInventoryForm.inStockFlag,
availabilityControlId: this.editInventoryForm.availabilityControlId // AvailabilityControlId - rqrq availabilityControlId: this.editInventoryForm.availabilityControlId // AvailabilityControlId - rqrq
@ -1538,7 +1695,7 @@ export default {
// 调用IFS接口查询同物料库存 - rqrq // 调用IFS接口查询同物料库存 - rqrq
getInventoryPartInStock({ getInventoryPartInStock({
site: localStorage.getItem('site'),
site: this.editInventoryForm.site,
partNo: this.editInventoryForm.partNo partNo: this.editInventoryForm.partNo
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -1563,7 +1720,7 @@ export default {
* @param row IFS库存行数据 * @param row IFS库存行数据
*/ */
handleSamePartRowDblClick(row) { handleSamePartRowDblClick(row) {
// 覆盖可编辑字段(使用IFS字段名,IFS返回的字段名为大写开头)- rqrq
// 覆盖可编辑字段。IFS的Contract只在列表展示,不替换当前标签的子site - rqrq
this.editInventoryForm.batchNo = row.LotBatchNo || row.lotBatchNo || '' this.editInventoryForm.batchNo = row.LotBatchNo || row.lotBatchNo || ''
this.editInventoryForm.wdr = row.WaivDevRejNo || row.waivDevRejNo || '' this.editInventoryForm.wdr = row.WaivDevRejNo || row.waivDevRejNo || ''
this.editInventoryForm.engChgLevel = row.EngChgLevel || row.engChgLevel || '' this.editInventoryForm.engChgLevel = row.EngChgLevel || row.engChgLevel || ''
@ -1573,6 +1730,8 @@ export default {
// 获取失效日期 - rqrq // 获取失效日期 - rqrq
const expirationDate = row.ExpirationDate || row.expirationDate || '' const expirationDate = row.ExpirationDate || row.expirationDate || ''
this.editInventoryForm.expiredDate = expirationDate ? expirationDate.substring(0, 10) : '' this.editInventoryForm.expiredDate = expirationDate ? expirationDate.substring(0, 10) : ''
const receiptDate = row.ReceiptDate || row.receiptDate || ''
this.editInventoryForm.receiveDate = receiptDate ? String(receiptDate).substring(0, 10) : ''
// 获取IFS库位 - rqrq // 获取IFS库位 - rqrq
const ifsLocationNo = row.LocationNo || row.locationNo || '' const ifsLocationNo = row.LocationNo || row.locationNo || ''
@ -1583,7 +1742,7 @@ export default {
} else { } else {
// 如果IFS没有库位信息,不做替换 - rqrq // 如果IFS没有库位信息,不做替换 - rqrq
this.samePartInventoryDialogVisible = false this.samePartInventoryDialogVisible = false
this.$message.success('已将IFS库存记录的批次号、WDR、版本号、失效日期、AvailabilityControlId覆盖到表单')
this.$message.success('已将IFS库存记录的批次号、WDR、版本号、失效日期、接收日期、AvailabilityControlId覆盖到表单')
} }
}, },
@ -1593,7 +1752,7 @@ export default {
*/ */
checkLocationAndSetWarehouse(locationId) { checkLocationAndSetWarehouse(locationId) {
getLocationByLocationId({ getLocationByLocationId({
site: localStorage.getItem('site'),
site: this.editInventoryForm.site,
locationId: locationId locationId: locationId
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -1613,13 +1772,13 @@ export default {
} }
// 关闭弹窗 - rqrq // 关闭弹窗 - rqrq
this.samePartInventoryDialogVisible = false this.samePartInventoryDialogVisible = false
this.$message.success('已将IFS库存记录的批次号、库位、仓库、WDR、版本号、失效日期、AvailabilityControlId覆盖到表单')
this.$message.success('已将IFS库存记录的批次号、库位、仓库、WDR、版本号、失效日期、接收日期、AvailabilityControlId覆盖到表单')
}).catch(() => { }).catch(() => {
// 查询异常,默认赋值TEMP - rqrq // 查询异常,默认赋值TEMP - rqrq
this.editInventoryForm.locationId = locationId this.editInventoryForm.locationId = locationId
this.editInventoryForm.warehouseId = 'TEMP' this.editInventoryForm.warehouseId = 'TEMP'
this.samePartInventoryDialogVisible = false this.samePartInventoryDialogVisible = false
this.$message.success('已将IFS库存记录的批次号、库位、仓库、WDR、版本号、失效日期、AvailabilityControlId覆盖到表单')
this.$message.success('已将IFS库存记录的批次号、库位、仓库、WDR、版本号、失效日期、接收日期、AvailabilityControlId覆盖到表单')
}) })
}, },
@ -1636,7 +1795,7 @@ export default {
// 查询location表 - rqrq // 查询location表 - rqrq
getLocationByLocationId({ getLocationByLocationId({
site: localStorage.getItem('site'),
site: this.editInventoryForm.site,
locationId: locationId.trim() locationId: locationId.trim()
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {

Loading…
Cancel
Save