Merge remote-tracking branch 'origin/master'

zhc4dev
lenovo 2 years ago
commit ad42f0e0aa
  1. 131
      ant-design-vue-jeecg/src/views/kucun/admin/KucunList.vue
  2. 188
      ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunForm.vue
  3. 60
      ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal.vue
  4. 84
      ant-design-vue-jeecg/src/views/kucun/admin/modules/KucunModal__Style#Drawer.vue
  5. 20
      ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue
  6. 28
      ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue
  7. 230
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/controller/KucunController.java
  8. 136
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/entity/Kucun.java
  9. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/KucunMapper.java
  10. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/mapper/xml/KucunMapper.xml
  11. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/IKucunService.java
  12. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/kucun/service/impl/KucunServiceImpl.java
  13. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java

@ -1,131 +0,0 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="库存剩余">
<a-input placeholder="请输入最小值" class="query-group-cust" v-model="queryParam.kcsy_begin"></a-input>
<span class="query-group-split-cust"></span>
<a-input placeholder="请输入最大值" class="query-group-cust" v-model="queryParam.kcsy_end"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="名称">
<a-input placeholder="请输入名称" v-model="queryParam.temp1"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="编号">
<a-input placeholder="请输入编号" v-model="queryParam.temp2"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('库存信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<kucun-modal ref="modalForm" @ok="modalFormOk"></kucun-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import KucunModal from './modules/KucunModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'

@ -1,188 +0,0 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24" >
<a-form-model-item label="物品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuplx">
<j-dict-select-tag type="list" v-model="model.wuplx" dictCode="goods_category" placeholder="请选择物品类型" />
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.wuplx==1">
<a-form-model-item label="面料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mlname">
<j-popup
v-model="model.mlname"
field="mlname"
org-fields="name,id,fabric_number"
dest-fields="mlname,mlid,mlbh"
code="findml"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.wuplx==2">
<a-form-model-item label="辅料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flname">
<j-popup
v-model="model.flname"
field="flname"
org-fields="id,contents"
dest-fields="flid,flname"
code="ckfindfl"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.wuplx==3">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sbname">
<j-popup
v-model="model.sbname"
field="sbname"
org-fields="id,code,name"
dest-fields="sbid,sbbh,sbname"
code="ckfindsb"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.wuplx==4">
<a-form-model-item label="工具" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gjname">
<j-popup
v-model="model.gjname"
field="gjname"
org-fields="id,name,nums"
dest-fields="gjid,gjbh,gjname"
code="kcfindgj"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.wuplx==5">
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spname">
<j-popup
v-model="model.spname"
field="spname"
org-fields="id,goods_code,goods_name"
dest-fields="spid,spbh,spname"
code="kcfindsp"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="库存剩余" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kcsy">
<a-input-number v-model="model.kcsy" placeholder="请输入库存剩余" style="width: 100%" />
</a-form-model-item>
</a-col>
<!--<a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp1">
<a-input v-model="model.temp1" placeholder="请输入名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp2">
<a-input v-model="model.temp2" placeholder="请输入编号" ></a-input>
</a-form-model-item>
</a-col>-->
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'KucunForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
wuplx : ""
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/kucun/kucun/add",
edit: "/kucun/kucun/edit",
queryById: "/kucun/kucun/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -1,60 +0,0 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<kucun-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></kucun-form>
</j-modal>
</template>
<script>
import KucunForm from './KucunForm'
export default {
name: 'KucunModal',
components: {
KucunForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -1,84 +0,0 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<kucun-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></kucun-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import KucunForm from './KucunForm'
export default {
name: 'KucunModal',
components: {
KucunForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

@ -21,10 +21,15 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="电话">
<a-input placeholder="请输入电话" v-model="queryParam.phoe"></a-input>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="仓库存储规则">
<j-dict-select-tag placeholder="请选择仓库存储规则" v-model="queryParam.type" dictCode="goods_category"/>
</a-form-item>
</a-col>
</a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="管理员">
<j-search-select-tag placeholder="请选择管理员" v-model="queryParam.userId" dict="sys_user,realname,id"/>
@ -165,9 +170,9 @@
}
},
{
title:'更新日期',
title:'创建日期',
align:"center",
dataIndex: 'updateTime'
dataIndex: 'createTime'
},
{
title:'名称',
@ -184,16 +189,21 @@
align:"center",
dataIndex: 'exclusive_dictText'
},
{
/*{
title:'仓库存储规则',
align:"center",
dataIndex: 'type_dictText'
},
},*/
{
title:'地址',
align:"center",
dataIndex: 'address'
},
{
title:'电话',
align:"center",
dataIndex: 'phoe'
},
{
title:'管理员',
align:"center",

@ -4,8 +4,8 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="更新日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
<j-date placeholder="请选择更新日期" v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
<a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
<j-date placeholder="请选择创建日期" v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -31,16 +31,24 @@
<j-dict-select-tag type="radio" v-model="model.exclusive" dictCode="yn" placeholder="请选择是否专属" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-model-item label="仓库存储规则" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<j-dict-select-tag type="list" v-model="model.type" dictCode="goods_category" placeholder="请选择仓库存储规则" />
</a-form-model-item>
</a-col>
</a-col>-->
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phoe">
<a-input v-model="model.phoe" placeholder="请输入电话" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="管理员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<j-popup
@ -85,7 +93,7 @@
data () {
return {
model:{
exclusive : "1",
exclusive : "0",
state : "1"
},
labelCol: {
@ -98,6 +106,16 @@
},
confirmLoading: false,
validatorRules: {
name: [
{ required: true, message: '请输入名称!'},
],
partmentnae: [
{ required: true, message: '请输入部门!'},
],
phoe: [
{ required: false},
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
],
},
url: {
add: "/starehouse/starehouse/add",

@ -1,230 +0,0 @@
package org.jeecg.modules.demo.kucun.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.kucun.entity.Kucun;
import org.jeecg.modules.demo.kucun.service.IKucunService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 库存信息
* @Author: jeecg-boot
* @Date: 2023-01-07
* @Version: V1.0
*/
@Api(tags="库存信息")
@RestController
@RequestMapping("/kucun/kucun")
@Slf4j
public class KucunController extends JeecgController<Kucun, IKucunService> {
@Autowired
private IKucunService kucunService;
/**
* 分页列表查询
*
* @param kucun
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "库存信息-分页列表查询")
@ApiOperation(value="库存信息-分页列表查询", notes="库存信息-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(Kucun kucun,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Kucun> queryWrapper = QueryGenerator.initQueryWrapper(kucun, req.getParameterMap());
Page<Kucun> page = new Page<Kucun>(pageNo, pageSize);
IPage<Kucun> pageList = kucunService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kucun
* @return
*/
@AutoLog(value = "库存信息-添加")
@ApiOperation(value="库存信息-添加", notes="库存信息-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody Kucun kucun) {
if(kucun.getWuplx().equals("1")){
kucun.setTemp1(kucun.getMlname());
kucun.setTemp2(kucun.getMlbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("2")){
kucun.setTemp1(kucun.getFlname());
kucun.setTemp2(kucun.getFlbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("3")){
kucun.setTemp1(kucun.getSbname());
kucun.setTemp2(kucun.getSbbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("4")){
kucun.setTemp1(kucun.getGjname());
kucun.setTemp2(kucun.getGjbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("5")){
kucun.setTemp1(kucun.getSpname());
kucun.setTemp2(kucun.getSpbh());
System.out.println(kucun);
}
kucunService.save(kucun);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param kucun
* @return
*/
@AutoLog(value = "库存信息-编辑")
@ApiOperation(value="库存信息-编辑", notes="库存信息-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody Kucun kucun) {
if(kucun.getWuplx().equals("1")){
kucun.setTemp1(kucun.getMlname());
kucun.setTemp2(kucun.getMlbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("2")){
kucun.setTemp1(kucun.getFlname());
kucun.setTemp2(kucun.getFlbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("3")){
kucun.setTemp1(kucun.getSbname());
kucun.setTemp2(kucun.getSbbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("4")){
kucun.setTemp1(kucun.getGjname());
kucun.setTemp2(kucun.getGjbh());
System.out.println(kucun);
}
if(kucun.getWuplx().equals("5")){
kucun.setTemp1(kucun.getSpname());
kucun.setTemp2(kucun.getSpbh());
System.out.println(kucun);
}
kucunService.updateById(kucun);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "库存信息-通过id删除")
@ApiOperation(value="库存信息-通过id删除", notes="库存信息-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
kucunService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "库存信息-批量删除")
@ApiOperation(value="库存信息-批量删除", notes="库存信息-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kucunService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "库存信息-通过id查询")
@ApiOperation(value="库存信息-通过id查询", notes="库存信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
Kucun kucun = kucunService.getById(id);
if(kucun==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kucun);
}
/**
* 导出excel
*
* @param request
* @param kucun
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Kucun kucun) {
return super.exportXls(request, kucun, Kucun.class, "库存信息");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Kucun.class);
}
}

@ -1,136 +0,0 @@
package org.jeecg.modules.demo.kucun.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 库存信息
* @Author: jeecg-boot
* @Date: 2023-01-07
* @Version: V1.0
*/
@Data
@TableName("kucun")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kucun对象", description="库存信息")
public class Kucun implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**物品类型*/
@Excel(name = "物品类型", width = 15, dicCode = "goods_category")
@Dict(dicCode = "goods_category")
@ApiModelProperty(value = "物品类型")
private String wuplx;
/**面料*/
@Excel(name = "面料", width = 15)
@ApiModelProperty(value = "面料")
private String mlid;
/**面料编号*/
@Excel(name = "面料编号", width = 15)
@ApiModelProperty(value = "面料编号")
private String mlbh;
/**面料*/
@Excel(name = "面料", width = 15)
@ApiModelProperty(value = "面料")
private String mlname;
/**辅料*/
@Excel(name = "辅料", width = 15)
@ApiModelProperty(value = "辅料")
private String flid;
/**辅料编号*/
@Excel(name = "辅料编号", width = 15)
@ApiModelProperty(value = "辅料编号")
private String flbh;
/**辅料*/
@Excel(name = "辅料", width = 15)
@ApiModelProperty(value = "辅料")
private String flname;
/**设备*/
@Excel(name = "设备", width = 15)
@ApiModelProperty(value = "设备")
private String sbid;
/**设备编号*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
private String sbbh;
/**设备*/
@Excel(name = "设备", width = 15)
@ApiModelProperty(value = "设备")
private String sbname;
/**工具*/
@Excel(name = "工具", width = 15)
@ApiModelProperty(value = "工具")
private String gjid;
/**工具编号*/
@Excel(name = "工具编号", width = 15)
@ApiModelProperty(value = "工具编号")
private String gjbh;
/**工具*/
@Excel(name = "工具", width = 15)
@ApiModelProperty(value = "工具")
private String gjname;
/**商品*/
@Excel(name = "商品", width = 15)
@ApiModelProperty(value = "商品")
private String spid;
/**商品编号*/
@Excel(name = "商品编号", width = 15)
@ApiModelProperty(value = "商品编号")
private String spbh;
/**商品*/
@Excel(name = "商品", width = 15)
@ApiModelProperty(value = "商品")
private String spname;
/**库存剩余*/
@Excel(name = "库存剩余", width = 15)
@ApiModelProperty(value = "库存剩余")
private Integer kcsy;
/**名称*/
@Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称")
private String temp1;
/**编号*/
@Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号")
private String temp2;
}

@ -1,19 +0,0 @@
package org.jeecg.modules.demo.kucun.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.kucun.entity.Kucun;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 库存信息
* @Author: jeecg-boot
* @Date: 2023-01-07
* @Version: V1.0
*/
public interface KucunMapper extends BaseMapper<Kucun> {
}

@ -1,5 +0,0 @@
<?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="org.jeecg.modules.kucun.mapper.KucunMapper">
</mapper>

@ -1,16 +0,0 @@
package org.jeecg.modules.demo.kucun.service;
import org.jeecg.modules.demo.kucun.entity.Kucun;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 库存信息
* @Author: jeecg-boot
* @Date: 2023-01-07
* @Version: V1.0
*/
public interface IKucunService extends IService<Kucun> {
}

@ -1,19 +0,0 @@
package org.jeecg.modules.demo.kucun.service.impl;
import org.jeecg.modules.demo.kucun.entity.Kucun;
import org.jeecg.modules.demo.kucun.mapper.KucunMapper;
import org.jeecg.modules.demo.kucun.service.IKucunService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 库存信息
* @Author: jeecg-boot
* @Date: 2023-01-07
* @Version: V1.0
*/
@Service
public class KucunServiceImpl extends ServiceImpl<KucunMapper, Kucun> implements IKucunService {
}

@ -74,10 +74,10 @@ public class Starehouse implements Serializable {
@ApiModelProperty(value = "是否专属")
private Integer exclusive;
/**仓库存储规则*/
@Excel(name = "仓库存储规则", width = 15, dicCode = "goods_category")
/* @Excel(name = "仓库存储规则", width = 15, dicCode = "goods_category")
@Dict(dicCode = "goods_category")
@ApiModelProperty(value = "仓库存储规则")
private java.lang.String type;
private java.lang.String type;*/
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
@ -96,4 +96,8 @@ public class Starehouse implements Serializable {
@Dict(dicCode = "yn")
@ApiModelProperty(value = "库存预定")
private String state;
/**电话*/
@Excel(name = "电话", width = 15)
@ApiModelProperty(value = "电话")
private java.lang.String phoe;
}

Loading…
Cancel
Save