From f87ffce298b95bfc65e6d805f0790c7e429a97d0 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Thu, 13 Oct 2022 20:02:24 +0800
Subject: [PATCH] 1 优化界面 2.新增仓库、货主、库区
---
jeecg-boot-master/ant-design-vue-jeecg/.env.development | 2 +-
jeecg-boot-master/ant-design-vue-jeecg/.env.production | 2 +-
jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalFooter.vue | 30 +++++++++++++++---------------
jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue | 4 ++--
jeecg-boot-master/ant-design-vue-jeecg/src/utils/request.js | 2 +-
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.Style#Drawer.vue | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/WarehouseForm.vue | 74 +++++++++++++++-----------------------------------------------------------
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.Style#Drawer.vue | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/PasswordModal.vue | 6 +-----
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue | 4 ++--
jeecg-boot-master/ant-design-vue-jeecg/src/views/user/alteration/Step3.vue | 2 +-
jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java | 38 +++++++++++++++++++-------------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/controller/WarehouseController.java | 171 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/entity/Warehouse.java | 114 ------------------------------------------------------------------------------------------------------------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/WarehouseMapper.java | 17 -----------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/xml/WarehouseMapper.xml | 5 -----
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/IWarehouseService.java | 14 --------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/impl/WarehouseServiceImpl.java | 19 -------------------
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/CompanyMapper.java | 17 +++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/xml/CompanyMapper.xml | 5 +++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java | 14 ++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java | 19 +++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/WarehouseMapper.java | 17 +++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/xml/WarehouseMapper.xml | 5 +++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/IWarehouseService.java | 14 ++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/impl/WarehouseServiceImpl.java | 19 +++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/ZoneMapper.java | 17 +++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/xml/ZoneMapper.xml | 5 +++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java | 14 ++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java | 19 +++++++++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml | 2 +-
44 files changed, 2139 insertions(+), 507 deletions(-)
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.Style#Drawer.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.Style#Drawer.vue
create mode 100644 jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.vue
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/controller/WarehouseController.java
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/entity/Warehouse.java
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/WarehouseMapper.java
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/xml/WarehouseMapper.xml
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/IWarehouseService.java
delete mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/impl/WarehouseServiceImpl.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/CompanyMapper.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/xml/CompanyMapper.xml
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/WarehouseMapper.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/xml/WarehouseMapper.xml
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/IWarehouseService.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/impl/WarehouseServiceImpl.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/ZoneMapper.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/xml/ZoneMapper.xml
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/.env.development b/jeecg-boot-master/ant-design-vue-jeecg/.env.development
index c9c6c75..310b607 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/.env.development
+++ b/jeecg-boot-master/ant-design-vue-jeecg/.env.development
@@ -1,5 +1,5 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot
+VUE_APP_API_BASE_URL=http://localhost:8080/wms
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/.env.production b/jeecg-boot-master/ant-design-vue-jeecg/.env.production
index 530cebc..37f58ea 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/.env.production
+++ b/jeecg-boot-master/ant-design-vue-jeecg/.env.production
@@ -1,4 +1,4 @@
NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot
+VUE_APP_API_BASE_URL=http://localhost:8080/wms
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalFooter.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
index 8f4d09e..8ab9868 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
@@ -1,19 +1,19 @@
<template>
- <div class="footer">
- <div class="links">
- <a href="http://www.jeecg.com" target="_blank">JEECG 首页</a>
- <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">
- <a-icon type="github"/>
- </a>
- <a href="https://ant.design/">Ant Design</a>
- <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
- </div>
- <div class="copyright">
- Copyright
- <a-icon type="copyright"/>
- 2019 <span>JEECG开源社区 出品</span>
- </div>
- </div>
+<!-- <div class="footer">-->
+<!-- <div class="links">-->
+<!-- <a href="http://www.jeecg.com" target="_blank">JEECG 首页</a>-->
+<!-- <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">-->
+<!-- <a-icon type="github"/>-->
+<!-- </a>-->
+<!-- <a href="https://ant.design/">Ant Design</a>-->
+<!-- <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>-->
+<!-- </div>-->
+<!-- <div class="copyright">-->
+<!-- Copyright-->
+<!-- <a-icon type="copyright"/>-->
+<!-- 2019 <span>JEECG开源社区 出品</span>-->
+<!-- </div>-->
+<!-- </div>-->
</template>
<script>
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
index 1d78e12..66dd6e9 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@@ -134,11 +134,11 @@
//--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
//this.menus = this.mainRouters.find((item) => item.path === '/').children;
this.menus = this.permissionMenuList
-
+
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
this.collapsed=!this.sidebarOpened;
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
-
+
// 根据后台配置菜单，重新排序加载路由信息
//console.log('----加载菜单逻辑----')
//console.log(this.mainRouters)
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/utils/request.js b/jeecg-boot-master/ant-design-vue-jeecg/src/utils/request.js
index f7ea2fe..59591c1 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/utils/request.js
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/utils/request.js
@@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
const service = axios.create({
//baseURL: '/jeecg-boot',
baseURL: apiBaseUrl, // api base_url
- timeout: 9000 // 请求超时时间
+ timeout: 10 * 1000 // 请求超时时间
})
const err = (error) => {
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
new file mode 100644
index 0000000..4b7c5cc
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
@@ -0,0 +1,258 @@
+<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.code"></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.name"></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.warehousecode"></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>
+
+ <company-modal ref="modalForm" @ok="modalFormOk"></company-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import CompanyModal from './modules/CompanyModal'
+
+ export default {
+ name: 'CompanyList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ CompanyModal
+ },
+ 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: 'code'
+ },
+ {
+ title:'货主名称',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title:'仓库编码',
+ align:"center",
+ dataIndex: 'warehousecode'
+ },
+ {
+ title:'地址',
+ align:"center",
+ dataIndex: 'address'
+ },
+ {
+ title:'区县',
+ align:"center",
+ dataIndex: 'district'
+ },
+ {
+ title:'城市',
+ align:"center",
+ dataIndex: 'city'
+ },
+ {
+ title:'省份',
+ align:"center",
+ dataIndex: 'province'
+ },
+ {
+ title:'国家',
+ align:"center",
+ dataIndex: 'country'
+ },
+ {
+ title:'邮编',
+ align:"center",
+ dataIndex: 'postalcode'
+ },
+ {
+ title:'联系人',
+ align:"center",
+ dataIndex: 'attentionto'
+ },
+ {
+ title:'联系电话',
+ align:"center",
+ dataIndex: 'phonenum'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/config/company/list",
+ delete: "/config/company/delete",
+ deleteBatch: "/config/company/deleteBatch",
+ exportXlsUrl: "/config/company/exportXls",
+ importExcelUrl: "config/company/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:'code',text:'货主编码',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'货主名称',dictCode:''})
+ fieldList.push({type:'string',value:'warehousecode',text:'仓库编码',dictCode:''})
+ fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+ fieldList.push({type:'string',value:'district',text:'区县',dictCode:''})
+ fieldList.push({type:'string',value:'city',text:'城市',dictCode:''})
+ fieldList.push({type:'string',value:'province',text:'省份',dictCode:''})
+ fieldList.push({type:'string',value:'country',text:'国家',dictCode:''})
+ fieldList.push({type:'string',value:'postalcode',text:'邮编',dictCode:''})
+ fieldList.push({type:'string',value:'attentionto',text:'联系人',dictCode:''})
+ fieldList.push({type:'string',value:'phonenum',text:'联系电话',dictCode:''})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
index f76d0ca..f6dfc41 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
@@ -4,6 +4,33 @@
<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.code"></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.name"></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="可用状态">
+ <j-dict-select-tag placeholder="请选择可用状态" v-model="queryParam.enable" dictCode="enable_status"/>
+ </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>
@@ -99,6 +126,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import WarehouseModal from './modules/WarehouseModal'
+ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'WarehouseList',
@@ -122,34 +150,24 @@
}
},
{
- title:'创建人',
- align:"center",
- dataIndex: 'createBy'
- },
- {
- title:'创建日期',
- align:"center",
- dataIndex: 'createTime'
- },
- {
- title:'更新人',
+ title:'仓库编码',
align:"center",
- dataIndex: 'updateBy'
+ dataIndex: 'code'
},
{
- title:'更新日期',
+ title:'名称',
align:"center",
- dataIndex: 'updateTime'
+ dataIndex: 'name'
},
{
- title:'仓库编码',
+ title:'地址',
align:"center",
- dataIndex: 'code'
+ dataIndex: 'address'
},
{
- title:'地址',
+ title:'区/县',
align:"center",
- dataIndex: 'address'
+ dataIndex: 'district'
},
{
title:'城市',
@@ -162,21 +180,11 @@
dataIndex: 'state'
},
{
- title:'区/县',
- align:"center",
- dataIndex: 'district'
- },
- {
title:'国家',
align:"center",
dataIndex: 'country'
},
{
- title:'邮编',
- align:"center",
- dataIndex: 'postalcode'
- },
- {
title:'联系人',
align:"center",
dataIndex: 'attentionto'
@@ -187,39 +195,29 @@
dataIndex: 'phonenum'
},
{
- title:'传真号',
- align:"center",
- dataIndex: 'faxnum'
- },
- {
- title:'名称',
- align:"center",
- dataIndex: 'name'
- },
- {
title:'可用状态',
align:"center",
- dataIndex: 'enable'
+ dataIndex: 'enable_dictText'
},
{
- title:'删除标记',
+ title:'创建人',
align:"center",
- dataIndex: 'deleted'
+ dataIndex: 'createBy'
},
{
- title:'自定义字段1',
+ title:'创建日期',
align:"center",
- dataIndex: 'userdef1'
+ dataIndex: 'createTime'
},
{
- title:'自定义字段2',
+ title:'更新人',
align:"center",
- dataIndex: 'userdef2'
+ dataIndex: 'updateBy'
},
{
- title:'自定义字段3',
+ title:'更新时间',
align:"center",
- dataIndex: 'userdef3'
+ dataIndex: 'updateTime'
},
{
title: '操作',
@@ -255,26 +253,20 @@
},
getSuperFieldList(){
let fieldList=[];
- 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:'更新日期'})
fieldList.push({type:'string',value:'code',text:'仓库编码',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+ fieldList.push({type:'string',value:'district',text:'区/县',dictCode:''})
fieldList.push({type:'string',value:'city',text:'城市',dictCode:''})
fieldList.push({type:'string',value:'state',text:'省份',dictCode:''})
- fieldList.push({type:'string',value:'district',text:'区/县',dictCode:''})
fieldList.push({type:'string',value:'country',text:'国家',dictCode:''})
- fieldList.push({type:'string',value:'postalcode',text:'邮编',dictCode:''})
fieldList.push({type:'string',value:'attentionto',text:'联系人',dictCode:''})
fieldList.push({type:'string',value:'phonenum',text:'联系电话',dictCode:''})
- fieldList.push({type:'string',value:'faxnum',text:'传真号',dictCode:''})
- fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
- fieldList.push({type:'int',value:'enable',text:'可用状态',dictCode:''})
- fieldList.push({type:'int',value:'deleted',text:'删除标记',dictCode:''})
- fieldList.push({type:'string',value:'userdef1',text:'自定义字段1',dictCode:''})
- fieldList.push({type:'string',value:'userdef2',text:'自定义字段2',dictCode:''})
- fieldList.push({type:'string',value:'userdef3',text:'自定义字段3',dictCode:''})
+ fieldList.push({type:'int',value:'enable',text:'可用状态',dictCode:'enable_status'})
+ 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
}
}
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
new file mode 100644
index 0000000..3ac8561
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
@@ -0,0 +1,233 @@
+<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.code"></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.name"></a-input>
+ </a-form-item>
+ </a-col>
+ <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>
+
+ <zone-modal ref="modalForm" @ok="modalFormOk"></zone-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import ZoneModal from './modules/ZoneModal'
+
+ export default {
+ name: 'ZoneList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ ZoneModal
+ },
+ 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: 'code'
+ },
+ {
+ title:'名称',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title:'仓库编码',
+ align:"center",
+ dataIndex: 'warehousecode'
+ },
+ {
+ title:'货主编码',
+ align:"center",
+ dataIndex: 'companycode'
+ },
+ {
+ 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: "/config/zone/list",
+ delete: "/config/zone/delete",
+ deleteBatch: "/config/zone/deleteBatch",
+ exportXlsUrl: "/config/zone/exportXls",
+ importExcelUrl: "config/zone/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:'code',text:'编码',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+ fieldList.push({type:'string',value:'warehousecode',text:'仓库编码',dictCode:''})
+ fieldList.push({type:'string',value:'companycode',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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
new file mode 100644
index 0000000..325eece
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
@@ -0,0 +1,163 @@
+<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="code">
+ <a-input v-model="model.code" placeholder="请输入货主编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="货主名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+ <a-input v-model="model.name" placeholder="请输入货主名称" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehousecode">
+ <a-input v-model="model.warehousecode" placeholder="请输入仓库编码" ></a-input>
+ </a-form-model-item>
+ </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="district">
+ <a-input v-model="model.district" placeholder="请输入区县" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="city">
+ <a-input v-model="model.city" placeholder="请输入城市" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="province">
+ <a-input v-model="model.province" placeholder="请输入省份" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="国家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="country">
+ <a-input v-model="model.country" placeholder="请输入国家" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postalcode">
+ <a-input v-model="model.postalcode" placeholder="请输入邮编" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="attentionto">
+ <a-input v-model="model.attentionto" placeholder="请输入联系人" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phonenum">
+ <a-input v-model="model.phonenum" 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: 'CompanyForm',
+ 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: {
+ code: [
+ { required: true, message: '请输入货主编码!'},
+ ],
+ name: [
+ { required: true, message: '请输入货主名称!'},
+ ],
+ warehousecode: [
+ { required: true, message: '请输入仓库编码!'},
+ ],
+ },
+ url: {
+ add: "/config/company/add",
+ edit: "/config/company/edit",
+ queryById: "/config/company/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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.Style#Drawer.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.Style#Drawer.vue
new file mode 100644
index 0000000..3cef931
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ destroyOnClose
+ :visible="visible">
+ <company-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></company-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 CompanyForm from './CompanyForm'
+
+ export default {
+ name: 'CompanyModal',
+ components: {
+ CompanyForm
+ },
+ 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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.vue
new file mode 100644
index 0000000..7c82d1a
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyModal.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="关闭">
+ <company-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></company-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import CompanyForm from './CompanyForm'
+ export default {
+ name: 'CompanyModal',
+ components: {
+ CompanyForm
+ },
+ 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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/WarehouseForm.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/WarehouseForm.vue
index 643e7c4..39fd95c 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/WarehouseForm.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/WarehouseForm.vue
@@ -4,33 +4,23 @@
<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="createBy">
- <a-input v-model="model.createBy" placeholder="请输入创建人" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
- <j-date placeholder="请选择创建日期" v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="更新人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateBy">
- <a-input v-model="model.updateBy" placeholder="请输入更新人" ></a-input>
+ <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+ <a-input v-model="model.code" placeholder="请输入仓库编码" ></a-input>
</a-form-model-item>
</a-col>
<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%" />
+ <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+ <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
- <a-input v-model="model.code" placeholder="请输入仓库编码" ></a-input>
+ <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="address">
- <a-input v-model="model.address" placeholder="请输入地址" ></a-input>
+ <a-form-model-item label="区/县" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="district">
+ <a-input v-model="model.district" placeholder="请输入区/县" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
@@ -44,21 +34,11 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="区/县" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="district">
- <a-input v-model="model.district" placeholder="请输入区/县" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
<a-form-model-item label="国家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="country">
<a-input v-model="model.country" placeholder="请输入国家" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postalcode">
- <a-input v-model="model.postalcode" placeholder="请输入邮编" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
<a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="attentionto">
<a-input v-model="model.attentionto" placeholder="请输入联系人" ></a-input>
</a-form-model-item>
@@ -69,38 +49,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="传真号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faxnum">
- <a-input v-model="model.faxnum" placeholder="请输入传真号" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
- <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
<a-form-model-item label="可用状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enable">
- <a-input-number v-model="model.enable" placeholder="请输入可用状态" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="删除标记" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deleted">
- <a-input-number v-model="model.deleted" placeholder="请输入删除标记" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="自定义字段1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userdef1">
- <a-input v-model="model.userdef1" placeholder="请输入自定义字段1" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="自定义字段2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userdef2">
- <a-input v-model="model.userdef2" placeholder="请输入自定义字段2" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="自定义字段3" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userdef3">
- <a-input v-model="model.userdef3" placeholder="请输入自定义字段3" ></a-input>
+ <j-dict-select-tag type="list" v-model="model.enable" dictCode="enable_status" placeholder="请选择可用状态" />
</a-form-model-item>
</a-col>
</a-row>
@@ -143,6 +93,12 @@
code: [
{ required: true, message: '请输入仓库编码!'},
],
+ name: [
+ { required: true, message: '请输入名称!'},
+ ],
+ enable: [
+ { required: true, message: '请输入可用状态!'},
+ ],
},
url: {
add: "/config/warehouse/add",
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue
new file mode 100644
index 0000000..c2a87a2
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue
@@ -0,0 +1,125 @@
+<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="code">
+ <a-input v-model="model.code" placeholder="请输入编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+ <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehousecode">
+ <a-input v-model="model.warehousecode" placeholder="请输入仓库编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <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-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: 'ZoneForm',
+ 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: {
+ code: [
+ { required: true, message: '请输入编码!'},
+ ],
+ name: [
+ { required: true, message: '请输入名称!'},
+ ],
+ },
+ url: {
+ add: "/config/zone/add",
+ edit: "/config/zone/edit",
+ queryById: "/config/zone/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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.Style#Drawer.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.Style#Drawer.vue
new file mode 100644
index 0000000..2488e6a
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ destroyOnClose
+ :visible="visible">
+ <zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zone-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 ZoneForm from './ZoneForm'
+
+ export default {
+ name: 'ZoneModal',
+ components: {
+ ZoneForm
+ },
+ 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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.vue
new file mode 100644
index 0000000..85a1c3c
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ZoneModal.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="关闭">
+ <zone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zone-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import ZoneForm from './ZoneForm'
+ export default {
+ name: 'ZoneModal',
+ components: {
+ ZoneForm
+ },
+ 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/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/PasswordModal.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/PasswordModal.vue
index f9f897e..de55231 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/PasswordModal.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/PasswordModal.vue
@@ -41,11 +41,7 @@
confirmDirty: false,
validatorRules:{
password:{
- rules: [{
- required: true,
- pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '密码由8位数字、大小写字母和特殊符号组成!'
- }, {
+ rules: [ {
validator: this.validateToNextPassword,
}],
},
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
index 404be5d..62f30f4 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
@@ -47,7 +47,7 @@
<a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input placeholder="请输入手机号码" v-model="model.phone" />
</a-form-model-item>
-
+
<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
</a-form-model-item>
@@ -163,7 +163,7 @@
validatorRules:{
username:[{required: true, message: '请输入用户账号!'},
{validator: this.validateUsername,}],
- password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+ password: [
{validator: this.validateToNextPassword,trigger: 'change'}],
confirmpassword: [{required: true, message: '请重新输入登录密码!',},
{ validator: this.compareToFirstPassword,}],
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/alteration/Step3.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/alteration/Step3.vue
index 735d398..c2022d8 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/alteration/Step3.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/alteration/Step3.vue
@@ -41,7 +41,7 @@
accountName: this.userList.username,
validatorRules: {
password: [{
- required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!!'
+ required: false, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!!'
}],
confirmPassword: [
{ required: true, message: '密码不能为空!'},
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
index a53929c..905310d 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -26,7 +26,7 @@ public interface CommonConstant {
* 系统日志类型： 登录
*/
public static final int LOG_TYPE_1 = 1;
-
+
/**
* 系统日志类型： 操作
*/
@@ -36,38 +36,38 @@ public interface CommonConstant {
* 操作日志类型： 查询
*/
public static final int OPERATE_TYPE_1 = 1;
-
+
/**
* 操作日志类型： 添加
*/
public static final int OPERATE_TYPE_2 = 2;
-
+
/**
* 操作日志类型： 更新
*/
public static final int OPERATE_TYPE_3 = 3;
-
+
/**
* 操作日志类型： 删除
*/
public static final int OPERATE_TYPE_4 = 4;
-
+
/**
* 操作日志类型： 倒入
*/
public static final int OPERATE_TYPE_5 = 5;
-
+
/**
* 操作日志类型： 导出
*/
public static final int OPERATE_TYPE_6 = 6;
-
-
+
+
/** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
/** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
public static final Integer SC_OK_200 = 200;
-
+
/**访问权限认证未通过 510*/
public static final Integer SC_JEECG_NO_AUTHZ=510;
@@ -76,7 +76,7 @@ public interface CommonConstant {
/** 登录用户Token令牌缓存KEY前缀 */
public static final String PREFIX_USER_TOKEN = "prefix_user_token_";
/** Token缓存时间：3600秒即一小时 */
- public static final int TOKEN_EXPIRE_TIME = 3600;
+ public static final int TOKEN_EXPIRE_TIME = -1;
/** 登录二维码 */
public static final String LOGIN_QRCODE_PRE = "QRCODELOGIN:";
@@ -90,7 +90,7 @@ public interface CommonConstant {
*/
public static final Integer MENU_TYPE_0 = 0;
/**
- * 1：子菜单
+ * 1：子菜单
*/
public static final Integer MENU_TYPE_1 = 1;
/**
@@ -101,34 +101,34 @@ public interface CommonConstant {
/**通告对象类型（USER:指定用户，ALL:全体用户）*/
public static final String MSG_TYPE_UESR = "USER";
public static final String MSG_TYPE_ALL = "ALL";
-
+
/**发布状态（0未发布，1已发布，2已撤销）*/
public static final String NO_SEND = "0";
public static final String HAS_SEND = "1";
public static final String HAS_CANCLE = "2";
-
+
/**阅读状态（0未读，1已读）*/
public static final String HAS_READ_FLAG = "1";
public static final String NO_READ_FLAG = "0";
-
+
/**优先级（L低，M中，H高）*/
public static final String PRIORITY_L = "L";
public static final String PRIORITY_M = "M";
public static final String PRIORITY_H = "H";
-
+
/**
* 短信模板方式 0 .登录模板、1.注册模板、2.忘记密码模板
*/
public static final String SMS_TPL_TYPE_0 = "0";
public static final String SMS_TPL_TYPE_1 = "1";
public static final String SMS_TPL_TYPE_2 = "2";
-
+
/**
* 状态(0无效1有效)
*/
public static final String STATUS_0 = "0";
public static final String STATUS_1 = "1";
-
+
/**
* 同步工作流引擎1同步0不同步
*/
@@ -140,7 +140,7 @@ public interface CommonConstant {
*/
public static final String MSG_CATEGORY_1 = "1";
public static final String MSG_CATEGORY_2 = "2";
-
+
/**
* 是否配置菜单的数据权限 1是0否
*/
@@ -152,7 +152,7 @@ public interface CommonConstant {
*/
public static final Integer USER_UNFREEZE = 1;
public static final Integer USER_FREEZE = 2;
-
+
/**字典翻译文本后缀*/
public static final String DICT_TEXT_SUFFIX = "_dictText";
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/controller/WarehouseController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/controller/WarehouseController.java
deleted file mode 100644
index 0d68bbe..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/controller/WarehouseController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.system.config.warehouse.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 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.system.config.warehouse.entity.Warehouse;
-import org.jeecg.modules.system.config.warehouse.service.IWarehouseService;
-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: 2022-10-12
- * @Version: V1.0
- */
-@Api(tags="仓库")
-@RestController
-@RequestMapping("/config/warehouse")
-@Slf4j
-public class WarehouseController extends JeecgController<Warehouse, IWarehouseService> {
- @Autowired
- private IWarehouseService warehouseService;
-
- /**
- * 分页列表查询
- *
- * @param warehouse
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "仓库-分页列表查询")
- @ApiOperation(value="仓库-分页列表查询", notes="仓库-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<Warehouse>> queryPageList(Warehouse warehouse,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
- Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
- IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 添加
- *
- * @param warehouse
- * @return
- */
- @AutoLog(value = "仓库-添加")
- @ApiOperation(value="仓库-添加", notes="仓库-添加")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Warehouse warehouse) {
- warehouseService.save(warehouse);
- return Result.OK("添加成功！");
- }
-
- /**
- * 编辑
- *
- * @param warehouse
- * @return
- */
- @AutoLog(value = "仓库-编辑")
- @ApiOperation(value="仓库-编辑", notes="仓库-编辑")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Warehouse warehouse) {
- warehouseService.updateById(warehouse);
- 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) {
- warehouseService.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.warehouseService.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<Warehouse> queryById(@RequestParam(name="id",required=true) String id) {
- Warehouse warehouse = warehouseService.getById(id);
- if(warehouse==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(warehouse);
- }
-
- /**
- * 导出excel
- *
- * @param request
- * @param warehouse
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Warehouse warehouse) {
- return super.exportXls(request, warehouse, Warehouse.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, Warehouse.class);
- }
-
-}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/entity/Warehouse.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/entity/Warehouse.java
deleted file mode 100644
index 18423f2..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/entity/Warehouse.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.jeecg.modules.system.config.warehouse.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: 2022-10-12
- * @Version: V1.0
- */
-@Data
-@TableName("warehouse")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="warehouse对象", description="仓库")
-public class Warehouse implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**主键*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "主键")
- private String id;
- /**创建人*/
- @ApiModelProperty(value = "创建人")
- private String createBy;
- /**创建日期*/
- @ApiModelProperty(value = "创建日期")
- private Date createTime;
- /**更新人*/
- @ApiModelProperty(value = "更新人")
- private String updateBy;
- /**更新日期*/
- @ApiModelProperty(value = "更新日期")
- private Date updateTime;
- /**仓库编码*/
- @Excel(name = "仓库编码", width = 15)
- @ApiModelProperty(value = "仓库编码")
- private String code;
- /**地址*/
- @Excel(name = "地址", width = 15)
- @ApiModelProperty(value = "地址")
- private String address;
- /**城市*/
- @Excel(name = "城市", width = 15)
- @ApiModelProperty(value = "城市")
- private String city;
- /**省份*/
- @Excel(name = "省份", width = 15)
- @ApiModelProperty(value = "省份")
- private String state;
- /**区/县*/
- @Excel(name = "区/县", width = 15)
- @ApiModelProperty(value = "区/县")
- private String district;
- /**国家*/
- @Excel(name = "国家", width = 15)
- @ApiModelProperty(value = "国家")
- private String country;
- /**邮编*/
- @Excel(name = "邮编", width = 15)
- @ApiModelProperty(value = "邮编")
- private String postalcode;
- /**联系人*/
- @Excel(name = "联系人", width = 15)
- @ApiModelProperty(value = "联系人")
- private String attentionto;
- /**联系电话*/
- @Excel(name = "联系电话", width = 15)
- @ApiModelProperty(value = "联系电话")
- private String phonenum;
- /**传真号*/
- @Excel(name = "传真号", width = 15)
- @ApiModelProperty(value = "传真号")
- private String faxnum;
- /**名称*/
- @Excel(name = "名称", width = 15)
- @ApiModelProperty(value = "名称")
- private String name;
- /**可用状态*/
- @Excel(name = "可用状态", width = 15)
- @ApiModelProperty(value = "可用状态")
- private Integer enable;
- /**删除标记*/
- @Excel(name = "删除标记", width = 15)
- @ApiModelProperty(value = "删除标记")
- private Integer deleted;
- /**自定义字段1*/
- @Excel(name = "自定义字段1", width = 15)
- @ApiModelProperty(value = "自定义字段1")
- private String userdef1;
- /**自定义字段2*/
- @Excel(name = "自定义字段2", width = 15)
- @ApiModelProperty(value = "自定义字段2")
- private String userdef2;
- /**自定义字段3*/
- @Excel(name = "自定义字段3", width = 15)
- @ApiModelProperty(value = "自定义字段3")
- private String userdef3;
-}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/WarehouseMapper.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/WarehouseMapper.java
deleted file mode 100644
index 3909608..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/WarehouseMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.system.config.warehouse.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.config.warehouse.entity.Warehouse;
-
-/**
- * @Description: 仓库
- * @Author: jeecg-boot
- * @Date: 2022-10-12
- * @Version: V1.0
- */
-public interface WarehouseMapper extends BaseMapper<Warehouse> {
-
-}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/xml/WarehouseMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/xml/WarehouseMapper.xml
deleted file mode 100644
index 7277a26..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/mapper/xml/WarehouseMapper.xml
+++ /dev/null
@@ -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.system.config.warehouse.mapper.WarehouseMapper">
-
-</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/IWarehouseService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/IWarehouseService.java
deleted file mode 100644
index 8e4a1d2..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/IWarehouseService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.system.config.warehouse.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.config.warehouse.entity.Warehouse;
-
-/**
- * @Description: 仓库
- * @Author: jeecg-boot
- * @Date: 2022-10-12
- * @Version: V1.0
- */
-public interface IWarehouseService extends IService<Warehouse> {
-
-}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/impl/WarehouseServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/impl/WarehouseServiceImpl.java
deleted file mode 100644
index e42632c..0000000
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/config/warehouse/service/impl/WarehouseServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.system.config.warehouse.service.impl;
-
-import org.jeecg.modules.system.config.warehouse.entity.Warehouse;
-import org.jeecg.modules.system.config.warehouse.mapper.WarehouseMapper;
-import org.jeecg.modules.system.config.warehouse.service.IWarehouseService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 仓库
- * @Author: jeecg-boot
- * @Date: 2022-10-12
- * @Version: V1.0
- */
-@Service
-public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService {
-
-}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
new file mode 100644
index 0000000..7d5ae38
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.wms.config.company.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 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.wms.config.company.entity.Company;
+import org.jeecg.modules.wms.config.company.service.ICompanyService;
+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: 2022-10-13
+ * @Version: V1.0
+ */
+@Api(tags="货主")
+@RestController
+@RequestMapping("/config/company")
+@Slf4j
+public class CompanyController extends JeecgController<Company, ICompanyService> {
+ @Autowired
+ private ICompanyService companyService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param company
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "货主-分页列表查询")
+ @ApiOperation(value="货主-分页列表查询", notes="货主-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<Company>> queryPageList(Company company,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Company> queryWrapper = QueryGenerator.initQueryWrapper(company, req.getParameterMap());
+ Page<Company> page = new Page<Company>(pageNo, pageSize);
+ IPage<Company> pageList = companyService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param company
+ * @return
+ */
+ @AutoLog(value = "货主-添加")
+ @ApiOperation(value="货主-添加", notes="货主-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Company company) {
+ companyService.save(company);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param company
+ * @return
+ */
+ @AutoLog(value = "货主-编辑")
+ @ApiOperation(value="货主-编辑", notes="货主-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Company company) {
+ companyService.updateById(company);
+ 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) {
+ companyService.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.companyService.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<Company> queryById(@RequestParam(name="id",required=true) String id) {
+ Company company = companyService.getById(id);
+ if(company==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(company);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param company
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Company company) {
+ return super.exportXls(request, company, Company.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, Company.class);
+ }
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
new file mode 100644
index 0000000..afc12ce
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
@@ -0,0 +1,94 @@
+package org.jeecg.modules.wms.config.company.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: 2022-10-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("company")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="company对象", description="货主")
+public class Company implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**货主编码*/
+ @Excel(name = "货主编码", width = 15)
+ @ApiModelProperty(value = "货主编码")
+ private String code;
+ /**货主名称*/
+ @Excel(name = "货主名称", width = 15)
+ @ApiModelProperty(value = "货主名称")
+ private String name;
+ /**仓库代码*/
+ @Excel(name = "仓库代码", width = 15)
+ @ApiModelProperty(value = "仓库代码")
+ private String warehousecode;
+ /**地址*/
+ @Excel(name = "地址", width = 15)
+ @ApiModelProperty(value = "地址")
+ private String address;
+ /**区县*/
+ @Excel(name = "区县", width = 15)
+ @ApiModelProperty(value = "区县")
+ private String district;
+ /**城市*/
+ @Excel(name = "城市", width = 15)
+ @ApiModelProperty(value = "城市")
+ private String city;
+ /**省份*/
+ @Excel(name = "省份", width = 15)
+ @ApiModelProperty(value = "省份")
+ private String province;
+ /**国家*/
+ @Excel(name = "国家", width = 15)
+ @ApiModelProperty(value = "国家")
+ private String country;
+ /**邮编*/
+ @Excel(name = "邮编", width = 15)
+ @ApiModelProperty(value = "邮编")
+ private String postalcode;
+ /**联系人*/
+ @Excel(name = "联系人", width = 15)
+ @ApiModelProperty(value = "联系人")
+ private String attentionto;
+ /**联系电话*/
+ @Excel(name = "联系电话", width = 15)
+ @ApiModelProperty(value = "联系电话")
+ private String phonenum;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/CompanyMapper.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/CompanyMapper.java
new file mode 100644
index 0000000..8f13a98
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/CompanyMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.wms.config.company.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.wms.config.company.entity.Company;
+
+/**
+ * @Description: 货主
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface CompanyMapper extends BaseMapper<Company> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/xml/CompanyMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/xml/CompanyMapper.xml
new file mode 100644
index 0000000..604509b
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/mapper/xml/CompanyMapper.xml
@@ -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="org.jeecg.modules.wms.config.company.mapper.CompanyMapper">
+
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java
new file mode 100644
index 0000000..18b38e2
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.wms.config.company.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wms.config.company.entity.Company;
+
+/**
+ * @Description: 货主
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface ICompanyService extends IService<Company> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java
new file mode 100644
index 0000000..ea002d2
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.wms.config.company.service.impl;
+
+import org.jeecg.modules.wms.config.company.entity.Company;
+import org.jeecg.modules.wms.config.company.mapper.CompanyMapper;
+import org.jeecg.modules.wms.config.company.service.ICompanyService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 货主
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+@Service
+public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java
new file mode 100644
index 0000000..069c913
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.wms.config.warehouse.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 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.wms.config.warehouse.entity.Warehouse;
+import org.jeecg.modules.wms.config.warehouse.service.IWarehouseService;
+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: 2022-10-13
+ * @Version: V1.0
+ */
+@Api(tags="仓库")
+@RestController
+@RequestMapping("/config/warehouse")
+@Slf4j
+public class WarehouseController extends JeecgController<Warehouse, IWarehouseService> {
+ @Autowired
+ private IWarehouseService warehouseService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param warehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "仓库-分页列表查询")
+ @ApiOperation(value="仓库-分页列表查询", notes="仓库-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<Warehouse>> queryPageList(Warehouse warehouse,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
+ Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
+ IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param warehouse
+ * @return
+ */
+ @AutoLog(value = "仓库-添加")
+ @ApiOperation(value="仓库-添加", notes="仓库-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Warehouse warehouse) {
+ warehouseService.save(warehouse);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param warehouse
+ * @return
+ */
+ @AutoLog(value = "仓库-编辑")
+ @ApiOperation(value="仓库-编辑", notes="仓库-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Warehouse warehouse) {
+ warehouseService.updateById(warehouse);
+ 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) {
+ warehouseService.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.warehouseService.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<Warehouse> queryById(@RequestParam(name="id",required=true) String id) {
+ Warehouse warehouse = warehouseService.getById(id);
+ if(warehouse==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(warehouse);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param warehouse
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Warehouse warehouse) {
+ return super.exportXls(request, warehouse, Warehouse.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, Warehouse.class);
+ }
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java
new file mode 100644
index 0000000..5751ef8
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java
@@ -0,0 +1,111 @@
+package org.jeecg.modules.wms.config.warehouse.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: 2022-10-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("warehouse")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="warehouse对象", description="仓库")
+public class Warehouse implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**仓库编码*/
+ @Excel(name = "仓库编码", width = 15)
+ @ApiModelProperty(value = "仓库编码")
+ private String code;
+ /**名称*/
+ @Excel(name = "名称", width = 15)
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**地址*/
+ @Excel(name = "地址", width = 15)
+ @ApiModelProperty(value = "地址")
+ private String address;
+ /**区/县*/
+ @Excel(name = "区/县", width = 15)
+ @ApiModelProperty(value = "区/县")
+ private String district;
+ /**城市*/
+ @Excel(name = "城市", width = 15)
+ @ApiModelProperty(value = "城市")
+ private String city;
+ /**省份*/
+ @Excel(name = "省份", width = 15)
+ @ApiModelProperty(value = "省份")
+ private String state;
+ /**国家*/
+ @Excel(name = "国家", width = 15)
+ @ApiModelProperty(value = "国家")
+ private String country;
+ /**邮编*/
+ @Excel(name = "邮编", width = 15)
+ @ApiModelProperty(value = "邮编")
+ private String postalcode;
+ /**联系人*/
+ @Excel(name = "联系人", width = 15)
+ @ApiModelProperty(value = "联系人")
+ private String attentionto;
+ /**联系电话*/
+ @Excel(name = "联系电话", width = 15)
+ @ApiModelProperty(value = "联系电话")
+ private String phonenum;
+ /**传真号*/
+ @Excel(name = "传真号", width = 15)
+ @ApiModelProperty(value = "传真号")
+ private String faxnum;
+ /**可用状态*/
+ @Excel(name = "可用状态", width = 15, dicCode = "enable_status")
+ @Dict(dicCode = "enable_status")
+ @ApiModelProperty(value = "可用状态")
+ private Integer enable;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新时间*/
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**自定义字段1*/
+ @Excel(name = "自定义字段1", width = 15)
+ @ApiModelProperty(value = "自定义字段1")
+ private String userdef1;
+ /**自定义字段2*/
+ @Excel(name = "自定义字段2", width = 15)
+ @ApiModelProperty(value = "自定义字段2")
+ private String userdef2;
+ /**自定义字段3*/
+ @Excel(name = "自定义字段3", width = 15)
+ @ApiModelProperty(value = "自定义字段3")
+ private String userdef3;
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/WarehouseMapper.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/WarehouseMapper.java
new file mode 100644
index 0000000..71ff463
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/WarehouseMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.wms.config.warehouse.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.wms.config.warehouse.entity.Warehouse;
+
+/**
+ * @Description: 仓库
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/xml/WarehouseMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/xml/WarehouseMapper.xml
new file mode 100644
index 0000000..5ee6867
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/mapper/xml/WarehouseMapper.xml
@@ -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="org.jeecg.modules.wms.config.warehouse.mapper.WarehouseMapper">
+
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/IWarehouseService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/IWarehouseService.java
new file mode 100644
index 0000000..719cd19
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/IWarehouseService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.wms.config.warehouse.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wms.config.warehouse.entity.Warehouse;
+
+/**
+ * @Description: 仓库
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface IWarehouseService extends IService<Warehouse> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/impl/WarehouseServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/impl/WarehouseServiceImpl.java
new file mode 100644
index 0000000..f835e6d
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/service/impl/WarehouseServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.wms.config.warehouse.service.impl;
+
+import org.jeecg.modules.wms.config.warehouse.entity.Warehouse;
+import org.jeecg.modules.wms.config.warehouse.mapper.WarehouseMapper;
+import org.jeecg.modules.wms.config.warehouse.service.IWarehouseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 仓库
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+@Service
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
new file mode 100644
index 0000000..c32359f
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.wms.config.zone.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 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.wms.config.zone.entity.Zone;
+import org.jeecg.modules.wms.config.zone.service.IZoneService;
+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: 2022-10-13
+ * @Version: V1.0
+ */
+@Api(tags="库区管理")
+@RestController
+@RequestMapping("/config/zone")
+@Slf4j
+public class ZoneController extends JeecgController<Zone, IZoneService> {
+ @Autowired
+ private IZoneService zoneService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zone
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "库区管理-分页列表查询")
+ @ApiOperation(value="库区管理-分页列表查询", notes="库区管理-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<Zone>> queryPageList(Zone zone,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Zone> queryWrapper = QueryGenerator.initQueryWrapper(zone, req.getParameterMap());
+ Page<Zone> page = new Page<Zone>(pageNo, pageSize);
+ IPage<Zone> pageList = zoneService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zone
+ * @return
+ */
+ @AutoLog(value = "库区管理-添加")
+ @ApiOperation(value="库区管理-添加", notes="库区管理-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Zone zone) {
+ zoneService.save(zone);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zone
+ * @return
+ */
+ @AutoLog(value = "库区管理-编辑")
+ @ApiOperation(value="库区管理-编辑", notes="库区管理-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Zone zone) {
+ zoneService.updateById(zone);
+ 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) {
+ zoneService.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.zoneService.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<Zone> queryById(@RequestParam(name="id",required=true) String id) {
+ Zone zone = zoneService.getById(id);
+ if(zone==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zone);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zone
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Zone zone) {
+ return super.exportXls(request, zone, Zone.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, Zone.class);
+ }
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java
new file mode 100644
index 0000000..8053163
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java
@@ -0,0 +1,78 @@
+package org.jeecg.modules.wms.config.zone.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: 2022-10-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("zone")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zone对象", description="库区管理")
+public class Zone implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**编码*/
+ @Excel(name = "编码", width = 15)
+ @ApiModelProperty(value = "编码")
+ private String code;
+ /**名称*/
+ @Excel(name = "名称", width = 15)
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**仓库编码*/
+ @Excel(name = "仓库编码", width = 15)
+ @ApiModelProperty(value = "仓库编码")
+ private String warehousecode;
+ /**货主编码*/
+ @Excel(name = "货主编码", width = 15)
+ @ApiModelProperty(value = "货主编码")
+ private String companycode;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**自定义字段1*/
+ @Excel(name = "自定义字段1", width = 15)
+ @ApiModelProperty(value = "自定义字段1")
+ private String userdef1;
+ /**自定义字段2*/
+ @Excel(name = "自定义字段2", width = 15)
+ @ApiModelProperty(value = "自定义字段2")
+ private String userdef2;
+ /**自定义字段3*/
+ @Excel(name = "自定义字段3", width = 15)
+ @ApiModelProperty(value = "自定义字段3")
+ private String userdef3;
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/ZoneMapper.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/ZoneMapper.java
new file mode 100644
index 0000000..be9cebb
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/ZoneMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.wms.config.zone.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.wms.config.zone.entity.Zone;
+
+/**
+ * @Description: 库区管理
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface ZoneMapper extends BaseMapper<Zone> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/xml/ZoneMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/xml/ZoneMapper.xml
new file mode 100644
index 0000000..3097208
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/mapper/xml/ZoneMapper.xml
@@ -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="org.jeecg.modules.wms.config.zone.mapper.ZoneMapper">
+
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java
new file mode 100644
index 0000000..662eab4
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.wms.config.zone.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wms.config.zone.entity.Zone;
+
+/**
+ * @Description: 库区管理
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+public interface IZoneService extends IService<Zone> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java
new file mode 100644
index 0000000..e810677
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.wms.config.zone.service.impl;
+
+import org.jeecg.modules.wms.config.zone.entity.Zone;
+import org.jeecg.modules.wms.config.zone.mapper.ZoneMapper;
+import org.jeecg.modules.wms.config.zone.service.IZoneService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 库区管理
+ * @Author: jeecg-boot
+ * @Date: 2022-10-13
+ * @Version: V1.0
+ */
+@Service
+public class ZoneServiceImpl extends ServiceImpl<ZoneMapper, Zone> implements IZoneService {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 72496ed..8e7a478 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path: /jeecg-boot
+ context-path: /wms
compression:
enabled: true
min-response-size: 1024
--
libgit2 0.22.2