增加用户和仓库的关系

肖超群 · 肖超群
1 parent 28c1afd5
Showing 9 changed files with 178 additions and 121 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
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/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/warehouse/controller/WarehouseController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -203,6 +203,10 @@ export const handleEmptyOut = (params) =&gt; postAction(&#39;/task/taskHeader/handleEmp
 export const handlePickupError = (params) => postAction('/task/taskHeader/handlePickupError?id=' + params, params);
 //修复重入数据
 export const handleDoubleIn = (params) => postAction('/task/taskHeader/handleDoubleIn?id=' + params, params);
+//查询用户角色
+export const queryWarehouse = (params) => getAction("/config/sysUserWarehouse/queryWarehouse", params);
+//查询所有仓库
+export const getAllWarehouseList = (params) => getAction("/config/warehouse/getAllWarehouseList", params);
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -4,6 +4,21 @@
     <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.username"></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>
@@ -61,6 +61,15 @@
           </j-multi-select-tag>
         </a-form-model-item>
  
+        <a-form-model-item label="仓库分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable">
+          <j-multi-select-tag
+            :disabled="disableSubmit"
+            v-model="model.selectedWarehouse"
+            :options="warehouseOptions"
+            placeholder="请选择仓库">
+          </j-multi-select-tag>
+        </a-form-model-item>
+
         <!--部门分配-->
         <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
           <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"
@@ -144,7 +153,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} from '@/api/api'
+import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList} from '@/api/api'
 import {disabledAuthFilter} from "@/utils/authFilter"
 import {duplicateCheck} from '@/api/api'
  
@@ -155,6 +164,7 @@ export default {
     return {
       departDisabled: false, //是否是我的部门调用该页面
       roleDisabled: false, //是否是角色维护调用该页面
+      warehouseDisable: false, //是否是角色维护调用该页面
       modalWidth: 800,
       drawerWidth: 700,
       modaltoggleFlag: true,
@@ -200,6 +210,7 @@ export default {
         queryTenantList: '/sys/tenant/queryList'
       },
       tenantsOptions: [],
+      warehouseOptions: [],
       rolesOptions: [],
       nextDepartOptions: [],
     }
@@ -208,6 +219,7 @@ export default {
     const token = Vue.ls.get(ACCESS_TOKEN);
     this.headers = {"X-Access-Token": token}
     this.initRoleList()
+    this.initWarehouseList()
     this.initTenantList()
   },
   computed: {
@@ -226,7 +238,7 @@ export default {
       //根据屏幕宽度自适应抽屉宽度
       this.resetScreenSize();
       that.userId = record.id;
-      that.model = Object.assign({}, {selectedroles: '', selecteddeparts: ''}, record);
+      that.model = Object.assign({}, {selectedroles: '', selectedWarehouse: '',selecteddeparts: ''}, record);
       //身份为上级显示负责部门，否则不显示
       if (this.model.userIdentity == 2) {
         this.departIdShow = true;
@@ -236,6 +248,7 @@ export default {
  
       if (record.hasOwnProperty("id")) {
         that.getUserRoles(record.id);
+        that.getWarehouse(record.id);
         that.getUserDeparts(record.id);
       }
       console.log('that.model=', that.model)
@@ -285,11 +298,22 @@ export default {
         }
       });
     },
-    getUserRoles(userid) {
-      queryUserRole({userid: userid}).then((res) => {
+    initWarehouseList() {
+      getAllWarehouseList().then((res) => {
+        if (res.success) {
+          this.warehouseOptions = res.result.map((item, index, arr) => {
+            let c = {label: item.name, value: item.code}
+            return c;
+          })
+          console.log('this.warehouseOptions: ', this.warehouseOptions)
+        }
+      });
+    },
+    getWarehouse(userid) {
+      queryWarehouse({userid: userid}).then((res) => {
         if (res.success) {
-          this.model.selectedroles = res.result.join(",");
-          console.log('that.model.selectedroles=', this.model.selectedroles)
+          this.model.selectedWarehouse = res.result.join(",");
+          console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
         }
       });
     },
 package org.jeecg.modules.system.controller;
  
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
  
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -27,20 +20,10 @@ import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.base.service.BaseCommonService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysDepartRole;
-import org.jeecg.modules.system.entity.SysDepartRoleUser;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
-import org.jeecg.modules.system.service.ISysDepartRoleService;
-import org.jeecg.modules.system.service.ISysDepartRoleUserService;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserDepartService;
-import org.jeecg.modules.system.service.ISysUserRoleService;
-import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.vo.SysDepartUsersVO;
 import org.jeecg.modules.system.vo.SysUserRoleVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -51,13 +34,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -190,6 +167,7 @@ public class SysUserController {
     public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
         Result<SysUser> result = new Result<SysUser>();
         String selectedRoles = jsonObject.getString("selectedroles");
+        String selectedWarehouse = jsonObject.getString("selectedWarehouse");
         String selectedDeparts = jsonObject.getString("selecteddeparts");
         try {
             SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
@@ -201,7 +179,7 @@ public class SysUserController {
             user.setStatus(1);
             user.setDelFlag(CommonConstant.DEL_FLAG_0);
             // 保存用户走一个service 保证事务
-            sysUserService.saveUser(user, selectedRoles, selectedDeparts);
+            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse);
             result.success("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -227,13 +205,14 @@ public class SysUserController {
                 // sysUser.getSalt());
                 user.setPassword(sysUser.getPassword());
                 String roles = jsonObject.getString("selectedroles");
+                String selectedWarehouse = jsonObject.getString("selectedWarehouse");
                 String departs = jsonObject.getString("selecteddeparts");
                 if (oConvertUtils.isEmpty(departs)) {
                     // vue3.0前端只传递了departIds
                     departs = user.getDepartIds();
                 }
                 // 修改用户走一个service 保证事务
-                sysUserService.editUser(user, roles, departs);
+                sysUserService.editUser(user, roles, departs, selectedWarehouse);
                 result.success("修改成功!");
             }
         } catch (Exception e) {
 package org.jeecg.modules.system.service;
  
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.springframework.transaction.annotation.Transactional;
  
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
  
 /**
  * <p>
@@ -230,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);
+    void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse);
  
     /**
      * 编辑用户
@@ -238,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);
+    void editUser(SysUser user, String roles, String departs, String selectedWarehouse);
  
     /** userId转为username */
     List<String> userIdToUsername(Collection<String> userIdList);
 package org.jeecg.modules.system.service.impl;
  
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
  
 import javax.annotation.Resource;
@@ -21,36 +14,25 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.base.service.BaseCommonService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysDepartRole;
-import org.jeecg.modules.system.entity.SysDepartRoleUser;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.entity.SysRole;
-import org.jeecg.modules.system.entity.SysThirdAccount;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.entity.SysUserRole;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.jeecg.modules.system.mapper.SysDepartRoleMapper;
-import org.jeecg.modules.system.mapper.SysDepartRoleUserMapper;
-import org.jeecg.modules.system.mapper.SysPermissionMapper;
-import org.jeecg.modules.system.mapper.SysRoleMapper;
-import org.jeecg.modules.system.mapper.SysThirdAccountMapper;
-import org.jeecg.modules.system.mapper.SysUserDepartMapper;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.jeecg.modules.system.mapper.SysUserRoleMapper;
+import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.vo.SysUserDepVo;
+import org.jeecg.modules.wms.config.sysUserWarehouse.entity.SysUserWarehouse;
+import org.jeecg.modules.wms.config.sysUserWarehouse.service.ISysUserWarehouseService;
+import org.jeecg.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
@@ -75,6 +57,10 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
     private SysUserRoleMapper sysUserRoleMapper;
     @Autowired
     private SysUserDepartMapper sysUserDepartMapper;
+    @Resource
+    private ISysUserService sysUserService;
+    @Resource
+    private ISysUserWarehouseService sysUserWarehouseService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
     @Autowired
@@ -479,7 +465,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) {
+    public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse) {
         // step.1 保存用户
         this.save(user);
         // step.2 保存角色
@@ -498,12 +484,24 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
                 sysUserDepartMapper.insert(userDeaprt);
             }
         }
+        if (StringUtils.isNotEmpty(selectedWarehouse)) {
+            String[] arr = selectedWarehouse.split(",");
+            for (String warehouseCode : arr) {
+                SysUserWarehouse sysUserWarehouse = new SysUserWarehouse();
+                sysUserWarehouse.setWarehousecode(warehouseCode);
+                sysUserWarehouse.setUserid(user.getId());
+                sysUserWarehouse.setUsername(user.getUsername());
+                if (!sysUserWarehouseService.save(sysUserWarehouse)) {
+                    throw new ServiceException("保存失败");
+                }
+            }
+        }
     }
  
     @Override
     @Transactional(rollbackFor = Exception.class)
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
-    public void editUser(SysUser user, String roles, String departs) {
+    public void editUser(SysUser user, String roles, String departs, String warehouses) {
         // step.1 修改用户基础信息
         this.updateById(user);
         // step.2 修改角色
@@ -556,6 +554,24 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
         userMapper.updateNullByEmptyString("email");
         userMapper.updateNullByEmptyString("phone");
  
+        // step5
+        LambdaQueryWrapper<SysUserWarehouse> sysUserWarehouseLambdaQueryWrapper = Wrappers.lambdaQuery();
+        sysUserWarehouseLambdaQueryWrapper.eq(SysUserWarehouse::getUserid, user.getId());
+        if (!sysUserWarehouseService.remove(sysUserWarehouseLambdaQueryWrapper)) {
+            throw new ServiceException("删除用户和仓库关系失败");
+        }
+        if (StringUtils.isNotEmpty(warehouses)) {
+            String[] strs = warehouses.split(",");
+            for (String warehouseCode : strs) {
+                SysUserWarehouse sysUserWarehouse = new SysUserWarehouse();
+                sysUserWarehouse.setUserid(user.getId());
+                sysUserWarehouse.setWarehousecode(warehouseCode);
+                sysUserWarehouse.setUsername(user.getRealname());
+                if (!sysUserWarehouseService.save(sysUserWarehouse)) {
+                    throw new ServiceException("保存用户和仓库关系失败");
+                }
+            }
+        }
     }
  
     @Override
 package org.jeecg.modules.wms.config.sysUserWarehouse.controller;
  
+import java.util.ArrayList;
 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.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.utils.HuahengJwtUtil;
-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.sysUserWarehouse.entity.SysUserWarehouse;
 import org.jeecg.modules.wms.config.sysUserWarehouse.service.ISysUserWarehouseService;
-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.jeecg.modules.wms.config.warehouse.entity.Warehouse;
+import org.jeecg.modules.wms.config.warehouse.service.IWarehouseService;
 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
  
 /**
  * @Description: 用户仓库关系表
@@ -51,6 +42,9 @@ public class SysUserWarehouseController extends JeecgController&lt;SysUserWarehouse
     @Autowired
     private ISysUserWarehouseService sysUserWarehouseService;
  
+    @Resource
+    private IWarehouseService warehouseService;
+
     /**
      * 分页列表查询
      * @param  sysUserWarehouse
@@ -159,4 +153,25 @@ public class SysUserWarehouseController extends JeecgController&lt;SysUserWarehouse
         return super.importExcel(request, response, SysUserWarehouse.class);
     }
  
+    @RequestMapping(value = "/queryWarehouse", method = RequestMethod.GET)
+    public Result<List<String>> queryWarehouse(@RequestParam(name = "userid", required = true) String userid) {
+        Result<List<String>> result = new Result<>();
+        List<String> list = new ArrayList<String>();
+        List<SysUserWarehouse> sysUserWarehouseList =
+            sysUserWarehouseService.list(new QueryWrapper<SysUserWarehouse>().lambda().eq(SysUserWarehouse::getUserid, userid));
+        if (sysUserWarehouseList == null || sysUserWarehouseList.size() <= 0) {
+            result.error500("未找到用户相关仓库信息");
+        } else {
+            for (SysUserWarehouse sysUserWarehouse : sysUserWarehouseList) {
+                Warehouse warehouse = warehouseService.getWarehouseByCode(sysUserWarehouse.getWarehousecode());
+                if (warehouse != null) {
+                    list.add(warehouse.getName());
+                }
+            }
+            result.setSuccess(true);
+            result.setResult(list);
+        }
+        return result;
+    }
+
 }
@@ -2,41 +2,28 @@ 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.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
  
 /**
  * @Description: 仓库
@@ -172,4 +159,12 @@ public class WarehouseController extends JeecgController&lt;Warehouse, IWarehouseSe
         return super.importExcel(request, response, Warehouse.class);
     }
  
+    @RequestMapping(value = "/getAllWarehouseList", method = RequestMethod.GET)
+    public Result<List<Warehouse>> getAllWarehouseList() {
+        Result<List<Warehouse>> result = new Result<>();
+        List<Warehouse> list = warehouseService.getAllWarehouseList();
+        result.setResult(list);
+        result.setSuccess(true);
+        return result;
+    }
 }
@@ -1077,7 +1077,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("任务未找到，执行中止");
         }
         String warehouseCode = taskHeader.getWarehouseCode();
-//        String fromLocationCode = taskHeader.getFromLocationCode();
+        String fromLocationCode = taskHeader.getFromLocationCode();
         String toLocationCode = taskHeader.getToLocationCode();
         String containerCode = taskHeader.getContainerCode();
         String zoneCode = taskHeader.getZoneCode();
@@ -1195,6 +1195,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             throw new ServiceException("完成入库任务时，保存库存交易失败");
         }
  
+        if (StringUtils.isEmpty(fromLocationCode)) {
+            success =
+                locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+            if (!success) {
+                throw new ServiceException("完成入库任务时，更新源库位失败");
+            }
+        }
+
         success = locationService.updateContainerCodeAndStatus(toLocationCode, containerCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
         if (!success) {
             throw new ServiceException("完成入库任务时，更新库位失败");