diff --git a/ant-design-vue-jeecg/src/views/system/UserList.vue b/ant-design-vue-jeecg/src/views/system/UserList.vue
index 0c98e77..402cde8 100644
--- a/ant-design-vue-jeecg/src/views/system/UserList.vue
+++ b/ant-design-vue-jeecg/src/views/system/UserList.vue
@@ -227,7 +227,7 @@ export default {
align: "center",
dataIndex: 'username',
width: 120,
- sorter: true
+ sorter: true,
},
{
title: '用户姓名',
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
new file mode 100644
index 0000000..3d77ccf
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -0,0 +1,357 @@
+<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="货主">
+ <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></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.zoneCode"></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.containerCode"></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.locationCode"></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.materialCode"></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.materialName"></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.materialSpec"></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.materialUnit"></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.inventoryStatus" dictCode="inventory_status"/>
+ </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.batch"></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.uniqueCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="入库日期">
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入库日期" v-model="queryParam.receiptDate"></j-date>
+ </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.inventoryAge"></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 v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
+ <a-upload v-has="'inventoryDetail:import'" 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" v-has="'inventoryDetail:superSearch'" 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>
+
+ <simple-inventory-detail-modal ref="modalForm" @ok="modalFormOk"></simple-inventory-detail-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import SimpleInventoryDetailModal from './modules/SimpleInventoryDetailModal'
+ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+ export default {
+ name: 'InventoryDetailList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ SimpleInventoryDetailModal
+ },
+ 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: 'companyCode'
+ },
+ {
+ title:'库区',
+ align:"center",
+ dataIndex: 'zoneCode'
+ },
+ {
+ title:'容器编码',
+ align:"center",
+ dataIndex: 'containerCode'
+ },
+ {
+ title:'库位编码',
+ align:"center",
+ dataIndex: 'locationCode'
+ },
+ {
+ title:'物料编码',
+ align:"center",
+ dataIndex: 'materialCode'
+ },
+ {
+ title:'物料名称',
+ align:"center",
+ dataIndex: 'materialName'
+ },
+ {
+ title:'物料规格',
+ align:"center",
+ dataIndex: 'materialSpec'
+ },
+ {
+ title:'物料单位',
+ align:"center",
+ dataIndex: 'materialUnit'
+ },
+ {
+ title:'数量',
+ align:"center",
+ dataIndex: 'qty'
+ },
+ {
+ title:'任务锁定数量',
+ align:"center",
+ dataIndex: 'taskQty'
+ },
+ {
+ title:'库存状态',
+ align:"center",
+ dataIndex: 'inventoryStatus_dictText'
+ },
+ {
+ title:'批次',
+ align:"center",
+ dataIndex: 'batch'
+ },
+ {
+ title:'唯一号',
+ align:"center",
+ dataIndex: 'uniqueCode'
+ },
+ {
+ title:'入库日期',
+ align:"center",
+ dataIndex: 'receiptDate'
+ },
+ {
+ title:'库龄（天）',
+ align:"center",
+ dataIndex: 'inventoryAge'
+ },
+ {
+ title:'创建人',
+ align:"center",
+ dataIndex: 'createBy'
+ },
+ {
+ title:'创建日期',
+ align:"center",
+ dataIndex: 'createTime'
+ },
+ {
+ title:'更新人',
+ align:"center",
+ dataIndex: 'updateBy'
+ },
+ {
+ title:'更新日期',
+ align:"center",
+ dataIndex: 'updateTime'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/inventory/inventoryDetail/list",
+ delete: "/inventory/inventoryDetail/delete",
+ deleteBatch: "/inventory/inventoryDetail/deleteBatch",
+ exportXlsUrl: "/inventory/inventoryDetail/exportXls",
+ importExcelUrl: "inventory/inventoryDetail/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
+ fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
+ fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
+ fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
+ fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
+ fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
+ fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
+ fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'qty',text:'数量',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'taskQty',text:'任务锁定数量',dictCode:''})
+ fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
+ fieldList.push({type:'string',value:'batch',text:'批次',dictCode:''})
+ fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
+ fieldList.push({type:'datetime',value:'receiptDate',text:'入库日期'})
+ fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
+ fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+ fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+ fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+ fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailForm.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailForm.vue
new file mode 100644
index 0000000..115b651
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailForm.vue
@@ -0,0 +1,165 @@
+<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="companyCode">
+ <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zoneCode">
+ <a-input v-model="model.zoneCode" placeholder="请输入库区" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="容器编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="containerCode">
+ <a-input v-model="model.containerCode" placeholder="请输入容器编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
+ <a-input v-model="model.locationCode" placeholder="请输入库位编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
+ <a-input v-model="model.materialCode" placeholder="请输入物料编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
+ <a-input v-model="model.materialName" placeholder="请输入物料名称" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialSpec">
+ <a-input v-model="model.materialSpec" placeholder="请输入物料规格" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialUnit">
+ <a-input v-model="model.materialUnit" placeholder="请输入物料单位" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
+ <a-input-number v-model="model.qty" placeholder="请输入数量" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="任务锁定数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskQty">
+ <a-input-number v-model="model.taskQty" placeholder="请输入任务锁定数量" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库存状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryStatus">
+ <j-dict-select-tag type="list" v-model="model.inventoryStatus" dictCode="inventory_status" placeholder="请选择库存状态" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batch">
+ <a-input v-model="model.batch" 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: 'SimpleInventoryDetailForm',
+ components: {
+ },
+ props: {
+ //表单禁用
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ containerCode: [
+ { required: true, message: '请输入容器编码!'},
+ ],
+ materialCode: [
+ { required: true, message: '请输入物料编码!'},
+ ],
+ },
+ url: {
+ add: "/inventory/inventoryDetail/add",
+ edit: "/inventory/inventoryDetail/edit",
+ queryById: "/inventory/inventoryDetail/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;
+ })
+ }
+
+ })
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.Style#Drawer.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.Style#Drawer.vue
new file mode 100644
index 0000000..2ea3cc9
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ destroyOnClose
+ :visible="visible">
+ <inventory-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inventory-detail-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 SimpleInventoryDetailForm from './SimpleInventoryDetailForm'
+
+ export default {
+ name: 'SimpleInventoryDetailModal',
+ components: {
+ SimpleInventoryDetailForm
+ },
+ 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>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.vue
new file mode 100644
index 0000000..0fe7849
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/SimpleInventoryDetailModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <inventory-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inventory-detail-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import SimpleInventoryDetailForm from './SimpleInventoryDetailForm'
+ export default {
+ name: 'SimpleInventoryDetailModal',
+ components: {
+ SimpleInventoryDetailForm
+ },
+ 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>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
index 7336829..fc3e9b4 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
@@ -118,7 +118,8 @@
{
title:'业务ID',
align:"center",
- dataIndex: 'bizId'
+ dataIndex: 'bizId',
+ sorter: true,
},
{
title:'业务类型',
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
index 73f7c62..e46b6a8 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -231,8 +231,8 @@ export default {
{
title: '单据ID',
align: "center",
+ dataIndex: 'id',
sorter: true,
- dataIndex: 'id'
},
{
title: '入库单编码',
diff --git a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
index 38ab632..d88c8c3 100644
--- a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
@@ -156,6 +156,7 @@
title: '任务ID',
align: "center",
dataIndex: 'id',
+ sorter: true,
},
{
title:'任务类型',
diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
index 77ef3d8..47f1a32 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
@@ -222,6 +222,7 @@ export default {
title: '任务ID',
align: "center",
dataIndex: 'id',
+ sorter: true,
},
{
title: '任务类型',
diff --git a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
index aa6e184..38b2aee 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
@@ -226,6 +226,7 @@ export default {
title: '任务ID',
align: "center",
dataIndex: 'id',
+ sorter: true,
},
{
title: '任务类型',
diff --git a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
index 9699ca6..588a8af 100644
--- a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -226,6 +226,7 @@ export default {
title: '任务ID',
align: "center",
dataIndex: 'id',
+ sorter: true,
},
{
title: '任务类型',
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
new file mode 100644
index 0000000..20d0424
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -0,0 +1,148 @@
+package org.jeecg.modules.wms.inventory.inventoryDetail.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 库存详情
+ * @Author: jeecg-boot
+ * @Date: 2023-03-09
+ * @Version: V1.0
+ */
+@Api(tags = "库存详情")
+@RestController
+@RequestMapping("/inventory/inventoryDetail")
+@Slf4j
+public class InventoryDetailController extends JeecgController<InventoryDetail, IInventoryDetailService> {
+ @Autowired
+ private IInventoryDetailService inventoryDetailService;
+
+ /**
+ * 分页列表查询
+ * @param inventoryDetail
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ // @AutoLog(value = "库存详情-分页列表查询")
+ @ApiOperation(value = "库存详情-分页列表查询", notes = "库存详情-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<InventoryDetail>> queryPageList(InventoryDetail inventoryDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
+ Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
+ IPage<InventoryDetail> pageList = inventoryDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ * @param inventoryDetail
+ * @return
+ */
+ @AutoLog(value = "库存详情-添加")
+ @ApiOperation(value = "库存详情-添加", notes = "库存详情-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody InventoryDetail inventoryDetail) {
+ inventoryDetailService.save(inventoryDetail);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ * @param inventoryDetail
+ * @return
+ */
+ @AutoLog(value = "库存详情-编辑")
+ @ApiOperation(value = "库存详情-编辑", notes = "库存详情-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody InventoryDetail inventoryDetail) {
+ inventoryDetailService.updateById(inventoryDetail);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "库存详情-通过id删除")
+ @ApiOperation(value = "库存详情-通过id删除", notes = "库存详情-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ inventoryDetailService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "库存详情-批量删除")
+ @ApiOperation(value = "库存详情-批量删除", notes = "库存详情-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.inventoryDetailService.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<InventoryDetail> queryById(@RequestParam(name = "id", required = true) String id) {
+ InventoryDetail inventoryDetail = inventoryDetailService.getById(id);
+ if (inventoryDetail == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(inventoryDetail);
+ }
+
+ /**
+ * 导出excel
+ * @param request
+ * @param inventoryDetail
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, InventoryDetail inventoryDetail) {
+ return super.exportXls(request, inventoryDetail, InventoryDetail.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, InventoryDetail.class);
+ }
+
+}