lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程测试修改

Browse Source
This commit is contained in:
liuhanqing
2025-07-22 16:25:55 +08:00
parent 47f173d79f
commit 9c0e458b85
20 changed files with 218 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/lang/en.js
View File

@@ -113,7 +113,8 @@ export default {
spare7: 'Height (MM)',
spare8: 'Volume (m³)',
netWeight: 'Net Weight (KG)',
grossWeight: 'Gross Weight (KG)'
grossWeight: 'Gross Weight (KG)',
addProductError:'product exist,please update product num'
},
// ***************收货单据管理*************
inReceiveStockin: {
@@ -327,7 +328,7 @@ export default {
selectJobType: 'Please select job type',
onLineType: 'Online Type',
executionPhase: 'Execution Phase',
cargoSpaceName: 'cargoSpaceName',
// Task Information
jobId: 'Task ID',
taskNo: 'Task No.',

5
ruoyi-ui/src/lang/zh.js
View File

@@ -83,7 +83,8 @@ export default {
spare7: '高MM',
spare8: '体积m³',
netWeight: '净重KG',
grossWeight: '毛重KG'
grossWeight: '毛重KG',
addProductError: '以下物料已存在，请修改数量：'
},
// ***************收货单据管理*************
inReceiveStockin: {
@@ -300,7 +301,7 @@ export default {
selectJobType: '请选择作业类型',
onLineType: '上线类型',
executionPhase: '执行阶段',
cargoSpaceName: '货位名称',
// 任务信息
jobId: '任务ID',
taskNo: '任务号',

10
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -331,6 +331,16 @@ export default {
},
/** 确认选择物料 */
confirmSelectProduct() {
// 检查选中的物料是否已存在于表单中
const duplicateProducts = this.selectedProducts.filter(selected =>
this.productList.some(existing => existing.productId === selected.productId)
);
if (duplicateProducts.length > 0) {
this.$modal.msgError('以下物料已存在，请修改数量：\n' + duplicateProducts.map(p => p.productName).join('\n'));
return;
}
const newProducts = this.selectedProducts.map(item => ({
productGuid: item.productGuid,
productId: item.productId,

8
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -126,18 +126,19 @@
<!-- <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;-->
<el-table-column :label="$t('outJobManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘码 -->
<!-- <el-table-column :label="$t('outJobManagement.roadwayId')" align="left" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<el-table-column :label="$t('outJobManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('outJobManagement.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位ID -->
<el-table-column :label="$t('outJobManagement.priority')" align="right" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('outJobManagement.executionPhase')" align="left" prop="executionPhase"> <!-- 执行阶段 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.createTime')" align="left" prop="createTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.createTime')" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
<el-table-column :label="$t('outJobManagement.startTime')" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.finishTime')" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
<el-table-column :label="$t('outJobManagement.exitId')" align="left" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库ID -->
<!-- <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<el-table-column :label="$t('outJobManagement.warehouse')" align="left" prop="warehouseName" /> <!-- 仓库ID -->
</el-table>
<pagination
@@ -152,7 +153,6 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('outJobManagement.subTaskId')" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('outJobManagement.stockId')" align="left" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('outJobManagement.lotNo')" align="left" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
<el-table-column :label="$t('outJobManagement.materialCode')" align="left" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="right" prop="outQuantity" /> <!-- 出库数量 -->

6
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -406,6 +406,10 @@ export default {
spare5: null,
spare6: null
},
queryWarehouse: {
pageNum:1,
pageSize: 99
},
// 表单参数
form: {},
// 表单校验
@@ -423,7 +427,7 @@ export default {
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
listWarehouse(this.queryWarehouse).then(response => {
this.warehouseOptions = response.rows;
});
},