mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

为库位增加“允许产品混放”和“允许批次混放”两个标识；为库区增加批量设置所有库位产品混放和批次混放的功能。

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2025-02-06 11:44:43 +08:00
parent 600f118b64
commit 6f5925bfb9
3 changed files with 153 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/api/mes/wm/location.js
View File

@ -43,6 +43,30 @@ export function delLocation(locationId) {
})
}
// 设置库区下所有库位是否允许产品混放
export function setProductMixing(locationId, flag){
return request({
url: '/mes/wm/location/setProductMixing',
method: 'post',
params: {
'locationId': locationId,
'flag': flag
}
})
}
// 设置库区下所有库位是否允许批次混放
export function setBatchMixing(locationId, flag){
return request({
url: '/mes/wm/location/setBatchMixing',
method: 'post',
params: {
'locationId': locationId,
'flag': flag
}
})
}
//更改库区的冻结状态
export function changeFrozenState(locationId, status) {
const data = {

39
src/views/mes/wm/area/index.vue
View File

@ -122,6 +122,16 @@
<el-table-column label="库位位置X" align="center" prop="positionX" />
<el-table-column label="库位位置y" align="center" prop="positionY" />
<el-table-column label="库位位置z" align="center" prop="positionZ" />
<el-table-column label="允许产品混放" align="center" prop="productMixing" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.productMixing"/>
</template>
</el-table-column>
<el-table-column label="允许批次混放" align="center" prop="batchMixing" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.batchMixing"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
@ -227,6 +237,35 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否冻结" prop="frozenFlag">
<el-switch v-model="form.frozenFlag" active-color="#13ce66" active-text="是" inactive-text="否" active-value="Y" inactive-value="N"></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="允许产品混放" prop="productMixing">
<el-radio-group v-model="form.productMixing">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="允许批次混放" prop="batchMixing">
<el-radio-group v-model="form.batchMixing">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="10">

91
src/views/mes/wm/location/index.vue
View File

@ -152,11 +152,73 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="产品混放" >
<el-tooltip effect="dark" placement="top">
<div slot="content">
点击按钮设置此库区下所有库位允许产品混放。
</div>
<el-button
type="primary"
plain
size="mini"
@click="setProductMixing(true)"
v-hasPermi="['mes:wm:location:edit']"
>允许</el-button>
</el-tooltip>
<el-tooltip effect="dark" placement="right">
<div slot="content">
点击按钮设置此库区下所有库位不允许产品混放。
</div>
<el-button
type="danger"
plain
size="mini"
@click="setProductMixing(false)"
v-hasPermi="['mes:wm:location:edit']"
>不允许</el-button>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="批次混放">
<el-tooltip effect="dark" placement="top">
<div slot="content">
点击按钮设置此库区下所有库位允许批次混放。
</div>
<el-button
type="primary"
plain
size="mini"
@click="setBatchMixing(true)"
v-hasPermi="['mes:wm:location:edit']"
>允许</el-button>
</el-tooltip>
<el-tooltip effect="dark" placement="right">
<div slot="content">
点击按钮设置此库区下所有库位不允许批次混放。
</div>
<el-button
type="danger"
plain
size="mini"
@click="setBatchMixing(false)"
v-hasPermi="['mes:wm:location:edit']"
>不允许</el-button>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="10">
<BarcodeImg :bussinessId="form.locationId" :bussinessCode="form.locationCode" barcodeType="LOCATION"></BarcodeImg>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -175,7 +237,7 @@
</template>
<script>
import { listLocation, getLocation, delLocation, addLocation, updateLocation, changeFrozenState} from "@/api/mes/wm/location";
import { listLocation, getLocation, delLocation, addLocation, updateLocation, changeFrozenState, setProductMixing, setBatchMixing } from "@/api/mes/wm/location";
import {genCode} from "@/api/system/autocode/rule"
import BarcodeImg from "@/components/barcodeImg/index.vue"
export default {
@ -376,6 +438,33 @@ export default {
});
},
//设置产品混放规则
setProductMixing(flag){
let locationIds = this.form.locationId;
let that = this;
this.$modal.confirm('确认要重置库区下所有库位的产品混放规则吗？').then(function() {
return setProductMixing(locationIds,flag);
}).then(() => {
that.$modal.msgSuccess("设置成功");
}).catch(function() {
that.$modal.msgError("设置失败");
});
},
//设置批次混放规则
setBatchMixing(flag){
let locationIds = this.form.locationId;
let that = this;
this.$modal.confirm('确认要重置库区下所有库位的批次混放规则吗？').then(function() {
return setBatchMixing(locationIds,flag);
}).then(()=>{
that.$modal.msgSuccess("设置成功");
}).catch(function() {
that.$modal.msgError("设置失败");
});
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){