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

解决发现的问题

Browse Source
This commit is contained in:
猫猫guowen
2025-08-14 16:54:51 +08:00
parent 337cbbe43e
commit 6f336c5ec5
11 changed files with 157 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-admin/src/main/java/com/ruoyi/bas/port/controller/BasProductPortController.java
View File

@@ -77,6 +77,13 @@ public class BasProductPortController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BasProductPort basProductPort) public AjaxResult add(@RequestBody BasProductPort basProductPort)
{ {
// 检查点位名称是否重复
BasProductPort checkPort = new BasProductPort();
checkPort.setPortName(basProductPort.getPortName());
List<BasProductPort> existingPorts = basProductPortService.selectBasProductPortList(checkPort);
if (!existingPorts.isEmpty()) {
return error("点位名称已存在，请使用其他名称");
}
return toAjax(basProductPortService.insertBasProductPort(basProductPort)); return toAjax(basProductPortService.insertBasProductPort(basProductPort));
} }
@@ -88,6 +95,15 @@ public class BasProductPortController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BasProductPort basProductPort) public AjaxResult edit(@RequestBody BasProductPort basProductPort)
{ {
// 检查点位名称是否重复（排除当前记录）
BasProductPort checkPort = new BasProductPort();
checkPort.setPortName(basProductPort.getPortName());
List<BasProductPort> existingPorts = basProductPortService.selectBasProductPortList(checkPort);
for (BasProductPort existingPort : existingPorts) {
if (!existingPort.getId().equals(basProductPort.getId())) {
return error("点位名称已存在，请使用其他名称");
}
}
return toAjax(basProductPortService.updateBasProductPort(basProductPort)); return toAjax(basProductPortService.updateBasProductPort(basProductPort));
} }

5
ruoyi-ui/src/views/bas/basSupplier/index.vue
View File

@@ -498,4 +498,9 @@ export default {
width: auto; width: auto;
min-width: fit-content; min-width: fit-content;
} }
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
</style> </style>

2
ruoyi-ui/src/views/bas/cargoSpace/index.vue
View File

@@ -199,7 +199,7 @@
<!-- 添加或修改库存信息对话框 --> <!-- 添加或修改库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" :label-width="labelWidthForFunction"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- 货位ID --> <!-- 货位ID -->
<el-form-item :label="$t('cargoSpace.cargoSpaceId')" prop="warehouseId"> <el-form-item :label="$t('cargoSpace.cargoSpaceId')" prop="warehouseId">
<el-input v-model="form.warehouseId" :placeholder="$t('cargoSpace.placeholderCargoSpaceId')" /> <el-input v-model="form.warehouseId" :placeholder="$t('cargoSpace.placeholderCargoSpaceId')" />

7
ruoyi-ui/src/views/bas/port/index.vue
View File

@@ -486,3 +486,10 @@ export default {
} }
} }
</script> </script>
<style scoped>
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
</style>

13
ruoyi-ui/src/views/bas/warehouse/index.vue
View File

@@ -398,14 +398,14 @@ export default {
if (valid) { if (valid) {
if (this.title === this.$t('warehouse.editWarehouseItem')) { if (this.title === this.$t('warehouse.editWarehouseItem')) {
updateWarehouse(this.form).then(response => { updateWarehouse(this.form).then(response => {
this.$modal.msgSuccess(this.$t('warehouse.editsuccessInfo')) this.$modal.msgSuccess(this.$t('warehouse.editSuccessInfo'))
this.open = false this.open = false
this.getList() this.getList()
}) })
} }
if (this.title === this.$t('warehouse.addWarehouseItem')) { if (this.title === this.$t('warehouse.addWarehouseItem')) {
addWarehouse(this.form).then(response => { addWarehouse(this.form).then(response => {
this.$modal.msgSuccess(this.$t('warehouse.addsuccessInfo')) this.$modal.msgSuccess(this.$t('warehouse.addSuccessInfo'))
this.open = false this.open = false
this.getList() this.getList()
}) })
@@ -420,7 +420,7 @@ export default {
return delWarehouse(warehouseIds) return delWarehouse(warehouseIds)
}).then(() => { }).then(() => {
this.getList() this.getList()
this.$modal.msgSuccess(this.$t('warehouse.deletesuccessInfo')) this.$modal.msgSuccess(this.$t('warehouse.deleteSuccessInfo'))
}).catch(() => {}) }).catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
@@ -449,3 +449,10 @@ export default {
} }
} }
</script> </script>
<style scoped>
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
</style>

2
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -206,7 +206,7 @@
warehouseId: [ warehouseId: [
{ required: true, message: this.$t('checkCreate.warehouseRequired'), trigger: "change" } { required: true, message: this.$t('checkCreate.warehouseRequired'), trigger: "change" }
], ],
billType: [ checkType: [
{ required: true, message: this.$t('checkCreate.documentTypeRequired'), trigger: "change" } { required: true, message: this.$t('checkCreate.documentTypeRequired'), trigger: "change" }
] ]
}, },

11
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -198,9 +198,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('stockManagement.englishDesc')" prop="englishDesc"> &lt;!&ndash; 物料名称 &ndash;&gt;-->
<!-- <el-input v-model="addForm.extraField.englishDesc" :placeholder="$t('stockManagement.inputEnglishDesc')" />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 --> <el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="addForm.quantity" :placeholder="$t('stockManagement.inputQuantity')" /> <el-input v-model="addForm.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item> </el-form-item>
@@ -527,3 +524,11 @@ export default {
} }
} }
</script> </script>
<style scoped>
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
</style>

8
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -129,13 +129,13 @@ export default {
// 表单验证规则 // 表单验证规则
rules: { rules: {
warehouseId: [ warehouseId: [
{ required: true, message: "请选择仓库", trigger: "change" } { required: true, message: this.$t('addOutStockout.selectWarehouse'), trigger: "change" }
], ],
customerNo: [ customerNo: [
{ required: true, message: "请输入客户编号", trigger: "blur" } { required: true, message: this.$t('addOutStockout.inputCustomerNo'), trigger: "blur" }
], ],
billType: [ outType: [
{ required: true, message: "请选择单据类型", trigger: "change" } { required: true, message: this.$t('addOutStockout.selectDocumentType'), trigger: "change" }
] ]
}, },
// 主表数据 // 主表数据

138
ruoyi-ui/src/views/requestInterface/log/index.vue
View File

@@ -20,7 +20,7 @@
<el-form-item label="是否成功" prop="isSuccessful"> <el-form-item label="是否成功" prop="isSuccessful">
<el-select v-model="queryParams.isSuccessful" placeholder="请选择是否成功" clearable> <el-select v-model="queryParams.isSuccessful" placeholder="请选择是否成功" clearable>
<el-option <el-option
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.is_available"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@@ -34,48 +34,48 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['requestInterface:log:add']" <!-- v-hasPermi="['requestInterface:log:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['requestInterface:log:edit']" <!-- v-hasPermi="['requestInterface:log:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['requestInterface:log:remove']" <!-- v-hasPermi="['requestInterface:log:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['requestInterface:log:export']" <!-- v-hasPermi="['requestInterface:log:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@@ -86,40 +86,40 @@
<el-table-column label="来源系统" align="center" prop="sourceSystem" /> <el-table-column label="来源系统" align="center" prop="sourceSystem" />
<el-table-column label="目标系统" align="center" prop="targetSystem" /> <el-table-column label="目标系统" align="center" prop="targetSystem" />
<el-table-column label="接口名称" align="center" prop="endpoint" /> <el-table-column label="接口名称" align="center" prop="endpoint" />
<el-table-column label="请求URL" align="center" prop="requestUrl" /> <el-table-column label="请求URL" width="300" align="left" prop="requestUrl" />
<el-table-column label="请求方式" align="center" prop="requestMethod" /> <el-table-column label="请求方式" align="center" prop="requestMethod" />
<el-table-column label="请求头信息" align="center" prop="requestHeaders" /> <el-table-column label="请求头信息" align="center" prop="requestHeaders" />
<el-table-column label="请求参数" align="center" prop="requestBody" /> <el-table-column label="请求参数" width="300" align="left" prop="requestBody" />
<el-table-column label="响应时间" align="center" prop="responseTime" /> <el-table-column label="响应时间" width="180" align="left" prop="responseTime" />
<el-table-column label="响应主体" align="center" prop="responseBody" /> <el-table-column label="响应主体" align="center" prop="responseBody" />
<el-table-column label="响应状态" align="center" prop="responseStatus" /> <el-table-column label="响应状态" align="center" prop="responseStatus" />
<el-table-column label="错误信息" align="center" prop="errorDetails" /> <el-table-column label="错误信息" align="center" prop="errorDetails" />
<el-table-column label="耗时" align="center" prop="duration" /> <el-table-column label="耗时" align="center" prop="duration" />
<el-table-column label="是否成功" align="center" prop="isSuccessful"> <el-table-column label="是否成功" align="center" prop="isSuccessful">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSuccessful"/> <dict-tag :options="dict.type.is_available" :value="scope.row.isSuccessful"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['requestInterface:log:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['requestInterface:log:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['requestInterface:log:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['requestInterface:log:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@@ -164,7 +164,7 @@
<el-form-item label="是否成功" prop="isSuccessful"> <el-form-item label="是否成功" prop="isSuccessful">
<el-select v-model="form.isSuccessful" placeholder="请选择是否成功"> <el-select v-model="form.isSuccessful" placeholder="请选择是否成功">
<el-option <el-option
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.is_available"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@@ -185,7 +185,7 @@ import { listLog, getLog, delLog, addLog, updateLog } from "@/api/requestInterfa
export default { export default {
name: "Log", name: "Log",
dicts: ['sys_yes_no'], dicts: ['is_available'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

36
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -74,24 +74,24 @@
<el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> <!-- 操作 --> <el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> <!-- 操作 -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 --> <el-table-column :label="$t('stockFreeze.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="left" prop="createTime" /> <!-- 创建时间 --> <el-table-column :label="$t('stockFreeze.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 --> <!-- <el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['stock:freeze:edit']" <!-- v-hasPermi="['stock:freeze:edit']"-->
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 --> <!-- >{{$t('stockFreeze.edit')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['stock:freeze:remove']" <!-- v-hasPermi="['stock:freeze:remove']"-->
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 --> <!-- >{{$t('stockFreeze.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination

36
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -99,24 +99,24 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('stockRecord.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 --> <el-table-column :label="$t('stockRecord.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.createTime')" align="left" prop="createTime" /> <!-- 创建时间 --> <el-table-column :label="$t('stockRecord.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['stock:record:edit']" <!-- v-hasPermi="['stock:record:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['stock:record:remove']" <!-- v-hasPermi="['stock:record:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination