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-17 14:21:11 +08:00
parent f7a79cdc7e
commit 1cbb1a12a8
21 changed files with 348 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/.env.staging
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = "ForTucky WMS system"
BABEL_ENV = production

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

@@ -225,6 +225,7 @@ export default {
englishDesc: '英文描述',
cartonNo: '箱号',
packingMethod: '包装方式',
createTime:"创建时间"
},
// ***************出库单据管理**************
outStockoutManage: {

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

@@ -198,6 +198,7 @@ export default {
englishDesc: '英文描述',
cartonNo: '箱号',
packingMethod: '包装方式',
createTime:"创建时间"
},
// ***************新建出库单据**************
addOutStockout: {

13
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -163,8 +163,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('inJob.taskNo')" align="left" prop="taskNo" /> // 任务号
<el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
<el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门
<!-- <el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商-->
<!-- <el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门-->
<el-table-column :label="$t('inJob.trayCode')" align="left" prop="trayCode" /> // 托盘码
<el-table-column :label="$t('inJob.cargoSpaceName')" align="left" prop="cargoSpaceName" /> // 货位
<el-table-column :label="$t('inJob.priority')" align="left" prop="priority" /> // 优先级
@@ -175,6 +175,11 @@
</el-table-column>
<el-table-column :label="$t('inJob.entrance')" align="left" prop="entranceId" /> // 入口ID
<el-table-column :label="$t('inJob.warehouse')" align="left" prop="warehouseName" /> // 仓库ID
<el-table-column :label="$t('inJob.createTime')" align="left" prop="createTime" width="180"> // 创建时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.startTime')" align="left" prop="startTime" width="180"> // 开始时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -288,7 +293,7 @@ export default {
workshopId: null,
priority: null,
executionPhase: null,
inOrOut: '1',
inOrOut: null,
createTime: null,
startTime: null,
finishTime: null,
@@ -435,11 +440,13 @@ export default {
//手动作废
manualInvalidation(data).then(response => {
this.$modal.msgSuccess("操作成功");
getList();
})
}else if (row.type === 'completed'){
//手动完成
manualCompleted(data).then(response => {
this.$modal.msgSuccess("操作成功");
getList();
})
}
},

12
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -272,14 +272,14 @@
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="left" prop="stockSource"><!--单据来源-->
<!-- <el-table-column :label="$t('inReceiveStockin.stockSource')" align="left" prop="stockSource">&lt;!&ndash;单据来源&ndash;&gt;
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="left" prop="departmentName"/><!--部门-->
</el-table-column>-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="left" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="left" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="left" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="left" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="left" prop="finishDate"/><!--完成日期-->
</el-table>
@@ -535,7 +535,7 @@ export default {
this.getList()
})
}else {
this.$modal.msgError("操作失败")
this.$modal.msgError("单据已执行")
}
},
@@ -556,7 +556,7 @@ export default {
this.getList()
})
}else {
this.$modal.msgError("操作失败")
this.$modal.msgError("单据已执行，请勿重复审核")
}
},
/**确认单据按钮操作 */
@@ -572,7 +572,7 @@ export default {
this.getList()
})
}else {
this.$modal.msgError("操作失败")
this.$modal.msgError("单据未执行完成")
}
},
/** 打印条码按钮操作 */

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

@@ -112,20 +112,20 @@
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.onLineType')" align="left" prop="onLineType"> <!-- 上线类型 -->
<!-- <el-table-column :label="$t('outJobManagement.onLineType')" align="left" prop="onLineType"> &lt;!&ndash; 上线类型 &ndash;&gt;
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column :label="$t('outJobManagement.jobType')" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.taskNo')" align="left" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> <!-- 客户ID -->
<!-- <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" /> <!-- 巷道ID -->
<!-- <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.priority')" align="right" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('outJobManagement.executionPhase')" align="left" prop="executionPhase"> <!-- 执行阶段 -->
@@ -175,7 +175,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
export default {
name: "MydoJob",
dicts: ['execution_phase_type', 'in_job_type', 'on_line_type', 'mydo_job_status'],
dicts: ['execution_phase_type', 'in_job_type', 'on_line_type', 'mydo_job_status','out_job_type'],
data() {
return {
// 遮罩层

10
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -416,6 +416,11 @@ export default {
}
const stockoutIds = this.selectedRows.map(row => row.stockoutId)
console.log("自动分配：", stockoutIds)
let outstock = this.selectedRows[0]
if (outstock.status !== "2") {
this.$modal.msgError("请选择审核状态为审核通过单据")
return
}
let data = {
stockoutId: stockoutIds[0]
}
@@ -435,6 +440,11 @@ export default {
return
}
const stockoutIds = this.selectedRows.map(row => row.stockoutId)
let outstock = this.selectedRows[0]
if (outstock.status !== "1") {
this.$modal.msgError("单据已审核")
return
}
// TODO: 调用手动分配接口
console.log("手动分配：", stockoutIds)
},

6
ruoyi-ui/src/views/system/role/index.vue
View File

@@ -414,6 +414,10 @@ export default {
// 角色顺序不能为空
{ required: true, message: this.$t('systemManagement_RoleManagement.checkRoleSortIsNull'), trigger: "blur" }
]
},
quaryWarehouse:{
pageNum:1,
pageSize:99
}
}
},
@@ -424,7 +428,7 @@ export default {
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
listWarehouse(this.quaryWarehouse).then(response => {
this.warehouseOptions = response.rows;
});
},

2
ruoyi-ui/vue.config.js
View File

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const baseUrl = 'http://localhost:8081' // 后端接口
const baseUrl = 'http://localhost:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口