Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2022-11-19 10:38:50 +08:00
parent 470c1552eb 82e88099cf
commit 6f16f96020
9 changed files with 333 additions and 58 deletions
--- a/acs/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
+++ b/acs/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
@@ -6,12 +6,16 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.TransactionManagementConfigurer;

+import javax.annotation.Resource;
 import javax.sql.DataSource;

@Configuration
@Slf4j
-public class DataBaseConfig {
+public class DataBaseConfig implements TransactionManagementConfigurer {

    @Primary
    @Bean(name = "dataSource")
@@ -20,4 +24,20 @@ public class DataBaseConfig {
        return new DruidDataSource();
    }

+
+
+    @Resource(name="transactionManager")
+    private PlatformTransactionManager transactionManager;
+
+    // 创建事务管理器
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    // 实现接口 TransactionManagementConfigurer 方法，其返回值代表在拥有多个事务管理器的情况下默认使用的事务管理器
+    @Override
+    public PlatformTransactionManager annotationDrivenTransactionManager() {
+        return transactionManager;
+    }
 }
--- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
@@ -92,6 +92,9 @@ public class AuthorizationController {
            throw new BadRequestException("账号或密码错误");
        }

+        // 判断是否被锁
+        if (!userDto.getEnabled()) throw new BadRequestException("账号未激活");
+
        // 获取权限列表 - 登录查找权限
        List<String> permissionList = roleService.getPermissionList(userDto);

--- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
@@ -19,6 +19,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -109,7 +110,10 @@ public class UserController {
    public ResponseEntity<Object> create(@Validated @RequestBody User resources){
        checkLevel(resources);
        // 默认密码 123456
-        resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
+        if (ObjectUtil.isEmpty(resources.getPassword()))
+            resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
+        else
+            resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
        userService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
    }
--- a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
@@ -15,6 +15,8 @@
 */
 package org.nl.modules.system.service.impl;

+import cn.dev33.satoken.secure.SaSecureUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.config.FileProperties;
@@ -89,9 +91,6 @@ public class UserServiceImpl implements UserService {
        if (userRepository.findByUsername(resources.getUsername()) != null) {
            throw new EntityExistException(User.class, "username", resources.getUsername());
        }
-        if (userRepository.findByEmail(resources.getEmail()) != null) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }
        resources.setCreateBy(SecurityUtils.getCurrentUsername());
        userRepository.save(resources);
    }
@@ -102,45 +101,36 @@ public class UserServiceImpl implements UserService {
        User user = userRepository.findById(resources.getId()).orElseGet(User::new);
        ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
        User user1 = userRepository.findByUsername(resources.getUsername());
-        User user2 = userRepository.findByEmail(resources.getEmail());

        if (user1 != null && !user.getId().equals(user1.getId())) {
            throw new EntityExistException(User.class, "username", resources.getUsername());
        }
-
-        if (user2 != null && !user.getId().equals(user2.getId())) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }
        // 如果用户的角色改变
        if (!resources.getRoles().equals(user.getRoles())) {
            redisUtils.del(CacheKey.DATA_USER  + resources.getId());
            redisUtils.del(CacheKey.MENU_USER + resources.getId());
            redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
        }
-        // 如果用户名称修改
-        if(!resources.getUsername().equals(user.getUsername())){
-            redisUtils.del("user::username:" + user.getUsername());
-        }
+        redisUtils.del("user::username:" + user.getUsername());
        // 如果用户被禁用，则清除用户登录信息
        if(!resources.getEnabled()){
            onlineUserService.kickOutForUsername(resources.getUsername());
        }
-        User clone = new User(); // jpa 多表问题，需要用新的类来进行修改
-        clone.setId(resources.getId());
-        clone.setUsername(resources.getUsername());
-        clone.setEmail(resources.getEmail());
-        clone.setEnabled(resources.getEnabled());
-        clone.setRoles(resources.getRoles());
-        clone.setDept(resources.getDept());
-        clone.setPhone(resources.getPhone());
-        clone.setNickName(resources.getNickName());
-        clone.setGender(resources.getGender());
+        user.setId(resources.getId());
+        user.setUsername(resources.getUsername());
+        user.setEmail(resources.getEmail());
+        user.setEnabled(resources.getEnabled());
+        user.setRoles(resources.getRoles());
+        user.setDept(resources.getDept());
+        user.setPhone(resources.getPhone());
+        user.setNickName(resources.getNickName());
+        user.setGender(resources.getGender());
+        if (ObjectUtil.isNotEmpty(resources.getPassword()))
+            user.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));

-        userRepository.save(clone);
+        userRepository.save(user);
        // 清除缓存
        delCaches(user.getId(), user.getUsername());
-        // 修改session
-//        flushSession(user);
    }

    @Override
@@ -153,8 +143,6 @@ public class UserServiceImpl implements UserService {
        userRepository.save(user);
        // 清理缓存
        delCaches(user.getId(), user.getUsername());
-        // 修改session
-//        flushSession(user);
    }

    @Override
@@ -184,7 +172,6 @@ public class UserServiceImpl implements UserService {
    public void updatePass(String username, String pass) {
        userRepository.updatePass(username, pass, new Date());
        redisUtils.del("user::username:" + username);
-//        flushSession(userRepository.findByUsername(username));
    }

    @Override
@@ -200,7 +187,6 @@ public class UserServiceImpl implements UserService {
            FileUtil.del(oldPath);
        }
        @NotBlank String username = user.getUsername();
-//        flushSession(user);
        return new HashMap<String, String>(1) {{
            put("avatar", file.getName());
        }};
@@ -210,7 +196,6 @@ public class UserServiceImpl implements UserService {
    @Transactional(rollbackFor = Exception.class)
    public void updateEmail(String username, String email) {
        userRepository.updateEmail(username, email);
-//        flushSession(userRepository.findByUsername(username));
    }

    @Override
@@ -239,17 +224,6 @@ public class UserServiceImpl implements UserService {
     */
    public void delCaches(Long id, String username) {
        redisUtils.del(CacheKey.USER_ID + id);
-//        flushCache(username);
    }

-    /**
-     * 清理 登陆时 用户缓存信息
-     *
-     * @param user /
-     */
-//    private void flushSession(User user) {
-//        UserDto userDto = this.findByName(user.getUsername());
-//        List<String> permissionList = roleService.getPermissionList(userDto.getId().toString());
-//        flushSessionUtil.flushSessionInfo(userDto, permissionList);
-//    }
 }
--- a/acs/nladmin-ui/src/views/login.vue
+++ b/acs/nladmin-ui/src/views/login.vue
@@ -9,7 +9,7 @@
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
@@ -120,14 +120,12 @@ export default {
          code: this.loginForm.code,
          uuid: this.loginForm.uuid
        }
-        if (user.password !== this.cookiePass) {
-          user.password = encrypt(user.password)
-        }
+        user.password = encrypt(user.password)
        if (valid) {
          this.loading = true
          if (user.rememberMe) {
            Cookies.set('username', user.username, { expires: Config.passCookieExpires })
-            Cookies.set('password', user.password, { expires: Config.passCookieExpires })
+            Cookies.set('password', this.loginForm.password, { expires: Config.passCookieExpires })
            Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
          } else {
            Cookies.remove('username')
--- a/acs/nladmin-ui/src/views/system/user/index.vue
+++ b/acs/nladmin-ui/src/views/system/user/index.vue
@@ -80,7 +80,7 @@
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" style="width: 200px;" />
            </el-form-item>
-            <el-form-item label="部门" prop="dept.id">
+            <el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
              <treeselect
                v-model="form.dept.id"
                :options="depts"
@@ -89,7 +89,10 @@
                placeholder="选择部门"
              />
            </el-form-item>
-
+            <br v-if="!crud.status.add">
+            <el-form-item label="密码" prop="password" v-if="crud.status.add">
+              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/>
+            </el-form-item>
            <el-form-item label="性别">
              <el-radio-group v-model="form.gender" style="width: 178px">
                <el-radio label="男">男</el-radio>
@@ -168,16 +171,25 @@
          <el-table-column
            v-permission="['admin','user:edit','user:del']"
            label="操作"
-            width="115"
+            width="200"
            align="center"
            fixed="right"
          >
            <template slot-scope="scope">
              <udOperation
+                style="display: inline"
                :data="scope.row"
                :permission="permission"
                :disabled-dle="scope.row.id === user.id"
              />
+              <el-button
+                type="text"
+                slot="left"
+                icon="el-icon-refresh-left"
+                v-permission="permission.edit"
+                @click="resetPassword(scope.row)">
+                重置密码
+              </el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -212,7 +224,8 @@ const defaultForm = {
  enabled: 'true',
  roles: [],
  dept: { id: null },
-  phone: null
+  phone: null,
+  password: null
 }
 export default {
  name: 'User',
@@ -256,7 +269,7 @@ export default {
    ])
  },
  created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.crud.msg.add = '新增成功'
  },
  mounted: function() {
    const that = this
@@ -292,6 +305,7 @@ export default {
    },
    // 新增前将多选的值设置为空
    [CRUD.HOOK.beforeToAdd]() {
+      this.form.password = '123456'
      this.roleDatas = []
    },
    // 初始化编辑时候的角色与岗位
@@ -435,6 +449,28 @@ export default {
    },
    checkboxT(row, rowIndex) {
      return row.id !== this.user.id
+    },
+    resetPassword(row) {
+      row.password = null
+      this.$prompt('', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入新的密码',
+        inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
+        inputErrorMessage: '密码格式不正确,只能是6-20位密码',
+        closeOnClickModal: false
+      }).then(({ value }) => {
+        row.password = value
+        crudUser.edit(row).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消输入'
+        })
+      })
    }
  }
 }
--- a/lms/nladmin-ui/src/views/login.vue
+++ b/lms/nladmin-ui/src/views/login.vue
@@ -9,7 +9,7 @@
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
@@ -120,14 +120,12 @@ export default {
          code: this.loginForm.code,
          uuid: this.loginForm.uuid
        }
-        if (user.password !== this.cookiePass) {
-          user.password = encrypt(user.password)
-        }
+        user.password = encrypt(user.password)
        if (valid) {
          this.loading = true
          if (user.rememberMe) {
            Cookies.set('username', user.username, { expires: Config.passCookieExpires })
-            Cookies.set('password', user.password, { expires: Config.passCookieExpires })
+            Cookies.set('password', this.loginForm.password, { expires: Config.passCookieExpires })
            Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
          } else {
            Cookies.remove('username')
--- a/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js
+++ b/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/incharge',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/incharge/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/incharge',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
--- a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.bill_code"
+              clearable
+              size="mini"
+              placeholder="入库单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.io_bill_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_OUT_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="dis_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="backConfirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据编码"/>
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
+        <el-table-column prop="stor_name" label="仓库" width="100" />
+        <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
+        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
+        <el-table-column label="明细数" align="center" prop="detail_count" width="100" />
+        <el-table-column label="总重量" align="center" prop="total_qty" width="100" />
+        <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
+        <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
+        <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />
+        <el-table-column show-overflow-tooltip label="修改人" align="center" prop="update_optname" />
+        <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
+        <el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_optname" />
+        <el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
+        <el-table-column show-overflow-tooltip label="确认人" align="center" prop="confirm_optname" />
+        <el-table-column show-overflow-tooltip label="确认时间" align="center" prop="confirm_time" width="140" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudInchargefrom from '@/views/wms/st/incharge/incharge'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+
+export default {
+  name: 'Incharge',
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '入库冲销',
+      url: 'api/incharge',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...crudInchargefrom },
+      optShow: {
+        add: true,
+        edit: true,
+        del: true,
+        download: false,
+        reset: false
+      }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['ST_CREATE_MODE', 'ST_INV_OUT_TYPE'],
+  data() {
+    return {
+      permission: {
+      },
+      billType: null,
+      storlist: [],
+      createtypelist: [],
+      statuslist: []
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>