Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

# Conflicts: # ant-design-vue-jeecg/src/views/system/UserList.vue

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
# Conflicts: # ant-design-vue-jeecg/src/views/system/UserList.vue
肖超群
2 parents 9e304a0d 8241d7f0
Showing 19 changed files with 70 additions and 87 deletions
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
ant-design-vue-jeecg/src/components/tools/Logo.vue
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
ant-design-vue-jeecg/src/defaultSettings.js
ant-design-vue-jeecg/src/views/system/UserList.vue
ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
huaheng-wms-core/pom.xml
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
huaheng-wms-core/src/main/resources/application-dev.yml
huaheng-wms-core/src/main/resources/application-test.yml
huaheng-wms-core/src/main/resources/application.yml
huaheng-wms-core/src/main/resources/log4jdbc.properties → huaheng-wms-core/src/main/resources/log4jdbc.log4j2.properties
huaheng-wms-core/src/main/resources/logback-spring.xml
@@ -88,7 +88,6 @@ export default {
         .logo {
           height: 44px;
           vertical-align: top;
-          margin-right: 16px;
           border-style: none;
         }
@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
-      <span v-if="device === 'desktop'">欢迎进入 华恒仓储管理系统</span>
+      <span style="height:59;line-height:59px;" v-if="device === 'desktop'">欢迎进入 华恒仓储管理系统</span>
       <span v-else>华恒仓储管理系统</span>
       <user-menu :theme="theme"/>
@@ -189,8 +189,8 @@ export default {
     }
     .trigger {
-      line-height: 64px;
-
+      height: 59px;
+      line-height: 59px;
       &:hover {
         background: rgba(0, 0, 0, 0.05);
       }
@@ -260,7 +260,7 @@ body {
   .trigger {
     font-size: 22px;
-    line-height: 42px;
+    line-height: 59px;
     padding: 0 18px;
     cursor: pointer;
     transition: color 300ms, background 300ms;
@@ -342,8 +342,8 @@ body {
         display: inline-block;
         transition: all .3s;
-        height: 70%;
-        line-height: 46px;
+        height: 59px;
+        line-height: 59px;
         &.action-full {
           height: 100%;
@@ -403,7 +403,7 @@ body {
           .logo.top-nav-header {
             text-align: center;
-            width: 56px;
+            width: 58px;
             line-height: 58px;
           }
         }
@@ -470,10 +470,10 @@ body {
         display: flex;
         .logo.top-nav-header {
-          width: 165px;
-          height: 64px;
+          width: 160px;
+          height: 58px;
           position: relative;
-          line-height: 64px;
+          line-height: 58px;
           transition: all .3s;
           overflow: hidden;
@@ -46,7 +46,7 @@ export default {
   .logo {
     height: @height !important;
-    line-height: @height !important;
+    line-height: 54px !important;
     box-shadow: none !important;
     transition: background 300ms;
@@ -36,7 +36,7 @@
     <header-notice class="action"/>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
-        <a-avatar class="avatar" size="small" :src="getAvatar()"/>
+        <!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/> -->
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
@@ -15,11 +15,11 @@
 export default {
   primaryColor: '#1890FF', // primary color of ant design
-  navTheme: 'light', // theme for nav menu
+  navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: false, // sticky header
-  fixSiderbar: false, // sticky siderbar
+  fixSiderbar: true, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
   multipage: true, //默认多页签模式
@@ -289,8 +289,7 @@ export default {
         {
           title: '所属仓库',
           align: "center",
-          dataIndex: 'selectedWarehouses',
-          key: 'selectedWarehouses',
+          dataIndex: 'selectedWarehouses',          key: 'selectedWarehouses',
           scopedSlots: {customRender: 'selectedWarehouses'},
           width: 200
         },
@@ -18,7 +18,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
@@ -92,9 +91,9 @@ export default {
       columns: [
         {
           title: '库存详情ID',
-
           align: 'center',
-          dataIndex: 'id'
+          dataIndex: 'id',
+          fixed: 'left',
         },
         {
           title: '货主',
@@ -124,6 +123,11 @@ export default {
           dataIndex: 'containerCode'
         },
         {
+          title: '序列号',
+          align: 'center',
+          dataIndex: 'sn'
+        },
+        {
           title: '物料编码',
           align: 'center',
           dataIndex: 'materialCode'
@@ -165,11 +169,6 @@ export default {
           dataIndex: 'batch'
         },
         {
-          title: '序列号',
-          align: 'center',
-          dataIndex: 'sn'
-        },
-        {
           title: '入库日期',
           align: "center",
           dataIndex: 'receiptDate'
@@ -198,10 +197,12 @@ export default {
           title: '更新日期',
           align: 'center',
           dataIndex: 'updateTime'
-        },
+        }
       ],
       url: {
-        importUrl: "/inventory/inventoryHeader/importInventoryDetail",
+        list: '/InventoryMaterialSummary/inventoryMaterialSummary/inventoryMaterialSummaryChild',
+        exportXlsUrl: '/InventoryMaterialSummary/inventoryMaterialSummary/exportXls',
+        importExcelUrl: 'InventoryMaterialSummary/inventoryMaterialSummary/importExcel'
       },
       dictOptions: {
         containerStatus: []
@@ -70,12 +70,12 @@
           </j-multi-select-tag>
         </a-form-model-item>
-        <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="selectedZoneCode">
+        <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="zoneCode">
           <j-multi-select-tag
             :disabled="disableSubmit"
-            v-model="model.selectedZoneCode"
+            v-model="model.zoneCode"
             :options="zoneOptions"
-            placeholder="请选择仓库">
+            placeholder="请选择库区">
           </j-multi-select-tag>
         </a-form-model-item>
@@ -162,7 +162,7 @@ import moment from &#39;moment&#39;
 import Vue from 'vue'
 import {ACCESS_TOKEN} from "@/store/mutation-types"
 import {getAction} from '@/api/manage'
-import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getAllZoneList} from '@/api/api'
+import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getZoneList} from '@/api/api'
 import {disabledAuthFilter} from "@/utils/authFilter"
 import {duplicateCheck} from '@/api/api'
@@ -255,7 +255,7 @@ export default {
       //根据屏幕宽度自适应抽屉宽度
       this.resetScreenSize();
       that.userId = record.id;
-      that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', selectedZoneCode: ''}, record);
+      that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', zoneCode: ''}, record);
       //身份为上级显示负责部门，否则不显示
       if (this.model.userIdentity == 2) {
         this.departIdShow = true;
@@ -327,7 +327,7 @@ export default {
       });
     },
     initZoneList() {
-      getAllZoneList().then((res) => {
+      getZoneList().then((res) => {
         if (res.success) {
           this.zoneOptions = res.result.map((item, index, arr) => {
             let c = {label: item.name, value: item.code}
@@ -337,14 +337,14 @@ export default {
         }
       });
     },
-    getWarehouse(userid) {
-      queryWarehouse({userid: userid}).then((res) => {
-        if (res.success) {
-          this.model.selectedWarehouse = res.result.join(",");
-          console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
-        }
-      });
-    },
+    // getWarehouse(userid) {
+    //   queryWarehouse({userid: userid}).then((res) => {
+    //     if (res.success) {
+    //       this.model.selectedWarehouse = res.result.join(",");
+    //       console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
+    //     }
+    //   });
+    // },
     getUserRoles(userid) {
       queryUserRole({userid: userid}).then((res) => {
         if (res.success) {
@@ -89,35 +89,12 @@
             </a-tag>
         </span>
-        <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 v-if="record.status == 1" v-has="'agvTask:executeTask'" @click="executeAgvTask(record)">
             <a-button type="primary">执行</a-button><a-divider type="vertical"/></a>
-
-          <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'"
-                        @confirm="() => handleDelete(record.id)">
-            <a><a-button type="danger">取消</a-button> <a-divider type="vertical"/></a>
+          <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'" @confirm="() => handleDelete(record.id)">
+            <a><a-button type="danger">取消</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -59,10 +59,9 @@
             <version>5.4.7</version>
         </dependency>
         <dependency>
-            <groupId>com.googlecode.log4jdbc</groupId>
-            <artifactId>log4jdbc</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
+            <groupId>org.bgee.log4jdbc-log4j2</groupId>
+            <artifactId>log4jdbc-log4j2-jdbc4.1</artifactId>
+            <version>1.16</version>
         </dependency>
         <dependency>
             <groupId>com.github.abel533</groupId>
@@ -172,7 +172,7 @@ public class SysUserController {
         Result<SysUser> result = new Result<SysUser>();
         String selectedRoles = jsonObject.getString("selectedRoles");
         String selectedWarehouse = jsonObject.getString("selectedWarehouse");
-        String selectedZoneCode = jsonObject.getString("selectedZoneCode");
+        String zoneCode = jsonObject.getString("zoneCode");
         String selectedDeparts = jsonObject.getString("selecteddeparts");
         try {
             SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
@@ -187,7 +187,7 @@ public class SysUserController {
                 throw new ServiceException("仓库不能为空");
             }
             // 保存用户走一个service 保证事务
-            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, selectedZoneCode);
+            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, zoneCode);
             result.success("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -214,7 +214,7 @@ public class SysUserController {
                 user.setPassword(sysUser.getPassword());
                 String roles = jsonObject.getString("selectedRoles");
                 String selectedWarehouse = jsonObject.getString("selectedWarehouse");
-                String selectedZoneCode = jsonObject.getString("selectedZoneCode");
+                String zoneCode = jsonObject.getString("zoneCode");
                 String departs = jsonObject.getString("selecteddeparts");
                 if (oConvertUtils.isEmpty(departs)) {
                     // vue3.0前端只传递了departIds
@@ -224,7 +224,7 @@ public class SysUserController {
                     throw new ServiceException("仓库不能为空");
                 }
                 // 修改用户走一个service 保证事务
-                sysUserService.editUser(user, roles, departs, selectedWarehouse, selectedZoneCode);
+                sysUserService.editUser(user, roles, departs, selectedWarehouse, zoneCode);
                 result.success("修改成功!");
             }
         } catch (Exception e) {
@@ -231,7 +231,7 @@ public interface ISysUserService extends IService&lt;SysUser&gt; {
      * @param selectedRoles   选择的角色id，多个以逗号隔开
      * @param selectedDeparts 选择的部门id，多个以逗号隔开
      */
-    void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode);
+    void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode);
     /**
      * 编辑用户
@@ -239,7 +239,7 @@ public interface ISysUserService extends IService&lt;SysUser&gt; {
      * @param roles   选择的角色id，多个以逗号隔开
      * @param departs 选择的部门id，多个以逗号隔开
      */
-    void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode);
+    void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode);
     /** userId转为username */
     List<String> userIdToUsername(Collection<String> userIdList);
@@ -489,7 +489,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode) {
+    public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode) {
         // step.1 保存用户
         this.save(user);
         // step.2 保存角色
@@ -523,7 +523,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         SysUser sysUser = new SysUser();
         sysUser.setId(user.getId());
-        sysUser.setZoneCode(selectedZoneCode);
+        sysUser.setZoneCode(zoneCode);
         if (!sysUserService.updateById(sysUser)) {
             throw new JeecgBootException("更新用户库区失败");
         }
@@ -533,7 +533,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
-    public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode) {
+    public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode) {
         // step.1 修改用户基础信息
         this.updateById(user);
         // step.2 修改角色
@@ -604,10 +604,10 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         SysUser sysUser = new SysUser();
         sysUser.setId(user.getId());
-        if (StringUtils.isEmpty(selectedZoneCode)) {
+        if (StringUtils.isEmpty(zoneCode)) {
             sysUser.setZoneCode(QuantityConstant.EMPTY_STRING);
         } else {
-            sysUser.setZoneCode(selectedZoneCode);
+            sysUser.setZoneCode(zoneCode);
         }
         if (!sysUserService.updateById(sysUser)) {
             throw new JeecgBootException("更新用户库区失败");
@@ -139,7 +139,7 @@ spring:
           url: jdbc:log4jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
           username: root
           password: 123456
-          driver-class-name: net.sf.log4jdbc.DriverSpy
+          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           # sqlserver 数据源配置
           # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
           # username: sa
@@ -140,7 +140,7 @@ spring:
           url: jdbc:log4jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
           username: root
           password: hhsoftware
-          driver-class-name: net.sf.log4jdbc.DriverSpy
+          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
           # sqlserver 数据源配置
           # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
           # username: sa
@@ -3,7 +3,7 @@ spring:
     name: huaheng-wms-core
   profiles:
     active: test
-    
+
 huaheng:
   system:
+# 这里采用slf4j日志
+log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator
+
 log4jdbc.auto.load.popular.drivers=false
+
 log4jdbc.drivers=com.mysql.cj.jdbc.Driver
 log4jdbc.statement.warn=false
@@ -15,7 +19,7 @@ log4jdbc.dump.sql.delete=true
 log4jdbc.dump.sql.update=true
 log4jdbc.dump.sql.create=true
-log4jdbc.dump.sql.addsemicolon=false
+log4jdbc.dump.sql.addsemicolon=true
 log4jdbc.trim.sql=true
@@ -80,6 +80,10 @@
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>
+    <logger name="jdbc.resultsettable" additivity="false" level="info" >
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </logger>
     <logger name="jdbc.resultset" additivity="false" level="off">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
@@ -88,11 +92,11 @@
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>
-    <logger name="jdbc.sqlonly" additivity="false" level="off">
+    <logger name="jdbc.sqlonly" additivity="false" level="info">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>
-    <logger name="jdbc.sqltiming" additivity="false" level="info">
+    <logger name="jdbc.sqltiming" additivity="false" level="off">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>