zhc4dev
wangjiadong 2 years ago
parent 6c209ebe31
commit 3cae63721b
  1. 251
      ant-design-vue-jeecg/src/views/delivery/DeliveryList.vue
  2. 244
      ant-design-vue-jeecg/src/views/delivery/modules/DeliveryForm.vue
  3. 60
      ant-design-vue-jeecg/src/views/delivery/modules/DeliveryModal.vue
  4. 84
      ant-design-vue-jeecg/src/views/delivery/modules/DeliveryModal__Style#Drawer.vue
  5. 208
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/controller/DeliveryController.java
  6. 106
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/entity/Delivery.java
  7. 18
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/mapper/DeliveryMapper.java
  8. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/mapper/xml/DeliveryMapper.xml
  9. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
  10. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java

@ -0,0 +1,251 @@
<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="6" :lg="7" :md="8" :sm="24">
<a-form-item label="仓库">
<j-search-select-tag placeholder="请选择仓库" v-model="queryParam.storehouseId" dict="starehouse,name,id"/>
</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.itemType" dictCode="goods_category"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="管理员">
<j-search-select-tag placeholder="请选择管理员" v-model="queryParam.adminId" dict="sys_user,realname,id"/>
</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>
<delivery-modal ref="modalForm" @ok="modalFormOk"></delivery-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import DeliveryModal from './modules/DeliveryModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'DeliveryList',
mixins:[JeecgListMixin, mixinDevice],
components: {
DeliveryModal
},
data () {
return {
description: '出库表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'仓库',
align:"center",
dataIndex: 'storehouseId_dictText'
},
{
title:'物品类型',
align:"center",
dataIndex: 'itemType_dictText'
},
{
title:'物品编码',
align:"center",
dataIndex: 'itemCode'
},
{
title:'用量',
align:"center",
dataIndex: 'amount'
},
{
title:'单位',
align:"center",
dataIndex: 'unit'
},
{
title:'出库原因',
align:"center",
dataIndex: 'deliveryReason_dictText'
},
{
title:'出库时间',
align:"center",
dataIndex: 'deliveryTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'取货人',
align:"center",
dataIndex: 'carrierId_dictText'
},
{
title:'管理员',
align:"center",
dataIndex: 'adminId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/delivery/delivery/list",
delete: "/delivery/delivery/delete",
deleteBatch: "/delivery/delivery/deleteBatch",
exportXlsUrl: "/delivery/delivery/exportXls",
importExcelUrl: "delivery/delivery/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_search',value:'storehouseId',text:'仓库',dictTable:'starehouse', dictText:'name', dictCode:'id'})
fieldList.push({type:'string',value:'itemType',text:'物品类型',dictCode:'goods_category'})
fieldList.push({type:'popup',value:'itemCode',text:'物品编码', popup:{code:'findml',field:'fabric_number',orgFields:'fabric_number',destFields:'item_code'}})
fieldList.push({type:'string',value:'amount',text:'用量',dictCode:''})
fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
fieldList.push({type:'string',value:'deliveryReason',text:'出库原因',dictCode:'scjc'})
fieldList.push({type:'date',value:'deliveryTime',text:'出库时间'})
fieldList.push({type:'sel_user',value:'carrierId',text:'取货人'})
fieldList.push({type:'sel_search',value:'adminId',text:'管理员',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'adminName',text:'管理员', popup:{code:'findck',field:'id',orgFields:'id',destFields:'admin_id'}})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,244 @@
<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="storehouseId">
<j-search-select-tag v-model="model.storehouseId" dict="starehouse,name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="物品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemType">
<j-dict-select-tag type="list" v-model="model.itemType" dictCode="goods_category" placeholder="请选择物品类型" />
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.itemType==1">
<a-form-model-item label="物品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemCode">
<j-popup
v-model="model.itemCode"
field="itemCode"
org-fields="fabric_number"
dest-fields="itemCode"
code="findml"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.itemType==2">
<a-form-model-item label="物品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemCode">
<j-popup
v-model="model.itemCode"
field="itemCode"
org-fields="nums"
dest-fields="itemCode"
code="ckfindfl"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.itemType==3">
<a-form-model-item label="物品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemCode">
<j-popup
v-model="model.itemCode"
field="itemCode"
org-fields="code"
dest-fields="itemCode"
code="ckfindsb"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.itemType==4">
<a-form-model-item label="物品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemCode">
<j-popup
v-model="model.itemCode"
field="itemCode"
org-fields="nums"
dest-fields="itemCode"
code="kcfindgj"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-if="this.model.itemType==5">
<a-form-model-item label="物品编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemCode">
<j-popup
v-model="model.itemCode"
field="itemCode"
org-fields="goods_code"
dest-fields="itemCode"
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="amount">
<a-input v-model="model.amount" placeholder="请输入用量" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
<a-input v-model="model.unit" placeholder="请输入单位" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="出库原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryReason">
<j-dict-select-tag type="radio" v-model="model.deliveryReason" dictCode="scjc" placeholder="请选择出库原因" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="出库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryTime">
<j-date placeholder="请选择出库时间" v-model="model.deliveryTime" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="取货人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="carrierId">
<j-select-user-by-dep v-model="model.carrierId" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="管理员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adminName">
<j-popup
v-model="model.adminName"
field="adminName"
org-fields="id,realname"
dest-fields="adminId,adminName"
code="findck"
:multi="true"
@input="popupCallback"
/>
</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: 'DeliveryForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
itemType :"1",
deliveryTime : "0"
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
storehouseId: [
{ required: true, message: '请输入仓库!'},
],
itemType: [
{ required: true, message: '请输入物品类型!'},
],
itemCode: [
{ required: true, message: '请输入物品编码!'},
],
deliveryTime: [
{ required: true, message: '请输入出库时间!'},
],
carrierId: [
{ required: true, message: '请输入取货人!'},
],
adminName: [
{ required: true, message: '请输入管理员!'},
],
},
url: {
add: "/delivery/delivery/add",
edit: "/delivery/delivery/edit",
queryById: "/delivery/delivery/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>

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<delivery-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></delivery-form>
</j-modal>
</template>
<script>
import DeliveryForm from './DeliveryForm'
export default {
name: 'DeliveryModal',
components: {
DeliveryForm
},
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>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<delivery-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></delivery-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 DeliveryForm from './DeliveryForm'
export default {
name: 'DeliveryModal',
components: {
DeliveryForm
},
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>

@ -0,0 +1,208 @@
package org.jeecg.modules.demo.delivery.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.delivery.entity.Delivery;
import org.jeecg.modules.demo.delivery.service.IDeliveryService;
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.jeecg.modules.demo.warehousing.service.IWarehousingService;
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-10
* @Version: V1.0
*/
@Api(tags="出库表")
@RestController
@RequestMapping("/delivery/delivery")
@Slf4j
public class DeliveryController extends JeecgController<Delivery, IDeliveryService> {
@Autowired
private IDeliveryService deliveryService;
@Autowired
private IWarehousingService warehousingService;
/**
* 分页列表查询
*
* @param delivery
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "出库表-分页列表查询")
@ApiOperation(value="出库表-分页列表查询", notes="出库表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(Delivery delivery,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Delivery> queryWrapper = QueryGenerator.initQueryWrapper(delivery, req.getParameterMap());
Page<Delivery> page = new Page<Delivery>(pageNo, pageSize);
IPage<Delivery> pageList = deliveryService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param delivery
* @return
*/
@AutoLog(value = "出库表-添加")
@ApiOperation(value="出库表-添加", notes="出库表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody Delivery delivery) {
//获取编码
String needbm=delivery.getItemCode();
//获取类型
String needlx = delivery.getItemType();
//获取原始库存数据
Double yssj = warehousingService.yssj(needbm,needlx);
//获取出库数据
Double sj =delivery.getAmount();
Double needsj = yssj - sj;
if (needsj>0){
warehousingService.dokucun(needbm,needlx,sj,needsj);
deliveryService.save(delivery);
return Result.OK("添加成功!");
}else {
return Result.error("库存不足");
}
}
/**
* 编辑
*
* @param delivery
* @return
*/
@AutoLog(value = "出库表-编辑")
@ApiOperation(value="出库表-编辑", notes="出库表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody Delivery delivery) {
//获取编码
String needbm=delivery.getItemCode();
//获取类型
String needlx = delivery.getItemType();
//获取原始库存数据
Double yssj = warehousingService.yssj(needbm,needlx);
//获取出库数据
Double sj =delivery.getAmount();
//获取出库表的原始数据
Double ckbsj = deliveryService.getById(delivery.getId()).getAmount();
Double needsj =yssj + ckbsj -sj;
if (needsj>0){
warehousingService.dokucun(needbm,needlx,sj,needsj);
deliveryService.updateById(delivery);
return Result.OK("编辑成功!");
}else {
return Result.error("库存不足");
}
}
/**
* 通过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) {
deliveryService.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.deliveryService.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) {
Delivery delivery = deliveryService.getById(id);
if(delivery==null) {
return Result.error("未找到对应数据");
}
return Result.OK(delivery);
}
/**
* 导出excel
*
* @param request
* @param delivery
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Delivery delivery) {
return super.exportXls(request, delivery, Delivery.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, Delivery.class);
}
}

@ -0,0 +1,106 @@
package org.jeecg.modules.demo.delivery.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-10
* @Version: V1.0
*/
@Data
@TableName("delivery")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="delivery对象", description="出库表")
public class Delivery 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, dictTable = "starehouse", dicText = "name", dicCode = "id")
@Dict(dictTable = "starehouse", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "仓库")
private String storehouseId;
/**物品类型*/
@Excel(name = "物品类型", width = 15, dicCode = "goods_category")
@Dict(dicCode = "goods_category")
@ApiModelProperty(value = "物品类型")
private String itemType;
/**物品编码*/
@Excel(name = "物品编码", width = 15)
@ApiModelProperty(value = "物品编码")
private String itemCode;
/**用量*/
@Excel(name = "用量", width = 15)
@ApiModelProperty(value = "用量")
private java.lang.Double amount;
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private String unit;
/**出库原因*/
@Excel(name = "出库原因", width = 15, dicCode = "scjc")
@Dict(dicCode = "scjc")
@ApiModelProperty(value = "出库原因")
private String deliveryReason;
/**出库时间*/
@Excel(name = "出库时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "出库时间")
private Date deliveryTime;
/**取货人*/
@Excel(name = "取货人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "取货人")
private String carrierId;
/**管理员*/
@Excel(name = "管理员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "管理员")
private String adminId;
/**管理员*/
@Excel(name = "管理员", width = 15)
@ApiModelProperty(value = "管理员")
private String adminName;
}

@ -0,0 +1,18 @@
package org.jeecg.modules.demo.delivery.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 出库表
* @Author: jeecg-boot
* @Date: 2023-01-10
* @Version: V1.0
*/
public interface DeliveryMapper extends BaseMapper<Delivery> {
}

@ -0,0 +1,5 @@
<?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=".delivery.mapper.DeliveryMapper">
</mapper>

@ -0,0 +1,15 @@
package org.jeecg.modules.demo.delivery.service;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 出库表
* @Author: jeecg-boot
* @Date: 2023-01-10
* @Version: V1.0
*/
public interface IDeliveryService extends IService<Delivery> {
}

@ -0,0 +1,20 @@
package org.jeecg.modules.demo.delivery.service.impl;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper;
import org.jeecg.modules.demo.delivery.service.IDeliveryService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 出库表
* @Author: jeecg-boot
* @Date: 2023-01-10
* @Version: V1.0
*/
@Service
public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> implements IDeliveryService {
}
Loading…
Cancel
Save