2/10 去货架优化1.0

20240912_adapter
wangwei 7 months ago
parent 477fd2a179
commit ce6a529a05

@ -62,6 +62,16 @@ export function printAllFreight(query) {
responseType: 'arraybuffer', //一定要设置响应类型否则页面会是空白pdf responseType: 'arraybuffer', //一定要设置响应类型否则页面会是空白pdf
}); });
} }
export function printRegion(query) {
return axios({
url: "/udiwms/WorkplaceFreight/printRegion",
method: "post",
data: query,
headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
responseType: 'arraybuffer', //一定要设置响应类型否则页面会是空白pdf
});
}
// export function printAllFreight(query) { // export function printAllFreight(query) {
// return axios({ // return axios({
// url: "/udiwms/WorkplaceFreight/printAllFreight", // url: "/udiwms/WorkplaceFreight/printAllFreight",

@ -9,3 +9,30 @@ export function getRegions(query) {
params: query params: query
}) })
} }
//新增槽位区域
export function addRegion(query) {
return axios({
url: "/udiwms/sysWorkplaceRegion/addRegion",
method: "post",
data: query
});
}
export function editRegion(query) {
return axios({
url: "/udiwms/sysWorkplaceRegion/editRegion",
method: "post",
data: query
});
}
export function delRegion(query) {
return axios({
url: "/udiwms/sysWorkplaceRegion/delRegion",
method: "post",
data: query
});
}

@ -7,6 +7,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="区域编号:" prop="mac" class="query-form-item"> <el-form-item label="区域编号:" prop="mac" class="query-form-item">
<el-input <el-input
:disabled="type == 2"
v-model="formData.regionCode" style="width: 80%" v-model="formData.regionCode" style="width: 80%"
auto-complete="off" auto-complete="off"
placeholder="请输入区域编号" placeholder="请输入区域编号"
@ -26,7 +27,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer" style="margin-top: 50px">
<el-button @click.native="hideForm">取消</el-button> <el-button @click.native="hideForm">取消</el-button>
<el-button <el-button
type="primary" type="primary"
@ -41,6 +42,8 @@
<script> <script>
import { addRegion, editRegion } from '@/api/basic/workPlace/regionManage'
import { isBlank } from '@/utils/strUtil'
export default { export default {
props: { props: {
@ -48,7 +51,11 @@ export default {
type: Function, type: Function,
required: true required: true
}, },
rowData:{ rowData: {
type: Object,
required: true
},
type: {
type: Object, type: Object,
required: true required: true
} }
@ -56,24 +63,60 @@ export default {
data() { data() {
return { return {
formData: { formData: {
timeout:0, regionCode: null,
}, regionName: ''
}
} }
}, },
methods: { methods: {
formSubmit(){ formSubmit() {
if (isBlank(this.formData.regionCode) || isBlank(this.formData.regionName)) {
return this.$message.error('区域编码或区域名称为空')
}
if (this.type == 2) {
editRegion(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('修改成功')
this.closeDialog()
} else {
this.closeDialog()
return this.$message.error(res.message)
}
})
} else {
addRegion(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('新增成功')
this.closeDialog()
} else {
this.closeDialog()
return this.$message.error(res.message)
}
})
}
}, },
hideForm(){ hideForm() {
this.closeDialog() this.closeDialog()
} }
}, },
created() { created() {
if (this.type == 2) {
this.formData = this.rowData
} else {
this.formData = {
regionCode: null,
regionName: ''
}
}
} }
} }
</script> </script>
<style scoped> <style scoped>
.dialog-footer {
display: flex;
justify-content: center;
}
</style> </style>

@ -57,14 +57,25 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="区域编码:" prop="freightRow" class="query-form-item"> <!--<el-form-item label="区域编码:" prop="freightRow" class="query-form-item">-->
<el-input-number <!-- <el-input-number-->
v-model="formData.freightRow" style="width: 80%" <!-- v-model="formData.freightRow" style="width: 80%"-->
auto-complete="off" <!-- auto-complete="off"-->
:min="1" <!-- :min="1"-->
:max="30" <!-- :max="30"-->
></el-input-number> <!-- ></el-input-number>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="区域编码:" prop="freightRow" class="query-form-item">
<el-select v-model="formData.freightRow" filterable placeholder="请选择" style="width: 80%">
<el-option
v-for="item in regions"
:key="item.regionCode"
:label="item.regionName"
:value="item.regionCode">
</el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12" class="el-col">--> <!-- <el-col :span="12" class="el-col">-->
@ -87,6 +98,19 @@
> >
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="摆货层编号" prop="code"></el-table-column> <el-table-column label="摆货层编号" prop="code"></el-table-column>
<el-table-column label="摆货层名称" prop="layerName">
<template slot-scope="scope">
<div style="display: flex; justify-content: center; align-items: center; width: 100%;">
<el-input
size="small"
v-model="scope.row.layerName"
style="width: 100%"
:disabled="scope.$index !== selectedIndex"
></el-input>
</div>
</template>
</el-table-column>
<!--<el-table-column label="摆货层高度" prop="height">--> <!--<el-table-column label="摆货层高度" prop="height">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <div style="display: flex; justify-content: center; align-items: center; width: 80%;">--> <!-- <div style="display: flex; justify-content: center; align-items: center; width: 80%;">-->
@ -169,6 +193,7 @@ import {
} from '@/api/basic/workPlace/SysWorkplaceFreight' } from '@/api/basic/workPlace/SysWorkplaceFreight'
import { deleteLayer, getLayerCode, getLayerList, saveLayer } from '@/api/basic/workPlace/SysWorkplaceLayer' import { deleteLayer, getLayerCode, getLayerList, saveLayer } from '@/api/basic/workPlace/SysWorkplaceLayer'
import { isBlank } from '@/utils/strUtil' import { isBlank } from '@/utils/strUtil'
import { getRegions } from '@/api/basic/workPlace/regionManage'
export default { export default {
props: { props: {
@ -214,6 +239,12 @@ export default {
saveStatus: false, // saveStatus: false, //
selectedIndex: null,// selectedIndex: null,//
remarkStatus: false, remarkStatus: false,
//
regions:[],
regionQuery:{
page:1,
limit:10
},
// { // {
// code:null, // code:null,
// queueNum:null, // queueNum:null,
@ -298,7 +329,8 @@ export default {
if (res.code == 20000) { if (res.code == 20000) {
this.layerList.push({ this.layerList.push({
code: res.data, code: res.data,
queueNum: null queueNum: null,
layerName:""
}) })
} else { } else {
this.$message.error('系统繁忙') this.$message.error('系统繁忙')
@ -313,7 +345,8 @@ export default {
let code = this.createLayerCode(lastLayer) let code = this.createLayerCode(lastLayer)
this.layerList.push({ this.layerList.push({
code: code, code: code,
queueNum: null queueNum: null,
layerName:""
}) })
} }
@ -392,7 +425,14 @@ export default {
}) })
} },
getRegionList(){
getRegions(this.query).then(res => {
if (res.code == 20000){
this.regions = res.data.list
}
})
},
}, },
created() { created() {
if (this.rowData != null) { if (this.rowData != null) {
@ -407,6 +447,7 @@ export default {
this.getCode() this.getCode()
} }
this.findWorkPlace('') this.findWorkPlace('')
this.getRegionList()
} }
} }

@ -11,6 +11,8 @@
</span> </span>
<span> <span>
<el-button-group style="float: right"> <el-button-group style="float: right">
<el-button style="margin-bottom: -5px " @click="printRegion()" type="primary">打印区域
</el-button>
<el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部 <el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部
</el-button> </el-button>
<el-button style="margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架 <el-button style="margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架
@ -94,17 +96,18 @@
@row-click="handChangeLayer" @row-click="handChangeLayer"
> >
<el-table-column <el-table-column
width="100"
prop="code" prop="code"
label="摆货层编码" label="摆货层编码"
> >
</el-table-column> </el-table-column>
<!--<el-table-column--> <el-table-column
<!-- width="120"--> width="100"
<!-- prop="queueNum"--> prop="name"
<!-- label="出货槽数量"--> label="摆货层名称"
<!--&gt;--> >
<!--</el-table-column>--> </el-table-column>
<el-table-column label="操作" width="90"> <el-table-column label="操作" width="90" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -437,6 +440,10 @@ export default {
window.open(url) window.open(url)
}) })
}, },
printRegion(){
//
},
closeDialog() { closeDialog() {
this.getList() this.getList()
this.getLayers() this.getLayers()

@ -19,15 +19,15 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!--<el-col :span="8">-->
<el-form-item label="所属工位:" class="query-form-item"> <!-- <el-form-item label="所属工位:" class="query-form-item">-->
<el-select v-model="query.workplaceStatus" placeholder="选择所属工位" clearable style="width: 65%"> <!-- <el-select v-model="query.workplaceStatus" placeholder="选择所属工位" clearable style="width: 65%">-->
<el-option label="暂停" :value="0"></el-option> <!-- <el-option label="暂停" :value="0"></el-option>-->
<el-option label="启用" :value="1"></el-option> <!-- <el-option label="启用" :value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> </el-row>
</el-form> </el-form>
@ -53,13 +53,13 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="bingLed(scope.row)" @click.native.stop="editRegion(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="bingLed(scope.row)" @click.native.stop="delRegion(scope.row)"
>删除 >删除
</el-button> </el-button>
<el-button <el-button
@ -89,7 +89,11 @@
append-to-body append-to-body
@close="" @close=""
> >
<addRegionDialog> <addRegionDialog
:closeDialog="closeDialog"
:type="type"
:rowData="rowData"
>
</addRegionDialog> </addRegionDialog>
</el-dialog> </el-dialog>
@ -99,7 +103,7 @@
<script> <script>
import { getRegions } from '@/api/basic/workPlace/regionManage' import { getRegions,delRegion } from '@/api/basic/workPlace/regionManage'
import addRegionDialog from "./addRegionDialog" import addRegionDialog from "./addRegionDialog"
export default { export default {
@ -114,6 +118,8 @@ export default {
loading: false, loading: false,
regionList:[], regionList:[],
addRegionVisible: false, addRegionVisible: false,
type:1,
rowData:null
} }
}, },
methods: { methods: {
@ -142,7 +148,35 @@ export default {
}) })
}, },
addRegion(){ addRegion(){
this.type = 1
this.addRegionVisible = true
},
editRegion(row){
this.type = 2
this.rowData = row
this.addRegionVisible = true this.addRegionVisible = true
},
delRegion(row){
this.$confirm("是否确定移除该槽位区域?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
delRegion(row).then(res => {
if (res.code == 20000){
this.getList()
return this.$message.success("删除成功")
}else {
return this.$message.error("删除失败")
}
})
}).catch(() => {
})
},
closeDialog(){
this.addRegionVisible = false
this.getList()
} }
}, },
mounted() { mounted() {

@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item prop="fromCorp" label="单据编号:"> <el-form-item prop="fromCorp" label="单据编号:">
<el-input v-model="formData.billNo" auto-complete="off" <el-input v-model="formData.billNo" auto-complete="off" ref='inputRef'
@keypress.enter.native="orderEnterKey($event)" @keypress.enter.native="orderEnterKey($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -88,7 +88,7 @@
placeholder="请输入UDI码" placeholder="请输入UDI码"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"
ref='inputRef' ref='inputRef1'
style="ime-mode:disabled" style="ime-mode:disabled"
type="tel" type="tel"
v-model="udiCode" v-model="udiCode"
@ -216,8 +216,8 @@ export default {
} }
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$refs.inputRef.focus(); this.$refs.inputRef1.focus();
this.$refs.inputRef.select(); this.$refs.inputRef1.select();
this.udiCode = response.data.code; this.udiCode = response.data.code;
this.originCode = ''; this.originCode = '';
this.addCode(); this.addCode();
@ -253,8 +253,8 @@ export default {
type: 'warning', type: 'warning',
closeOnClickModal: true, closeOnClickModal: true,
callback: action => { callback: action => {
this.$refs.inputRef.focus(); this.$refs.inputRef1.focus();
this.$refs.inputRef.select(); this.$refs.inputRef1.select();
} }
}); });
} }
@ -264,6 +264,7 @@ export default {
}, },
searchOrder() { searchOrder() {
let query = { let query = {
billNo: this.formData.billNo billNo: this.formData.billNo
}; };
@ -275,7 +276,10 @@ export default {
this.formData = response.data.orderEntity; this.formData = response.data.orderEntity;
this.orderQuery = this.formData; this.orderQuery = this.formData;
this.isEntrust = response.data.entrust; this.isEntrust = response.data.entrust;
this.$refs.inputRef1.focus()
} else { } else {
this.formData.billNo = null
this.$refs.inputRef.focus()
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -323,14 +327,14 @@ export default {
this.$message.success("匹配成功!"); this.$message.success("匹配成功!");
if (event == null) { if (event == null) {
} else event.target.select(); } else event.target.select();
this.$refs.inputRef.select(); this.$refs.inputRef1.select();
} }
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
if (event == null) { if (event == null) {
} else event.target.select(); } else event.target.select();
this.$refs.inputRef.select(); this.$refs.inputRef1.select();
} }
@ -498,6 +502,8 @@ export default {
} }
}; };
inputer.focus(); inputer.focus();
this.$refs.inputRef.focus();
}, },
created() { created() {

Loading…
Cancel
Save