From 4d285e4d8cbc51bceed43d9151e885a2112230c5 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Fri, 8 Dec 2023 15:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/MaHouseController.java    | 23 ++++++++++-
 .../base/controller/MaHouseSetController.java |  9 ++--
 .../controller/MaHouseShelController.java     |  2 +-
 .../base/controller/MaMachineController.java  |  2 +-
 .../base/controller/MaPartTypeController.java |  2 +-
 .../base/controller/MaPropInfoController.java |  2 +-
 .../controller/MaTypeHisNumController.java    |  2 +-
 .../controller/MaTypeHisPriceController.java  |  2 +-
 .../sgzb/base/{damain => domain}/MaHouse.java | 41 ++++++++++++-------
 .../base/{damain => domain}/MaHouseSet.java   | 25 ++++++-----
 .../base/{damain => domain}/MaHouseShel.java  |  2 +-
 .../base/{damain => domain}/MaLabelBind.java  |  2 +-
 .../base/{damain => domain}/MaMachine.java    |  2 +-
 .../base/{damain => domain}/MaPartType.java   |  2 +-
 .../base/{damain => domain}/MaPropInfo.java   |  2 +-
 .../base/{damain => domain}/MaPropSet.java    |  2 +-
 .../sgzb/base/{damain => domain}/MaType.java  |  2 +-
 .../base/{damain => domain}/MaTypeFile.java   |  2 +-
 .../base/{damain => domain}/MaTypeHisNum.java |  2 +-
 .../{damain => domain}/MaTypeHisPrice.java    |  2 +-
 .../base/{damain => domain}/MaTypeKeeper.java |  2 +-
 .../bonus/sgzb/base/mapper/MaHouseMapper.java | 18 +++++---
 .../sgzb/base/mapper/MaHouseSetMapper.java    |  5 +--
 .../sgzb/base/mapper/MaHouseShelMapper.java   |  2 +-
 .../sgzb/base/mapper/MaMachineMapper.java     |  2 +-
 .../sgzb/base/mapper/MaPartTypeMapper.java    |  2 +-
 .../sgzb/base/mapper/MaPropInfoMapper.java    |  2 +-
 .../sgzb/base/mapper/MaTypeHisNumMapper.java  |  2 +-
 .../base/mapper/MaTypeHisPriceMapper.java     |  2 +-
 .../bonus/sgzb/base/mapper/MaTypeMapper.java  |  2 +-
 .../sgzb/base/service/IMaPropInfoService.java |  2 +-
 .../sgzb/base/service/IPartTypeService.java   |  2 +-
 .../bonus/sgzb/base/service/ITypeService.java |  2 +-
 .../sgzb/base/service/IhouseService.java      |  4 +-
 .../sgzb/base/service/MaHouseSetService.java  |  5 +--
 .../sgzb/base/service/MaHouseShelService.java |  2 +-
 .../sgzb/base/service/MaMachineService.java   |  2 +-
 .../base/service/MaTypeHisNumService.java     |  2 +-
 .../base/service/MaTypeHisPriceService.java   |  2 +-
 .../base/service/impl/MaHouseServiceImpl.java | 19 ++++++++-
 .../base/service/impl/MaHouseSetImpl.java     |  5 +--
 .../service/impl/MaHouseShelServiceImpl.java  |  2 +-
 .../service/impl/MaMachineServiceImpl.java    |  2 +-
 .../service/impl/MaPartTypeServiceImpl.java   |  2 +-
 .../service/impl/MaPropInfoServiceImpl.java   |  2 +-
 .../service/impl/MaTypeHisNumServiceImpl.java |  2 +-
 .../impl/MaTypeHisPriceServiceImpl.java       |  2 +-
 .../base/service/impl/MaTypeServiceImpl.java  |  2 +-
 .../resources/mapper/base/MaHouseMapper.xml   | 34 +++++++++------
 .../mapper/base/MaHouseSetMapper.xml          |  6 +--
 .../mapper/base/MaHouseShelMapper.xml         |  2 +-
 .../resources/mapper/base/MaMachineMapper.xml |  8 ++--
 .../mapper/base/MaMachineTypeMapper.xml       | 10 ++---
 .../mapper/base/MaPartTypeMapper.xml          |  4 +-
 .../mapper/base/MaPropInfoMapper.xml          |  4 +-
 .../mapper/base/MaTypeHisNumMapper.xml        |  8 ++--
 .../mapper/base/MaTypeHisPriceMapper.xml      |  8 ++--
 .../resources/mapper/base/MaTypeMapper.xml    | 16 --------
 58 files changed, 190 insertions(+), 140 deletions(-)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaHouse.java (73%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaHouseSet.java (84%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaHouseShel.java (98%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaLabelBind.java (96%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaMachine.java (99%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaPartType.java (99%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaPropInfo.java (98%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaPropSet.java (98%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaType.java (99%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaTypeFile.java (98%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaTypeHisNum.java (96%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaTypeHisPrice.java (96%)
 rename sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/{damain => domain}/MaTypeKeeper.java (94%)
 delete mode 100644 sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeMapper.xml

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java
index d2372735..3cf820eb 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java
@@ -4,8 +4,10 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
-import com.bonus.sgzb.base.damain.MaHouse;
+import com.bonus.sgzb.base.domain.MaHouse;
 import com.bonus.sgzb.base.service.IhouseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
+@Api(tags = "仓库货架管理")
 @RequestMapping("/house")
 public class MaHouseController extends BaseController {
 
@@ -24,6 +27,7 @@ public class MaHouseController extends BaseController {
      * @param house
      * @return
      */
+    @ApiOperation(value = "查询仓库货架列表")
     @GetMapping("/list")
     public TableDataInfo list(MaHouse house)
     {
@@ -32,9 +36,24 @@ public class MaHouseController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询仓库列表
+     * @param house
+     * @return
+     */
+    @ApiOperation(value = "查询仓库货架列表")
+    @GetMapping("/tree")
+    public TableDataInfo tree(MaHouse house)
+    {
+        startPage();
+        List<MaHouse> list = houseService.getHouseTree(house);
+        return getDataTable(list);
+    }
+
     /**
      * 新增仓库货架
      */
+    @ApiOperation(value = "新增仓库货架")
     @PostMapping
     public AjaxResult add(@Validated @RequestBody MaHouse house){
         if (!houseService.checkHouseNameUnique(house)) {
@@ -49,6 +68,7 @@ public class MaHouseController extends BaseController {
      * @param house
      * @return
      */
+    @ApiOperation(value = "修改仓库货架")
     @PutMapping
     public AjaxResult update(@Validated @RequestBody MaHouse house){
         Long houseId = house.getHouseId();
@@ -66,6 +86,7 @@ public class MaHouseController extends BaseController {
      * @param houseId
      * @return
      */
+    @ApiOperation(value = "删除仓库货架")
     @DeleteMapping("/{houseId}")
     public AjaxResult delete(@PathVariable("houseId") Long houseId){
         if (houseService.hasChildByHouseId(houseId))
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java
index a61de886..dfeda199 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java
@@ -3,9 +3,10 @@ package com.bonus.sgzb.base.controller;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
-import com.bonus.sgzb.base.damain.MaHouse;
-import com.bonus.sgzb.base.damain.MaHouseSet;
+import com.bonus.sgzb.base.domain.MaHouseSet;
 import com.bonus.sgzb.base.service.MaHouseSetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -16,6 +17,7 @@ import java.util.List;
  * 仓库货架配置
  */
 @RestController
+@Api(tags = "仓库货架配置")
 @RequestMapping("/houseSet")
 public class MaHouseSetController extends BaseController {
 
@@ -28,11 +30,12 @@ public class MaHouseSetController extends BaseController {
      * @param maHouseSet
      * @return
      */
+    @ApiOperation(value = "查询仓库货架配置")
     @GetMapping("/getHouseSet")
     public TableDataInfo getHouseSet(MaHouseSet maHouseSet)
     {
         startPage();
-        List<MaHouse> list = maHouseSetService.getHouseSetList(maHouseSet);
+        List<MaHouseSet> list = maHouseSetService.getHouseSetList(maHouseSet);
         return getDataTable(list);
     }
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java
index b2e16392..afe677a6 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java
@@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
-import com.bonus.sgzb.base.damain.MaHouseShel;
+import com.bonus.sgzb.base.domain.MaHouseShel;
 import com.bonus.sgzb.base.service.MaHouseShelService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java
index 288afb79..a586e629 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java
@@ -3,7 +3,7 @@ package com.bonus.sgzb.base.controller;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
-import com.bonus.sgzb.base.damain.MaMachine;
+import com.bonus.sgzb.base.domain.MaMachine;
 import com.bonus.sgzb.base.service.MaMachineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java
index b029c4e9..38f590ea 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java
@@ -5,7 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
-import com.bonus.sgzb.base.damain.MaPartType;
+import com.bonus.sgzb.base.domain.MaPartType;
 import com.bonus.sgzb.base.service.IPartTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
index 911c9660..478ec0b0 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
@@ -5,7 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
-import com.bonus.sgzb.base.damain.MaPropInfo;
+import com.bonus.sgzb.base.domain.MaPropInfo;
 import com.bonus.sgzb.base.service.IMaPropInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java
index c5ec3d3f..63d9ec2d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java
@@ -4,7 +4,7 @@ package com.bonus.sgzb.base.controller;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
-import com.bonus.sgzb.base.damain.MaTypeHisNum;
+import com.bonus.sgzb.base.domain.MaTypeHisNum;
 import com.bonus.sgzb.base.service.MaTypeHisNumService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java
index 5d97bab7..c8f1af6f 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java
@@ -4,7 +4,7 @@ package com.bonus.sgzb.base.controller;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
-import com.bonus.sgzb.base.damain.MaTypeHisPrice;
+import com.bonus.sgzb.base.domain.MaTypeHisPrice;
 import com.bonus.sgzb.base.service.MaTypeHisPriceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouse.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java
similarity index 73%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouse.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java
index a7121631..8b5ea4b8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouse.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java
@@ -1,62 +1,69 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
-import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
+//@ApiModel(value="com.bonus.sgzb.base.domain.MaHouse")
 public class MaHouse extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
     /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @ApiModelProperty(value= "仓库ID")
     private Long houseId;
 
     /** 工程项目名称 */
-    @Excel(name = "工程项目名称")
+    @ApiModelProperty(value="工程项目名称")
     private String houseName;
 
     /** 上级ID */
-    @Excel(name = "上级ID")
+    @ApiModelProperty(value= "上级ID")
     private Long parentId;
 
     /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态（0正常 1停用）")
+    @ApiModelProperty(value= "帐号状态（0正常 1停用）")
     private String status;
 
     /** 所属上级 */
-    @Excel(name = "所属上级")
+    @ApiModelProperty(value= "所属上级")
     private Long deptId;
 
     /** 删除标志（0代表存在 2代表删除） */
-    @Excel(name = "删除标志（0代表存在 2代表删除）")
+    @ApiModelProperty(value= "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
     /** 创建者 */
-    @Excel(name = "创建者")
+    @ApiModelProperty(value= "创建者")
     private String createBy;
 
     /** 创建时间 */
-    @Excel(name = "创建时间")
+    @ApiModelProperty(value= "创建时间")
     private Date createTime;
 
     /** 更新者 */
-    @Excel(name = "更新者")
+    @ApiModelProperty(value= "更新者")
     private String updateBy;
 
     /** 更新时间 */
-    @Excel(name = "更新时间")
+    @ApiModelProperty(value= "更新时间")
     private Date updateTime;
 
     /** 备注 */
-    @Excel(name = "备注")
+    @ApiModelProperty(value= "备注")
     private String remark;
 
     /** 数据所属组织 */
-    @Excel(name = "数据所属组织")
+    @ApiModelProperty(value= "数据所属组织")
     private String companyId;
 
+    /** 数据所属组织 */
+    @ApiModelProperty(value= "排序")
+    private int sort;
+
     public Long getHouseId() {
         return houseId;
     }
@@ -163,5 +170,11 @@ public class MaHouse extends BaseEntity {
         this.companyId = companyId;
     }
 
+    public int getSort() {
+        return sort;
+    }
 
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseSet.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
similarity index 84%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseSet.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
index 9539e8ac..24137291 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseSet.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
@@ -1,32 +1,31 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-@ApiModel(value="com.bonus.sgzb.base.damain.MaHouseSet")
+@ApiModel(value="com.bonus.sgzb.base.domain.MaHouseSet")
 public class MaHouseSet {
   /**
    * 仓库ID
    */
-  @Excel(name = "仓库ID")
   @ApiModelProperty(value="仓库ID")
   private long houseId;
   /**
    * 机具类型ID
    */
-  @Excel(name = "机具类型ID")
+  @ApiModelProperty(value= "机具类型ID")
   private long typeId;
   /**
    * 机具ID
    */
-  @Excel(name = "机具ID")
+  @ApiModelProperty(value= "机具ID")
   private long maId;
   /**
    * 数量
    */
-  @Excel(name = "数量")
+  @ApiModelProperty(value= "数量")
   private String num;
   /**
    * 帐号状态（0正常 1停用）
@@ -35,7 +34,7 @@ public class MaHouseSet {
   /**
    * 所属上级
    */
-  @Excel(name = "所属上级")
+  @ApiModelProperty(value= "所属上级")
   private long deptId;
   /**
    * 删除标志（0代表存在 2代表删除）
@@ -45,32 +44,32 @@ public class MaHouseSet {
   /**
    * 创建者
    */
-  @Excel(name = "创建者")
+  @ApiModelProperty(value= "创建者")
   private String createBy;
   /**
    * 创建时间
    */
-  @Excel(name = "创建时间")
+  @ApiModelProperty(value= "创建时间")
   private java.sql.Timestamp createTime;
   /**
    * 更新者
    */
-  @Excel(name = "更新者")
+  @ApiModelProperty(value= "更新者")
   private String updateBy;
   /**
    * 更新时间
    */
-  @Excel(name = "更新时间")
+  @ApiModelProperty(value= "更新时间")
   private java.sql.Timestamp updateTime;
   /**
    * 备注
    */
-  @Excel(name = "备注")
+  @ApiModelProperty(value= "备注")
   private String remark;
   /**
    * 数据所属组织
    */
-  @Excel(name = "数据所属组织")
+  @ApiModelProperty(value= "数据所属组织")
   private String companyId;
 
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseShel.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseShel.java
similarity index 98%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseShel.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseShel.java
index f9e8e9f1..18d4219c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaHouseShel.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseShel.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaLabelBind.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java
similarity index 96%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaLabelBind.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java
index f3bf7f46..5cead9f8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaLabelBind.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import lombok.Data;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaMachine.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java
similarity index 99%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaMachine.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java
index 18a30c98..93fc7c67 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaMachine.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 public class MaMachine {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPartType.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
similarity index 99%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPartType.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
index 7fe7e920..de6dee14 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPartType.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java
similarity index 98%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropInfo.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java
index 0a30511d..018a57bb 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropInfo.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 import com.bonus.sgzb.common.core.annotation.Excel;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropSet.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
similarity index 98%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropSet.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
index 231b2bf4..25685d4a 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaPropSet.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 public class MaPropSet {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaType.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaType.java
similarity index 99%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaType.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaType.java
index e7d79047..5630dd60 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaType.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaType.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeFile.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java
similarity index 98%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeFile.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java
index 913df402..e91347e6 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeFile.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisNum.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java
similarity index 96%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisNum.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java
index 36dc9da0..4cf7de3e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisNum.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 public class MaTypeHisNum {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisPrice.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java
similarity index 96%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisPrice.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java
index e1c425e6..2c39b515 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeHisPrice.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 
 public class MaTypeHisPrice {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeKeeper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java
similarity index 94%
rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeKeeper.java
rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java
index 8ce31276..695fdcb2 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/damain/MaTypeKeeper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java
@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.damain;
+package com.bonus.sgzb.base.domain;
 
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseMapper.java
index 6944e169..9597e9d1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseMapper.java
@@ -1,23 +1,23 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaHouse;
+import com.bonus.sgzb.base.domain.MaHouse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 仓库信息 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface MaHouseMapper
-{
+public interface MaHouseMapper {
     /**
      * 校验项目名称
      *
      * @param houseName 项目名称
      * @return 结果
      */
-    public MaHouse checkHouseNameUnique(String houseName);
+    public MaHouse checkHouseNameUnique(@Param("houseName") String houseName);
 
     /**
      * 新增保存仓库信息
@@ -37,6 +37,7 @@ public interface MaHouseMapper
 
     /**
      * 删除仓库货架信息
+     *
      * @param houseId
      * @return
      */
@@ -44,6 +45,7 @@ public interface MaHouseMapper
 
     /**
      * 查询仓库信息列表
+     *
      * @param house
      * @return
      */
@@ -51,6 +53,7 @@ public interface MaHouseMapper
 
     /**
      * 根据仓库id查询仓库信息
+     *
      * @param houseId
      * @return
      */
@@ -58,10 +61,13 @@ public interface MaHouseMapper
 
     /**
      * 是否存在子仓库
+     *
      * @param houseId
      * @return
      */
-    int hasChildByHouseId(Long houseId);
+    Integer hasChildByHouseId(@Param("houseId") Long houseId);
 
     List<MaHouse> selectHouse();
+
+    List<MaHouse> selectHouseParent(@Param("parentId") long parentId);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java
index 86a3239a..52818a39 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java
@@ -1,12 +1,11 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaHouse;
-import com.bonus.sgzb.base.damain.MaHouseSet;
+import com.bonus.sgzb.base.domain.MaHouseSet;
 
 import java.util.List;
 
 public interface MaHouseSetMapper {
-    public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet);
+    public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet);
 
     public int maHouseSetAdd(MaHouseSet maHouseSet);
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseShelMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseShelMapper.java
index 8581bbef..8252b94d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseShelMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseShelMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaHouseShel;
+import com.bonus.sgzb.base.domain.MaHouseShel;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
index 5ced81a2..1e2aeb29 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaMachine;
+import com.bonus.sgzb.base.domain.MaMachine;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java
index 1ef60d28..f7780dbc 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaPartType;
+import com.bonus.sgzb.base.domain.MaPartType;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
index 3252326a..af6fcad3 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaPropInfo;
+import com.bonus.sgzb.base.domain.MaPropInfo;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisNumMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisNumMapper.java
index 8d2cd798..a5d378a6 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisNumMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisNumMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaTypeHisNum;
+import com.bonus.sgzb.base.domain.MaTypeHisNum;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisPriceMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisPriceMapper.java
index 088d9f70..06db3689 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisPriceMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeHisPriceMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaTypeHisPrice;
+import com.bonus.sgzb.base.domain.MaTypeHisPrice;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
index 386b5af5..eebd3d2c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.mapper;
 
-import com.bonus.sgzb.base.damain.MaType;
+import com.bonus.sgzb.base.domain.MaType;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
index 17ea2909..79a8e0a4 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaPropInfo;
+import com.bonus.sgzb.base.domain.MaPropInfo;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IPartTypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IPartTypeService.java
index d6766b50..2033fbed 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IPartTypeService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IPartTypeService.java
@@ -1,7 +1,7 @@
 package com.bonus.sgzb.base.service;
 
 
-import com.bonus.sgzb.base.damain.MaPartType;
+import com.bonus.sgzb.base.domain.MaPartType;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
index 502915d1..23c7e57a 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaType;
+import com.bonus.sgzb.base.domain.MaType;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java
index 27565853..e3e6ff8f 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaHouse;
+import com.bonus.sgzb.base.domain.MaHouse;
 
 import java.util.List;
 
@@ -54,4 +54,6 @@ public interface IhouseService {
      * @return
      */
     boolean hasChildByHouseId(Long houseId);
+
+    List<MaHouse> getHouseTree(MaHouse house);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java
index c1fae206..2d1cb60c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java
@@ -1,13 +1,12 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaHouse;
-import com.bonus.sgzb.base.damain.MaHouseSet;
+import com.bonus.sgzb.base.domain.MaHouseSet;
 
 import java.util.List;
 
 public interface MaHouseSetService {
 
-    public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet);
+    public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet);
 
     public int maHouseSetAdd(MaHouseSet maHouseSet);
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseShelService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseShelService.java
index f47ea5bc..cdf73179 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseShelService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseShelService.java
@@ -1,7 +1,7 @@
 package com.bonus.sgzb.base.service;
 
 
-import com.bonus.sgzb.base.damain.MaHouseShel;
+import com.bonus.sgzb.base.domain.MaHouseShel;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java
index 13f1810a..8cc867b6 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaMachine;
+import com.bonus.sgzb.base.domain.MaMachine;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisNumService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisNumService.java
index 27041330..ddfe37da 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisNumService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisNumService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaTypeHisNum;
+import com.bonus.sgzb.base.domain.MaTypeHisNum;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisPriceService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisPriceService.java
index 15e2ad6f..c165a4fb 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisPriceService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaTypeHisPriceService.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service;
 
-import com.bonus.sgzb.base.damain.MaTypeHisPrice;
+import com.bonus.sgzb.base.domain.MaTypeHisPrice;
 
 import java.util.List;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java
index d3449c24..bf546a34 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java
@@ -3,12 +3,13 @@ package com.bonus.sgzb.base.service.impl;
 import com.bonus.sgzb.common.core.constant.UserConstants;
 import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.utils.StringUtils;
-import com.bonus.sgzb.base.damain.MaHouse;
+import com.bonus.sgzb.base.domain.MaHouse;
 import com.bonus.sgzb.base.mapper.MaHouseMapper;
 import com.bonus.sgzb.base.service.IhouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -93,7 +94,21 @@ public class MaHouseServiceImpl implements IhouseService {
      */
     @Override
     public boolean hasChildByHouseId(Long houseId) {
-        int result = houseMapper.hasChildByHouseId(houseId);
+        Integer result = houseMapper.hasChildByHouseId(houseId);
         return result > 0;
     }
+
+    /**
+     * 查询货架列表组织树
+     * @param house 货架信息
+     * @return 结果
+     */
+    @Override
+    public List<MaHouse> getHouseTree(MaHouse house) {
+        List<MaHouse> houseList = houseMapper.selectHouseParent(0L);
+        for (MaHouse maHouse : houseList) {
+            houseMapper.selectHouseParent(0L);
+        }
+        return null;
+    }
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java
index 42b3fd68..692fbf51 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java
@@ -1,7 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
-import com.bonus.sgzb.base.damain.MaHouse;
-import com.bonus.sgzb.base.damain.MaHouseSet;
+import com.bonus.sgzb.base.domain.MaHouseSet;
 import com.bonus.sgzb.base.mapper.MaHouseSetMapper;
 import com.bonus.sgzb.base.service.MaHouseSetService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@ public class MaHouseSetImpl implements MaHouseSetService {
     private MaHouseSetMapper maHouseSetMapper;
 
     @Override
-    public List<MaHouse> getHouseSetList(MaHouseSet maHouseSet) {
+    public List<MaHouseSet> getHouseSetList(MaHouseSet maHouseSet) {
         return maHouseSetMapper.getHouseSetList(maHouseSet);
     }
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseShelServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseShelServiceImpl.java
index 1d75bff7..30b5ec14 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseShelServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseShelServiceImpl.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
-import com.bonus.sgzb.base.damain.MaHouseShel;
+import com.bonus.sgzb.base.domain.MaHouseShel;
 import com.bonus.sgzb.base.mapper.MaHouseShelMapper;
 import com.bonus.sgzb.base.service.MaHouseShelService;
 import org.springframework.stereotype.Service;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
index 9f57315d..a8e7049c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
-import com.bonus.sgzb.base.damain.MaMachine;
+import com.bonus.sgzb.base.domain.MaMachine;
 import com.bonus.sgzb.base.mapper.MaMachineMapper;
 import com.bonus.sgzb.base.service.MaMachineService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java
index b4fb7d0f..8590c5cb 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java
@@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service.impl;
 
 import com.bonus.sgzb.common.core.constant.UserConstants;
 import com.bonus.sgzb.common.core.utils.StringUtils;
-import com.bonus.sgzb.base.damain.MaPartType;
+import com.bonus.sgzb.base.domain.MaPartType;
 import com.bonus.sgzb.base.mapper.MaPartTypeMapper;
 import com.bonus.sgzb.base.service.IPartTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
index 68b53219..0ec36a5b 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
@@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.constant.UserConstants;
 import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
-import com.bonus.sgzb.base.damain.MaPropInfo;
+import com.bonus.sgzb.base.domain.MaPropInfo;
 import com.bonus.sgzb.base.mapper.MaPropInfoMapper;
 import com.bonus.sgzb.base.service.IMaPropInfoService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisNumServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisNumServiceImpl.java
index 860320ba..52c42438 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisNumServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisNumServiceImpl.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
-import com.bonus.sgzb.base.damain.MaTypeHisNum;
+import com.bonus.sgzb.base.domain.MaTypeHisNum;
 import com.bonus.sgzb.base.mapper.MaTypeHisNumMapper;
 import com.bonus.sgzb.base.service.MaTypeHisNumService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisPriceServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisPriceServiceImpl.java
index 93b74ad6..1e6bde06 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisPriceServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeHisPriceServiceImpl.java
@@ -1,6 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
-import com.bonus.sgzb.base.damain.MaTypeHisPrice;
+import com.bonus.sgzb.base.domain.MaTypeHisPrice;
 import com.bonus.sgzb.base.mapper.MaTypeHisPriceMapper;
 import com.bonus.sgzb.base.service.MaTypeHisPriceService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
index 0c59a9b9..c410b1ec 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
@@ -1,7 +1,7 @@
 package com.bonus.sgzb.base.service.impl;
 
 import com.bonus.sgzb.common.core.utils.StringUtils;
-import com.bonus.sgzb.base.damain.MaType;
+import com.bonus.sgzb.base.domain.MaType;
 import com.bonus.sgzb.base.mapper.MaTypeMapper;
 import com.bonus.sgzb.base.service.ITypeService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
index 0a49149a..3c1070ca 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
@@ -4,25 +4,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.base.mapper.MaHouseMapper">
     
-    <resultMap type="com.bonus.sgzb.base.damain.MaHouse" id="SysHouseResult">
+    <resultMap type="com.bonus.sgzb.base.domain.MaHouse" id="SysHouseResult">
     	<id     property="houseId"      column="house_id"      />
         <result property="houseName"    column="house_name"    />
         <result property="parentId"     column="parent_id"     />
+        <result property="status"     column="status"     />
         <result property="deptId"   column="dept_id"   />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"      column="create_by"      />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"      column="update_by"      />
         <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
         <result property="companyId"    column="company_id"    />
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectHouseVo">
-        select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id
+        select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id, sort
         from ma_house_info
     </sql>
 
-    <insert id="insertHouse" parameterType="com.bonus.sgzb.base.damain.MaHouse" useGeneratedKeys="true" keyProperty="houseId">
+    <insert id="insertHouse" parameterType="com.bonus.sgzb.base.domain.MaHouse" useGeneratedKeys="true" keyProperty="houseId">
         insert into ma_house_info(
         <if test="houseId != null and houseId != 0">house_id,</if>
         <if test="houseName != null and houseName != ''">house_name,</if>
@@ -68,13 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_house_info set del_flag = '2' where house_id = #{houseId}
     </delete>
 
-    <select id="checkHouseNameUnique" resultType="com.bonus.sgzb.base.damain.MaHouse">
-        <include refid="selectHouseVo"/>
-        where house_name=#{houseName} limit 1
-    </select>
 
-    <select id="selectHouseList" resultType="com.bonus.sgzb.base.damain.MaHouse">
-        <include refid="selectHouseVo"/>
+    <select id="selectHouseList" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
+        select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id, sort
+        from ma_house_info
         <where>
             <if test="houseName != null and houseName != ''">
                 AND house_name like concat('%', #{houseName}, '%')
@@ -82,18 +82,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectHouseById" resultType="com.bonus.sgzb.base.damain.MaHouse">
+    <select id="selectHouseById" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
         <include refid="selectHouseVo"/>
         where house_id = #{houseId}
+        order by sort
     </select>
 
-    <select id="hasChildByHouseId" resultType="java.lang.Integer">
+    <select id="hasChildByHouseId" parameterType="Long">
         select count(1) from ma_house_info
         where del_flag = '0' and parent_id = #{houseId} limit 1
     </select>
 
-    <select id="selectHouse" resultType="com.bonus.sgzb.base.damain.MaHouse">
+    <select id="selectHouse" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
         <include refid="selectHouseVo"/>
     </select>
 
+    <select id="selectHouseParent" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
+        <include refid="selectHouseVo"/>
+        where parent_id = #{parentId}
+        order by sort
+    </select>
+    <select id="checkHouseNameUnique" parameterType= "String"  resultMap="SysHouseResult">
+        <include refid="selectHouseVo"/>
+        where house_name=#{houseName} limit 1
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
index a9746395..3caddfd1 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.base.mapper.MaHouseSetMapper">
     
-    <resultMap type="com.bonus.sgzb.base.damain.MaHouseSet" id="SysHouseSetResult">
+    <resultMap type="com.bonus.sgzb.base.domain.MaHouseSet" id="SysHouseSetResult">
     	<id     property="houseId"      column="house_id"      />
         <result property="typeId"    column="type_id"    />
         <result property="maId"     column="ma_id"     />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_house_set
     </sql>
 
-    <insert id="maHouseSetAdd" parameterType="com.bonus.sgzb.base.damain.MaHouseSet" >
+    <insert id="maHouseSetAdd" parameterType="com.bonus.sgzb.base.domain.MaHouseSet" >
         insert into ma_house_set(
         <if test="houseId != null and houseId != 0">house_id,</if>
         <if test="typeId != null and typeId != ''">type_id,</if>
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="getHouseSetList" resultType="com.bonus.sgzb.base.damain.MaHouseSet">
+    <select id="getHouseSetList" resultType="com.bonus.sgzb.base.domain.MaHouseSet">
         select house_id, type_id, ma_id, num, status, dept_id, del_flag, create_by, create_time, update_by,update_time,remark,company_id
         from ma_house_set
         <where>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseShelMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseShelMapper.xml
index 60581fe5..92b329fd 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseShelMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseShelMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.bonus.sgzb.base.mapper.MaHouseShelMapper">
 
-    <resultMap id="BaseResultMap" type="com.bonus.sgzb.base.damain.MaHouseShel">
+    <resultMap id="BaseResultMap" type="com.bonus.sgzb.base.domain.MaHouseShel">
         <id column="shelve_id" property="shelveId" jdbcType="BIGINT"/>
         <result column="shelve_name" property="shelveName" jdbcType="VARCHAR"/>
         <result column="parent_id" property="parentId" jdbcType="BIGINT"/>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index ca6677ad..6b04d603 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.base.mapper.MaMachineMapper">
 
-    <resultMap type="com.bonus.sgzb.base.damain.MaMachine" id="MaMachineResult">
+    <resultMap type="com.bonus.sgzb.base.domain.MaMachine" id="MaMachineResult">
         <id     property="maId"      column="ma_id"      />
         <result property="typeId"    column="type_id"    />
         <result property="maCode"     column="ma_code"     />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
 
-    <select id="getMaMachine" resultType="com.bonus.sgzb.base.damain.MaMachine">
+    <select id="getMaMachine" resultType="com.bonus.sgzb.base.domain.MaMachine">
 
         select ma_id, type_id, ma_code, pre_code, ma_status, qr_code, buy_price, ma_vender, out_fac_time, out_fac_code,
         assets_code, check_man, this_check_time, next_check_time, gps_code, rfid_code, erp_code, transfer_code,
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="maMachineAdd" parameterType="com.bonus.sgzb.base.damain.MaMachine">
+    <insert id="maMachineAdd" parameterType="com.bonus.sgzb.base.domain.MaMachine">
         insert into ma_machine (
         <if test="typeId != null and typeId != '' ">type_id,</if>
         <if test="maCode != null and maCode != '' ">ma_code,</if>
@@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <update id="updateMaMachine" parameterType="com.bonus.sgzb.base.damain.MaMachine">
+    <update id="updateMaMachine" parameterType="com.bonus.sgzb.base.domain.MaMachine">
         update ma_machine
         <set>
             <if test="typeId != null and typeId != ''">type_id = #{typeId},</if>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 3171ef6d..840bcf4d 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_type
     </sql>
 
-    <insert id="insertType" parameterType="com.bonus.sgzb.base.damain.MaType" useGeneratedKeys="true" keyProperty="typeId">
+    <insert id="insertType" parameterType="com.bonus.sgzb.base.domain.MaType" useGeneratedKeys="true" keyProperty="typeId">
         insert into ma_type(
         <if test="typeId != null and typeId != 0">type_id,</if>
         <if test="typeName != null and typeName != ''">type_name,</if>
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <insert id="insertTypeFile" parameterType="com.bonus.sgzb.base.damain.MaTypeFile" useGeneratedKeys="true" keyProperty="typeId">
+    <insert id="insertTypeFile" parameterType="com.bonus.sgzb.base.domain.MaTypeFile" useGeneratedKeys="true" keyProperty="typeId">
         insert into ma_type_file(
         <if test="typeId != null and typeId != 0">type_id,</if>
         <if test="maId != null and maId != ''">ma_id,</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_type set del_flag = '2' where type_id = #{typeId}
     </delete>
 
-    <select id="selectMaTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
+    <select id="selectMaTypeList" resultType="com.bonus.sgzb.base.domain.MaType">
         select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type, m.lease_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, mtf.file_name, mtf.file_url, su.user_name, mpi.prop_name, m.del_flag, m.create_by, m.create_time, m.remark, m.company_id
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user su on mtk.user_id = su.user_id
     </select>
 
-    <select id="selectTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
+    <select id="selectTypeList" resultType="com.bonus.sgzb.base.domain.MaType">
         <include refid="selectMaTypeVo"/>
         <where>
             <if test="typeName != null and typeName != ''">
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where del_flag = '0' and parent_id = #{typeId} limit 1
     </select>
 
-    <select id="checkTypeNameUnique" resultType="com.bonus.sgzb.base.damain.MaType">
+    <select id="checkTypeNameUnique" resultType="com.bonus.sgzb.base.domain.MaType">
         <include refid="selectMaTypeVo"/>
         where type_name = #{typeName} limit 1
     </select>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
index 0a2b68d5..21cb012c 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
@@ -46,12 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_part_type set del_flag = '2' where pa_id = #{paId}
     </delete>
 
-    <select id="checkPartNameUnique" resultType="com.bonus.sgzb.base.damain.MaPartType">
+    <select id="checkPartNameUnique" resultType="com.bonus.sgzb.base.domain.MaPartType">
         <include refid="selectMaPartTypeVo"/>
         where pa_name = #{paName} limit 1
     </select>
 
-    <select id="selectMaPartType" resultType="com.bonus.sgzb.base.damain.MaPartType">
+    <select id="selectMaPartType" resultType="com.bonus.sgzb.base.domain.MaPartType">
         <include refid="selectMaPartTypeVo"/>
         <where>
             <if test="paName != null and paName != ''">
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
index 27b2b5be..bee254ab 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_prop_info set del_flag = '2' where prop_id = #{propId}
     </delete>
 
-    <select id="selectMaPropSet" resultType="com.bonus.sgzb.base.damain.MaPropInfo">
+    <select id="selectMaPropSet" resultType="com.bonus.sgzb.base.domain.MaPropInfo">
         <include refid="selectMaPropInfoVo"/>
         <where>
             <if test="propName != null and propName != ''">
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.damain.MaPropInfo">
+    <select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.domain.MaPropInfo">
         <include refid="selectMaPropInfoVo"/>
         where prop_name = #{propName} limit 1
     </select>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisNumMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
index c13afb8f..966355df 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.base.mapper.MaTypeHisNumMapper">
 
-    <resultMap type="com.bonus.sgzb.base.damain.MaTypeHisPrice" id="MaTypeHisNUmResult">
+    <resultMap type="com.bonus.sgzb.base.domain.MaTypeHisPrice" id="MaTypeHisNUmResult">
         <id     property="typeId"      column="type_id"      />
         <result property="storageNum"    column="storage_num"    />
         <result property="time"     column="time"     />
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_type_his_num
     </sql>
 
-    <select id="getTypeHisNum" resultType="com.bonus.sgzb.base.damain.MaTypeHisNum">
+    <select id="getTypeHisNum" resultType="com.bonus.sgzb.base.domain.MaTypeHisNum">
 
         select type_id, storage_num, time, status, company_id
         from ma_type_his_num
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.damain.MaTypeHisNum">
+    <insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
         insert into ma_type_his_num (
         <if test="storageNum != null and storageNum != '' ">storage_num,</if>
         <if test="time != null and time != '' ">time,</if>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <update id="updateTypeHisNum" parameterType="com.bonus.sgzb.base.damain.MaTypeHisNum">
+    <update id="updateTypeHisNum" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
         update ma_type_his_num
         <set>
             <if test="storageNum != null and storageNum != ''">storage_num = #{storageNum},</if>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
index cc1c8b8e..d3e13da6 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.base.mapper.MaTypeHisPriceMapper">
 
-    <resultMap type="com.bonus.sgzb.base.damain.MaTypeHisPrice" id="MaTypeHisPriceResult">
+    <resultMap type="com.bonus.sgzb.base.domain.MaTypeHisPrice" id="MaTypeHisPriceResult">
         <id     property="typeId"      column="type_id"      />
         <result property="leasePrice"    column="lease_price"    />
         <result property="time"     column="time"     />
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_type_his_price
     </sql>
 
-    <select id="getTypeHisPrice" resultType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
+    <select id="getTypeHisPrice" resultType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
 
         select type_id, lease_price, time, status, company_id
         from ma_type_his_price
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
+    <insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
         insert into ma_type_his_price (
         <if test="leasePrice != null and leasePrice != '' ">ma_code,</if>
         <if test="time != null and time != '' ">time,</if>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <update id="updateTypeHisPrice" parameterType="com.bonus.sgzb.base.damain.MaTypeHisPrice">
+    <update id="updateTypeHisPrice" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
         update ma_type_his_price
         <set>
             <if test="leasePrice != null and leasePrice != ''">ma_code = #{leasePrice},</if>
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeMapper.xml
deleted file mode 100644
index 22c73d50..00000000
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeMapper.xml
+++ /dev/null
@@ -1,16 +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="com.bonus.sgzb.base.mapper.MaTypeMapper">
-
-    <sql id="selectMaTypeVo">
-        select type_id, type_name, parent_id, status, num, unit_id, manage_type, lease_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, remark, company_id
-        from ma_type
-    </sql>
-
-    <select id="selectMaTypeList" resultType="com.bonus.sgzb.base.damain.MaType">
-
-        <include refid="selectMaTypeVo"/>
-    </select>
-</mapper>
\ No newline at end of file