35 changed files with 1393 additions and 109 deletions
@ -0,0 +1,84 @@ |
|||
import request from '@/utils/request' |
|||
// 仓库区域 接口
|
|||
export default { |
|||
|
|||
// 查询分页列表
|
|||
listPage: function(params) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/listPage', |
|||
method: 'post', |
|||
data: params, |
|||
headers: { |
|||
'Content-Type': 'application/json' |
|||
} |
|||
}) |
|||
}, |
|||
|
|||
// 区域查询
|
|||
getAllWarehousezone: function(params) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/listAll', |
|||
method: 'post', |
|||
data: params, |
|||
headers: { |
|||
'Content-Type': 'application/json' |
|||
} |
|||
}) |
|||
}, |
|||
|
|||
|
|||
// 根据仓库sid查询区域
|
|||
getAllWarehousezoneBysid: function(params) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/selectAll', |
|||
method: 'get', |
|||
params: params, |
|||
headers: { |
|||
'Content-Type': 'application/json' |
|||
} |
|||
}) |
|||
}, |
|||
|
|||
|
|||
// 修改是否可用状态
|
|||
updateIsEnable: function(sid, isEnable) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/updateIsEnable/' + sid + "/" + isEnable |
|||
}); |
|||
}, |
|||
|
|||
|
|||
// 新增、保存
|
|||
saveWarehousezone: function(data) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/saveOrUpdate', |
|||
method: 'post', |
|||
data: data, |
|||
headers: { |
|||
'Content-Type': 'application/json' |
|||
} |
|||
}); |
|||
}, |
|||
|
|||
// 初始化
|
|||
initWarehousezone: function(data) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/initialization/' + data, |
|||
method: 'get' |
|||
}); |
|||
}, |
|||
|
|||
|
|||
// 区域-- 删除
|
|||
deleteBySids: function(data) { |
|||
return request({ |
|||
url: '/wms/apiadmin/base/wmswarehousezone/delBySids', |
|||
method: 'DELETE', |
|||
data: data, |
|||
headers: { |
|||
'Content-Type': 'application/json' |
|||
} |
|||
}) |
|||
}, |
|||
|
|||
} |
|||
@ -0,0 +1,337 @@ |
|||
<template> |
|||
<div class="app-container"> |
|||
<div v-show="viewState == 1"> |
|||
<button-bar ref="btnbar" view-title="仓库区域管理" :btndisabled="btndisabled" @btnhandle="btnHandle" /> |
|||
<div class="main-content"> |
|||
<div class="searchcon"> |
|||
<el-button size="small" class="searchbtn" @click="clicksearchShow"> |
|||
{{ searchxianshitit }} |
|||
</el-button> |
|||
<div v-show="isSearchShow" class="search"> |
|||
<el-form :inline="true" class="tab-header"> |
|||
<el-form-item label="区域名称"> |
|||
<el-input v-model="queryParams.params.name" placeholder="" clearable /> |
|||
</el-form-item> |
|||
<el-form-item label="区域编码"> |
|||
<el-input v-model="queryParams.params.code" placeholder="" clearable /> |
|||
</el-form-item> |
|||
<el-form-item label="所属仓库"> |
|||
<el-select v-model="queryParams.params.warehouseSid" placeholder="所属仓库"> |
|||
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" |
|||
:value="item.sid" /> |
|||
</el-select> |
|||
</el-form-item> |
|||
|
|||
|
|||
</el-form> |
|||
<div class="btn" style="text-align: center;"> |
|||
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> |
|||
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<!-- Start 项目列表头部 --> |
|||
<div class="listtop"> |
|||
<div class="tit">仓库区域列表</div> |
|||
</div> |
|||
<!-- End 项目列表头部 --> |
|||
<!-- Start 项目列表 --> |
|||
<div class=""> |
|||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" |
|||
@selection-change="selectionLineChangeHandle"> |
|||
<el-table-column fixed width="50" type="selection" align="center" /> |
|||
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> |
|||
<!-- <el-table-column label="操作" align="center" width="100"> |
|||
<template slot-scope="scope"> |
|||
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button> |
|||
</template> |
|||
</el-table-column> --> |
|||
<el-table-column label="是否可用" align="center" width="140"> |
|||
<template slot-scope="scope"> |
|||
<el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1" |
|||
inactive-value="0" @change="enableChange(scope.row.sid,scope.row.isEnable)" /> |
|||
</template> |
|||
</el-table-column> |
|||
<el-table-column prop="zoneName" label="区域名称" align="center" /> |
|||
<el-table-column prop="zoneCode" label="区域编码" align="center" /> |
|||
<el-table-column prop="volume" label="区域面积" align="center" /> |
|||
<el-table-column prop="unit" label="计量单位" align="center" /> |
|||
<el-table-column prop="remarks" label="备注" align="center" /> |
|||
<el-table-column prop="warehouseName" label="所属仓库" align="center" /> |
|||
</el-table> |
|||
</div> |
|||
<!-- End 项目列表 --> |
|||
<div class="pages"> |
|||
<div class="tit" /> |
|||
<!-- 翻页 --> |
|||
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" |
|||
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<!-- End 查询和其列表部分 --> |
|||
<!-- 新增修改部分组件 --> |
|||
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> |
|||
<!-- <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" /> --> |
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import req from '@/api/warehouse/warehouseZone.js' |
|||
import req2 from '@/api/warehouse/warehouse.js' |
|||
import ButtonBar from '@/components/ButtonBar' |
|||
import Pagination from '@/components/pagination' |
|||
import pageye from '@/components/pagination/pageye' |
|||
import divAdd from './warehouseZoneAdd.vue' |
|||
// import divInfo from './warehouseInfo.vue' |
|||
export default { |
|||
components: { |
|||
ButtonBar, |
|||
Pagination, |
|||
pageye, |
|||
divAdd, |
|||
// divInfo |
|||
}, |
|||
data() { |
|||
return { |
|||
btndisabled: false, |
|||
viewState: 1, // 1、列表 2、添加 3、修改 4、查看 |
|||
isSearchShow: false, |
|||
searchxianshitit: '显示查询条件', |
|||
tableLoading: false, |
|||
dataList: [], |
|||
btnList: [{ |
|||
type: 'primary', |
|||
size: 'small', |
|||
icon: 'plus', |
|||
btnKey: 'toAdd', |
|||
btnLabel: '新增' |
|||
}, |
|||
{ |
|||
type: 'primary', |
|||
size: 'small', |
|||
icon: 'plus', |
|||
btnKey: 'toEdit', |
|||
btnLabel: '编辑' |
|||
}, |
|||
{ |
|||
type: 'danger', |
|||
size: 'small', |
|||
icon: 'plus', |
|||
btnKey: 'doDel', |
|||
btnLabel: '删除' |
|||
}, |
|||
{ |
|||
type: 'info', |
|||
size: 'small', |
|||
icon: 'cross', |
|||
btnKey: 'doClose', |
|||
btnLabel: '关闭' |
|||
} |
|||
], |
|||
queryParams: { |
|||
current: 1, |
|||
size: 10, |
|||
total: 0, |
|||
params: { |
|||
name: '', |
|||
code: "", |
|||
address: "" |
|||
} |
|||
}, |
|||
sids: [], |
|||
selectionList: [], |
|||
warehouseList: [], |
|||
} |
|||
}, |
|||
mounted() { |
|||
this.$refs['btnbar'].setButtonList(this.btnList) |
|||
}, |
|||
created() { |
|||
this.loadList() |
|||
this.getwarehouse() |
|||
}, |
|||
methods: { |
|||
selectionLineChangeHandle(val) { |
|||
console.log("val", val); |
|||
|
|||
this.selectionList = val |
|||
|
|||
const aa = [] |
|||
val.forEach(element => { |
|||
aa.push(element.sid) |
|||
}) |
|||
this.sids = aa |
|||
|
|||
|
|||
}, |
|||
getwarehouse() { |
|||
var parpams = { |
|||
orgPath: window.sessionStorage.getItem('defaultOrgPath'), |
|||
} |
|||
req2.getAllWarehouse(parpams).then(resp => { |
|||
console.log('>>>>>>>>>getAllWarehouse', resp) |
|||
this.warehouseList = resp.data |
|||
}).catch(() => {}) |
|||
}, |
|||
// 搜索条件效果 |
|||
clicksearchShow() { |
|||
this.isSearchShow = !this.isSearchShow |
|||
if (this.isSearchShow) { |
|||
this.searchxianshitit = '隐藏查询条件' |
|||
} else { |
|||
this.searchxianshitit = '显示查询条件' |
|||
} |
|||
}, |
|||
btnHandle(btnKey) { |
|||
switch (btnKey) { |
|||
case 'toAdd': |
|||
this.toAdd() |
|||
break |
|||
case 'toEdit': |
|||
this.toEdit() |
|||
break |
|||
case 'doDel': |
|||
this.doDel() |
|||
break |
|||
case 'doClose': |
|||
this.doClose() |
|||
break |
|||
default: |
|||
break |
|||
} |
|||
}, |
|||
loadList() { |
|||
this.tableLoading = true |
|||
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') |
|||
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') |
|||
this.queryParams.params.menuUrl = this.$route.path |
|||
req.listPage(this.queryParams).then((resp) => { |
|||
this.tableLoading = false |
|||
if (resp.success) { |
|||
const data = resp.data |
|||
this.queryParams.total = data.total |
|||
this.dataList = data.records |
|||
} else { |
|||
// 根据resp.code进行异常情况处理 |
|||
this.dataList = [] |
|||
this.queryParams.total = 0 |
|||
} |
|||
}).catch(() => { |
|||
this.tableLoading = false |
|||
}) |
|||
}, |
|||
|
|||
// 序号 |
|||
indexMethod(index) { |
|||
var pagestart = (this.queryParams.current - 1) * this.queryParams.size |
|||
var pageindex = index + 1 + pagestart |
|||
return pageindex |
|||
}, |
|||
dosearch() { |
|||
this.queryParams.current = 1 |
|||
this.loadList() |
|||
}, |
|||
resetQuery() { |
|||
this.queryParams = { |
|||
current: 1, |
|||
size: 10, |
|||
total: 0, |
|||
params: { |
|||
name: '', |
|||
code: "", |
|||
address: "" |
|||
} |
|||
} |
|||
this.loadList() |
|||
}, |
|||
toAdd() { |
|||
this.viewState = 2 |
|||
this.$refs['divadd'].showAdd() |
|||
}, |
|||
|
|||
toEdit() { |
|||
if (this.selectionList.length != 1) { |
|||
this.$message({ |
|||
type: 'warning', |
|||
message: "请选择一条数据。", |
|||
showClose: true |
|||
}) |
|||
return |
|||
} |
|||
|
|||
this.viewState = 3 |
|||
this.$refs['divadd'].showEdit(this.selectionList[0]) |
|||
}, |
|||
doClose() { |
|||
this.$store.dispatch('tagsView/delView', this.$route) |
|||
this.$router.go(-1) |
|||
}, |
|||
toRelevancy(row) { |
|||
this.viewState = 4 |
|||
this.$refs['divinfo'].showEdit(row) |
|||
}, |
|||
|
|||
doDel() { |
|||
|
|||
if (this.sids.length > 0) { |
|||
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' |
|||
this.$confirm(tip, '提示', { |
|||
confirmButtonText: '确定', |
|||
cancelButtonText: '取消', |
|||
type: 'warning' |
|||
}).then(() => { |
|||
const loading = this.$loading({ |
|||
lock: true, |
|||
text: 'Loading', |
|||
spinner: 'el-icon-loading', |
|||
background: 'rgba(0, 0, 0, 0.7)' |
|||
}) |
|||
req.deleteBySids(this.sids).then((resp) => { |
|||
loading.close() |
|||
if (resp.success) { |
|||
this.$message({ |
|||
type: 'success', |
|||
message: resp.msg, |
|||
showClose: true |
|||
}) |
|||
this.loadList() |
|||
} else { |
|||
// 根据resp.code进行异常情况处理 |
|||
} |
|||
}).catch(e => { |
|||
loading.close() |
|||
}) |
|||
}).catch(() => {}) |
|||
} else { |
|||
this.$message({ |
|||
showClose: true, |
|||
message: '请至少选择一条记录进行删除操作' |
|||
}) |
|||
} |
|||
}, |
|||
|
|||
resetState() { |
|||
this.viewState = 1 |
|||
}, |
|||
enableChange(sid, state) { |
|||
console.log('sid', sid) |
|||
console.log('state', state) |
|||
req.updateIsEnable(sid, state).then((resp) => { |
|||
if (resp.success) { |
|||
this.$message({ |
|||
type: 'success', |
|||
message: '状态已更新', |
|||
showClose: true |
|||
}) |
|||
} else { // 根据resp.code进行异常情况处理 |
|||
} |
|||
}).catch(e => { |
|||
console.log(e) |
|||
}) |
|||
}, |
|||
} |
|||
} |
|||
</script> |
|||
<style scoped> |
|||
</style> |
|||
@ -0,0 +1,246 @@ |
|||
<template> |
|||
<div> |
|||
|
|||
<div class="tab-header webtop"> |
|||
<!-- 标题 --> |
|||
<div>{{title}}仓库区域</div> |
|||
<!-- start 添加修改按钮 --> |
|||
<div> |
|||
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> |
|||
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> |
|||
</div> |
|||
<!-- end 添加修改按钮 --> |
|||
<!-- end 详情按钮 --> |
|||
</div> |
|||
|
|||
<div class="listconadd"> |
|||
|
|||
|
|||
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> |
|||
|
|||
<el-row class="first_row"> |
|||
<el-col :span="8"> |
|||
|
|||
<div class="span-sty"><span class="must">*</span> 选择所属仓库</div> |
|||
<el-form-item prop="warehouseName"> |
|||
<el-select v-model="formobj.warehouseName" placeholder="请选择所属仓库" class="addinputw addinputInfo" |
|||
@change="selectWarehouseChange"> |
|||
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" |
|||
:value="item.sid" /> |
|||
</el-select> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
<el-col :span="8"> |
|||
<div class="span-sty"><span class="must">*</span> 区域名称</div> |
|||
<el-form-item prop="zoneName"> |
|||
<el-input v-model="formobj.zoneName" placeholder="区域名称" class="addinputw addinputInfo" clearable /> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
<el-col :span="8"> |
|||
<div class="span-sty">区域编码</div> |
|||
<el-form-item prop="zoneCode"> |
|||
<span class="addinputw addinputInfo">{{formobj.zoneCode}}</span> |
|||
<!-- <el-input v-model="formobj.areaCode" placeholder="由系统自动生成" :readonly="true" class="addinputw addinputInfo" |
|||
clearable oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> --> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
</el-row> |
|||
|
|||
<el-row> |
|||
<el-col :span="8"> |
|||
|
|||
<div class="span-sty">区域面积</div> |
|||
<el-form-item> |
|||
<el-input v-model="formobj.volume" placeholder="区域面积" class="addinputw addinputInfo" clearable |
|||
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
<el-col :span="8"> |
|||
<div class="span-sty">计量单位</div> |
|||
<el-form-item> |
|||
<el-input v-model="formobj.unit" placeholder="计量单位" class="addinputw addinputInfo" clearable /> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
<el-col :span="8"> |
|||
<div class="span-sty">备注</div> |
|||
<el-form-item> |
|||
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable /> |
|||
</el-form-item> |
|||
</el-col> |
|||
|
|||
</el-row> |
|||
</el-form> |
|||
</div> |
|||
|
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import req from '@/api/warehouse/warehouseZone.js' |
|||
import req2 from '@/api/warehouse/warehouse.js' |
|||
export default { |
|||
components: {}, |
|||
data() { |
|||
return { |
|||
title: "【新增】", |
|||
submitdisabled: false, |
|||
formobj: { |
|||
sid: '', |
|||
zoneName: '', |
|||
zoneCode: '由系统自动生成', |
|||
volume: '', |
|||
unit: '', |
|||
remarks: '', |
|||
warehouseName: '', |
|||
warehouseSid: '', |
|||
useOrgSid: window.sessionStorage.getItem('departmentSid'), |
|||
orgPath: window.sessionStorage.getItem('defaultOrgPath'), |
|||
createOrgSid: window.sessionStorage.getItem('orgSid'), |
|||
userSid: window.sessionStorage.getItem('userSid'), |
|||
|
|||
}, |
|||
warehouseList: [], |
|||
rules: { |
|||
warehouseName: [{ |
|||
required: true, |
|||
message: '请选择所属仓库', |
|||
trigger: 'change' |
|||
}], |
|||
|
|||
zoneName: [{ |
|||
required: true, |
|||
message: '区域名称不能为空', |
|||
trigger: 'blur' |
|||
}], |
|||
} |
|||
} |
|||
}, |
|||
created() { |
|||
this.initData() |
|||
}, |
|||
methods: { |
|||
initData() { |
|||
var parpams = { |
|||
orgPath: window.sessionStorage.getItem('defaultOrgPath'), |
|||
} |
|||
req2.getAllWarehouse(parpams).then(resp => { |
|||
this.warehouseList = resp.data |
|||
}) |
|||
|
|||
}, |
|||
|
|||
saveOrUpdate() { |
|||
console.log('>>>>>>>>>saveOrUpdate', this.formobj) |
|||
|
|||
this.$refs['form_obj'].validate((valid) => { |
|||
if (valid) { |
|||
|
|||
req.saveWarehousezone(this.formobj) |
|||
.then(resp => { |
|||
if (resp.success) { |
|||
this.$message({ |
|||
showClose: true, |
|||
type: 'success', |
|||
message: resp.msg |
|||
}) |
|||
this.handleReturn('true') |
|||
} else { |
|||
// 根据resp.code进行异常情况处理 |
|||
} |
|||
}) |
|||
.catch(() => {}) |
|||
} |
|||
}) |
|||
|
|||
}, |
|||
handleReturn(isreload) { |
|||
if (isreload === 'true') this.$emit('reloadlist') |
|||
this.formobj = { |
|||
sid: '', |
|||
zoneName: '', |
|||
zoneCode: '由系统自动生成', |
|||
volume: '', |
|||
unit: '', |
|||
remarks: '', |
|||
warehouseName: '', |
|||
warehouseSid: '', |
|||
useOrgSid: window.sessionStorage.getItem('departmentSid'), |
|||
orgPath: window.sessionStorage.getItem('defaultOrgPath'), |
|||
createOrgSid: window.sessionStorage.getItem('orgSid'), |
|||
userSid: window.sessionStorage.getItem('userSid'), |
|||
|
|||
} |
|||
this.$emit('doback') |
|||
}, |
|||
showAdd() { |
|||
this.title = "【新增】" |
|||
this.$nextTick(() => { |
|||
this.$refs['form_obj'].clearValidate() |
|||
}) |
|||
|
|||
}, |
|||
showEdit(row) { |
|||
this.title = "【编辑】", |
|||
this.$nextTick(() => { |
|||
this.$refs['form_obj'].clearValidate() |
|||
}) |
|||
|
|||
req.initWarehousezone(row.sid) |
|||
.then(resp => { |
|||
if (resp.success) { |
|||
this.formobj = resp.data |
|||
} |
|||
}) |
|||
.catch(e => { |
|||
this.formobj = row |
|||
}) |
|||
}, |
|||
selectWarehouseChange(val) { |
|||
const choose = this.warehouseList.filter((item) => item.sid == val) |
|||
console.log('>>>>>>>>>selectWarehouseChange', choose) |
|||
this.formobj.warehouseSid = choose[0].sid |
|||
this.formobj.warehouseName = choose[0].warehouseName |
|||
}, |
|||
} |
|||
} |
|||
</script> |
|||
<style scoped> |
|||
/deep/ .el-form-item__error { |
|||
margin-left: 120px !important; |
|||
} |
|||
|
|||
.must { |
|||
color: #f00; |
|||
} |
|||
|
|||
.span-sty { |
|||
width: 130px !important; |
|||
align-items: center; |
|||
} |
|||
|
|||
.addinputInfo { |
|||
margin-left: 120px !important; |
|||
} |
|||
|
|||
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { |
|||
margin-left: 120px !important; |
|||
width: calc(100% - 115px); |
|||
} |
|||
|
|||
.first_row { |
|||
border-top: 1px solid #E0E3EB; |
|||
} |
|||
|
|||
.titleOne { |
|||
padding: 7px; |
|||
display: flex; |
|||
flex-direction: row; |
|||
justify-content: space-between; |
|||
align-items: center; |
|||
} |
|||
</style> |
|||
@ -0,0 +1,78 @@ |
|||
package com.yxt.wms.apiadmin.base; |
|||
|
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import com.yxt.wms.biz.base.wmswarehousearea.*; |
|||
import com.yxt.wms.biz.base.wmswarehousezone.*; |
|||
import com.yxt.wms.utils.OrgPathQuery; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/28 8:53 |
|||
*/ |
|||
@Api(tags = "区域信息") |
|||
@RestController |
|||
@RequestMapping("/apiadmin/base/wmswarehousezone") |
|||
public class WmsWarehouseZoneRest { |
|||
|
|||
@Autowired |
|||
private WmsWarehouseZoneService wmsWarehouseZoneService; |
|||
|
|||
@ApiOperation("分页列表") |
|||
@PostMapping("/listPage") |
|||
public ResultBean<PagerVo<WmsWarehouseZoneVo>> listPage(@RequestBody PagerQuery<WmsWarehouseZoneQuery> pq) { |
|||
return wmsWarehouseZoneService.listPage(pq); |
|||
} |
|||
@ApiOperation("查询所有的库区") |
|||
@PostMapping("/listAll") |
|||
public ResultBean<List<WmsWarehouseZone>> listAll(@RequestBody OrgPathQuery query) { |
|||
return wmsWarehouseZoneService.getAllType(query); |
|||
} |
|||
|
|||
@ApiOperation("保存修改") |
|||
@PostMapping("/saveOrUpdate") |
|||
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseZoneDto dto) { |
|||
return wmsWarehouseZoneService.saveZone(dto); |
|||
} |
|||
|
|||
@ApiOperation("初始化") |
|||
@GetMapping("/initialization/{sid}") |
|||
public ResultBean<WmsWarehouseZoneInitVo> initialization(@PathVariable("sid") String sid) { |
|||
return wmsWarehouseZoneService.initialization(sid); |
|||
} |
|||
|
|||
@ApiOperation("删除") |
|||
@DeleteMapping("/delete/{sid}") |
|||
public ResultBean delete(@PathVariable("sid") String sid) { |
|||
return wmsWarehouseZoneService.delete(sid); |
|||
} |
|||
|
|||
@ApiOperation("根据sid批量删除") |
|||
@DeleteMapping("/delBySids") |
|||
public ResultBean delBySids(@RequestBody String[] sids){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
wmsWarehouseZoneService.delAll(sids); |
|||
return rb.success(); |
|||
} |
|||
|
|||
@ApiOperation("更改可用状态") |
|||
@GetMapping("/updateIsEnable/{sid}/{isEnable}") |
|||
public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { |
|||
return wmsWarehouseZoneService.updateIsEnable(sid,isEnable); |
|||
} |
|||
|
|||
@ApiOperation("根据仓库sid查询所有库位") |
|||
@GetMapping("/selectAll") |
|||
public ResultBean<List<WmsWarehouseZoneAllVo>> selectAll(@RequestParam("ckSid") String ckSid){ |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
List<WmsWarehouseZoneAllVo> vo = wmsWarehouseZoneService.selectAll(ckSid); |
|||
return rb.success().setData(vo); |
|||
} |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.yxt.common.core.domain.BaseEntity; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/28 8:38 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZone extends BaseEntity { |
|||
private String zoneName;//库位名称
|
|||
private String zoneCode;//库位编码
|
|||
private String warehouseSid;//仓库sid
|
|||
private BigDecimal volume;//库位容量
|
|||
private String unit;//计量单位
|
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:58 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZoneAllVo implements Vo { |
|||
|
|||
private String sid; |
|||
@ApiModelProperty("区域名称") |
|||
private String zoneName; |
|||
@ApiModelProperty("区域编码") |
|||
private String zoneCode; |
|||
|
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.yxt.common.core.dto.Dto; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:37 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZoneDto implements Dto { |
|||
|
|||
private String sid; |
|||
private String remarks; |
|||
private String zoneName;//区域名称
|
|||
private String zoneCode;//区域编码
|
|||
private String warehouseSid;//仓库sid
|
|||
private String warehouseName;//仓库
|
|||
private String volume;//区域面积
|
|||
private String unit;//计量单位
|
|||
private String userSid; //用户sid
|
|||
|
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:39 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZoneInitVo { |
|||
|
|||
private String sid; |
|||
private String remarks; |
|||
private String zoneName;//区域名称
|
|||
private String zoneCode;//区域编码
|
|||
private String warehouseSid;//仓库sid
|
|||
private String warehouseName;//仓库
|
|||
private String volume;//区域面积
|
|||
private String unit;//计量单位
|
|||
private String userSid; //用户sid
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.core.toolkit.Constants; |
|||
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea; |
|||
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo; |
|||
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/26 13:40 |
|||
*/ |
|||
@Mapper |
|||
public interface WmsWarehouseZoneMapper extends BaseMapper<WmsWarehouseZone> { |
|||
|
|||
IPage<WmsWarehouseZoneVo> listPage(IPage<WmsWarehouseZone> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseZone> qw); |
|||
|
|||
List<WmsWarehouseZone> listAll(@Param("useOrgSid") String useOrgSid); |
|||
|
|||
WmsWarehouseZone checkForInsert(@Param("zoneCode") String zoneCode,@Param("warehouseSid") String warehouseSid); |
|||
|
|||
int selectNum(@Param("warehouseCode") String warehouseCode); |
|||
|
|||
WmsWarehouseZone checkForUpdate(@Param("zoneCode") String zoneCode, @Param("warehouseSid")String warehouseSid,@Param("sid") String sid); |
|||
|
|||
WmsWarehouseZoneInitVo initialization(String sid); |
|||
|
|||
int updateBySidIsDelete(List<String> list); |
|||
|
|||
List<WmsWarehouseZoneAllVo> selectAll(String ckSid); |
|||
} |
|||
@ -0,0 +1,64 @@ |
|||
<?xml version="1.0" encoding="UTF-8" ?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneMapper"> |
|||
<update id="updateBySidIsDelete"> |
|||
UPDATE wms_warehouse_zone |
|||
SET isDelete=1 |
|||
where sid in |
|||
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> |
|||
#{item} |
|||
</foreach> |
|||
</update> |
|||
<!-- <where> ${ew.sqlSegment} </where>--> |
|||
<!-- ${ew.customSqlSegment} --> |
|||
|
|||
|
|||
<select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneVo"> |
|||
select |
|||
a.*,b.warehouseName as warehouseName |
|||
from wms_warehouse_zone a |
|||
left join wms_warehouse_info b on b.sid=a.warehouseSid |
|||
LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid |
|||
<where> |
|||
${ew.sqlSegment} |
|||
</where> |
|||
</select> |
|||
<select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone"> |
|||
select a.* |
|||
from wms_warehouse_zone a |
|||
left join wms_warehouse_info b on b.sid = a.warehouseSid |
|||
where b.useOrgSid = #{useOrgSid} |
|||
and a.isDelete = 0 |
|||
</select> |
|||
<select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone"> |
|||
select * |
|||
from wms_warehouse_zone |
|||
where zoneCode = #{zoneCode} |
|||
and warehouseSid = #{warehouseSid} |
|||
and isDelete = 0 |
|||
</select> |
|||
<select id="selectNum" resultType="java.lang.Integer"> |
|||
select IFNULL(CAST(REPLACE(MAX(zoneCode), #{warehouseCode}, '') AS SIGNED), 0) as code |
|||
from wms_warehouse_zone |
|||
where zoneCode LIKE concat(#{warehouseCode}, '%') |
|||
</select> |
|||
<select id="checkForUpdate" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone"> |
|||
select * |
|||
from wms_warehouse_zone |
|||
where zoneCode = #{zoneCode} |
|||
and warehouseSid = #{warehouseSid} |
|||
and sid !=#{sid} |
|||
and isDelete=0 |
|||
</select> |
|||
<select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneInitVo"> |
|||
select a.*, |
|||
a.createBySid as userSid, |
|||
b.warehouseName as warehouseName |
|||
from wms_warehouse_zone a |
|||
left join wms_warehouse_info b on b.sid = a.warehouseSid |
|||
where a.sid = #{sid} |
|||
</select> |
|||
<select id="selectAll" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneAllVo"> |
|||
select * from wms_warehouse_zone where warehouseSid = #{ckSid} and isDelete = 0 and isEnable = 1 |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,26 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:24 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZoneQuery implements Query { |
|||
|
|||
private String name;//名字
|
|||
private String code;//编码
|
|||
private String warehouseSid;//仓库
|
|||
|
|||
@ApiModelProperty("菜单路由") |
|||
private String menuUrl; |
|||
@ApiModelProperty("组织全路径sid") |
|||
private String orgPath; |
|||
@ApiModelProperty("用户sid") |
|||
private String userSid; |
|||
|
|||
} |
|||
@ -0,0 +1,195 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import cn.hutool.core.bean.BeanUtil; |
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.yxt.common.base.service.MybatisBaseService; |
|||
import com.yxt.common.base.utils.PagerUtil; |
|||
import com.yxt.common.base.utils.StringUtils; |
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import com.yxt.wms.biz.base.wmswarehousearea.*; |
|||
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; |
|||
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; |
|||
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; |
|||
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; |
|||
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; |
|||
import com.yxt.wms.feign.portal.sysuser.SysUserFeign; |
|||
import com.yxt.wms.utils.OrgPathQuery; |
|||
import com.yxt.wms.utils.Rule; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.Arrays; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
import java.util.stream.Collectors; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:19 |
|||
*/ |
|||
@Service |
|||
public class WmsWarehouseZoneService extends MybatisBaseService<WmsWarehouseZoneMapper, WmsWarehouseZone> { |
|||
@Autowired |
|||
private SysUserFeign sysUserFeign; |
|||
@Autowired |
|||
private SysOrganizationFeign sysOrganizationFeign; |
|||
@Autowired |
|||
private WmsWarehouseInfoService warehouseInfoService; |
|||
|
|||
public ResultBean<PagerVo<WmsWarehouseZoneVo>> listPage(PagerQuery<WmsWarehouseZoneQuery> pq) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
WmsWarehouseZoneQuery query = pq.getParams(); |
|||
QueryWrapper<WmsWarehouseZone> qw = new QueryWrapper<>(); |
|||
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|||
privilegeQuery.setOrgPath(query.getOrgPath()); |
|||
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|||
privilegeQuery.setUserSid(query.getUserSid()); |
|||
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|||
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|||
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|||
String orgSidPath = query.getOrgPath(); |
|||
orgSidPath = orgSidPath + "/"; |
|||
int i1 = orgSidPath.indexOf("/"); |
|||
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|||
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|||
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|||
String orgLevelKey = defaultIdReltBean.getData(); |
|||
if ("1".equals(orgLevelKey)) { |
|||
orgSidPath = orgSidPath.substring(0, i1); |
|||
qw.like("s.orgSidPath", orgSidPath); |
|||
} else if ("2".equals(orgLevelKey)) { |
|||
orgSidPath = orgSidPath.substring(0, i2); |
|||
qw.like("s.orgSidPath", orgSidPath); |
|||
} else if ("3".equals(orgLevelKey)) { |
|||
orgSidPath = orgSidPath.substring(0, i3); |
|||
qw.like("s.orgSidPath", orgSidPath); |
|||
} else if ("4".equals(orgLevelKey)) { |
|||
orgSidPath = orgSidPath.substring(0, i4); |
|||
qw.like("s.orgSidPath", orgSidPath); |
|||
} else if ("5".equals(orgLevelKey)) { |
|||
qw.eq("a.createBySid", query.getUserSid()); |
|||
} else { |
|||
PagerVo<WmsWarehouseZoneVo> p = new PagerVo<>(); |
|||
return rb.success().setData(p); |
|||
} |
|||
} else { |
|||
PagerVo<WmsWarehouseZoneVo> p = new PagerVo<>(); |
|||
return rb.success().setData(p); |
|||
} |
|||
if (StringUtils.isNotBlank(query.getName())) { |
|||
qw.like("a.zoneName", query.getName()); |
|||
} |
|||
if (StringUtils.isNotBlank(query.getCode())) { |
|||
qw.like("a.zoneCode", query.getCode()); |
|||
} |
|||
if (StringUtils.isNotBlank(query.getWarehouseSid())) { |
|||
qw.eq("b.sid", query.getWarehouseSid()); |
|||
} |
|||
qw.ne("a.isDelete", "1"); |
|||
IPage<WmsWarehouseZone> page = PagerUtil.queryToPage(pq); |
|||
IPage<WmsWarehouseZoneVo> pagging = baseMapper.listPage(page, qw); |
|||
PagerVo<WmsWarehouseZoneVo> p = PagerUtil.pageToVo(pagging, null); |
|||
return rb.success().setData(p); |
|||
} |
|||
|
|||
public ResultBean<List<WmsWarehouseZone>> getAllType(OrgPathQuery query) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
String useOrgSid = ""; |
|||
String orgPath = query.getOrgPath(); |
|||
if (StringUtils.isNotBlank(orgPath)) { |
|||
List<String> split = Arrays.asList(orgPath.split("/")); |
|||
if (split.size() > 1) { |
|||
//获取本级sid获取本级部门信息
|
|||
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); |
|||
useOrgSid = sysOrganization1.getSid(); |
|||
} else { |
|||
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); |
|||
useOrgSid = sysOrganization.getSid(); |
|||
} |
|||
} |
|||
List<WmsWarehouseZone> list = baseMapper.listAll(useOrgSid); |
|||
return rb.success().setData(list); |
|||
} |
|||
|
|||
public ResultBean<String> saveZone(WmsWarehouseZoneDto dto) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
if (StringUtils.isNotBlank(dto.getSid())) { |
|||
String sid = dto.getSid(); |
|||
WmsWarehouseZone wmsWarehouseZone = fetchBySid(dto.getSid()); |
|||
BeanUtil.copyProperties(dto, wmsWarehouseZone, "id", "sid"); |
|||
if (StringUtils.isNotBlank(dto.getZoneCode()) && !dto.getZoneCode().equals("由系统自动生成")) { |
|||
WmsWarehouseZone zone = baseMapper.checkForUpdate(dto.getZoneCode(), dto.getWarehouseSid(), sid); |
|||
if (null != zone) { |
|||
return rb.setMsg("同一个仓库下的区域编码不能重复。"); |
|||
} |
|||
} else { |
|||
WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(dto.getWarehouseSid()); |
|||
if (null != warehouseInfo) { |
|||
String warehouseCode = warehouseInfo.getWarehouseCode(); |
|||
int i = baseMapper.selectNum(warehouseCode); |
|||
String code = Rule.getBillNo3(warehouseCode, i); |
|||
wmsWarehouseZone.setZoneCode(code); |
|||
} |
|||
} |
|||
wmsWarehouseZone.setModifyTime(new Date()); |
|||
baseMapper.updateById(wmsWarehouseZone); |
|||
} else { |
|||
WmsWarehouseZone entity = new WmsWarehouseZone(); |
|||
entity.setCreateBySid(dto.getUserSid()); |
|||
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|||
if (StringUtils.isNotBlank(dto.getZoneCode()) && !dto.getZoneCode().equals("由系统自动生成")) { |
|||
WmsWarehouseZone zone = baseMapper.checkForInsert(dto.getZoneCode(), dto.getWarehouseSid()); |
|||
if (null != zone) { |
|||
return rb.setMsg("同一个仓库下的区域编码不能重复。"); |
|||
} |
|||
} else { |
|||
WmsWarehouseInfo warehouseInfo = warehouseInfoService.fetchBySid(dto.getWarehouseSid()); |
|||
if (null != warehouseInfo) { |
|||
String warehouseCode = warehouseInfo.getWarehouseCode(); |
|||
int i = baseMapper.selectNum(warehouseCode); |
|||
String code = Rule.getBillNo3(warehouseCode, i); |
|||
entity.setZoneCode(code); |
|||
} |
|||
} |
|||
baseMapper.insert(entity); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public ResultBean<WmsWarehouseZoneInitVo> initialization(String sid) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
WmsWarehouseZoneInitVo vo = baseMapper.initialization(sid); |
|||
return rb.success().setData(vo); |
|||
} |
|||
|
|||
public ResultBean delete(String sid) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
WmsWarehouseZone wmsWarehouseZone = fetchBySid(sid); |
|||
if (null != wmsWarehouseZone) { |
|||
baseMapper.deleteById(wmsWarehouseZone.getId()); |
|||
} |
|||
return rb.success(); |
|||
} |
|||
|
|||
public void delAll(String[] sids) { |
|||
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); |
|||
} |
|||
|
|||
public ResultBean updateIsEnable(String sid, String isEnable) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
WmsWarehouseZone wmsWarehouseZone = fetchBySid(sid); |
|||
if (null != wmsWarehouseZone) { |
|||
wmsWarehouseZone.setIsEnable(Integer.parseInt(isEnable)); |
|||
baseMapper.updateById(wmsWarehouseZone); |
|||
} |
|||
return rb.success().setMsg("成功"); |
|||
} |
|||
|
|||
public List<WmsWarehouseZoneAllVo> selectAll(String ckSid) { |
|||
return baseMapper.selectAll(ckSid); |
|||
} |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
package com.yxt.wms.biz.base.wmswarehousezone; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.yxt.common.core.vo.Vo; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/9/14 14:24 |
|||
*/ |
|||
@Data |
|||
public class WmsWarehouseZoneVo implements Vo { |
|||
|
|||
private String sid; |
|||
private String remarks; |
|||
private String isEnable; |
|||
private String isDelete; |
|||
private String zoneName;//区域名称
|
|||
private String zoneCode;//区域编码
|
|||
private String volume;//区域面积
|
|||
private String unit;//计量单位
|
|||
private String warehouseName;//仓库名称
|
|||
} |
|||
Loading…
Reference in new issue