Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

pengcheng
2 parents 81c737f9 b9d689d6
Showing 49 changed files with 3698 additions and 50 deletions
huaheng.iml
src/main/java/com/huaheng/framework/config/SwaggerConfig.java
src/main/java/com/huaheng/pc/config/containerType/domain/ContainerType.java
src/main/java/com/huaheng/pc/config/containerType/mapper/ContainerTypeMapper.java
src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeService.java
src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
src/main/java/com/huaheng/pc/config/locationType/domain/LocationType.java
src/main/java/com/huaheng/pc/config/locationType/mapper/LocationTypeMapper.java
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeService.java
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
src/main/java/com/huaheng/pc/general/container/domain/Container.java
src/main/java/com/huaheng/pc/general/container/domain/ContainerStatus.java
src/main/java/com/huaheng/pc/general/container/mapper/ContainerMapper.java
src/main/java/com/huaheng/pc/general/container/service/ContainerService.java
src/main/java/com/huaheng/pc/general/container/service/ContainerServiceImpl.java
src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="ExternalSystem" externalSystem="Maven" />
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-</module>
 \ No newline at end of file
@@ -36,7 +36,7 @@ public class SwaggerConfig
                 .apiInfo(apiInfo())
                 .select()
                 // 指定当前包路径
-                .apis(RequestHandlerSelectors.basePackage("com.huaheng.api"))
+                .apis(RequestHandlerSelectors.basePackage("com.huaheng.pc"))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build();
+package com.huaheng.pc.config.containerType.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="com.huaheng.pc.config.containerType.domain.ContainerType")
+@TableName(value = "container_type")
+public class ContainerType implements Serializable {
+    /**
+     * 内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="内部号")
+    private Integer id;
+
+    /**
+     * 箱型
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="箱型")
+    private String code;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "name")
+    @ApiModelProperty(value="描述")
+    private String name;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 启用；0—禁用状态
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="启用；0—禁用状态")
+    private Integer enable;
+
+    /**
+     * 序号
+     */
+    @TableField(value = "sequence")
+    @ApiModelProperty(value="序号")
+    private Integer sequence;
+
+    /**
+     * 空箱重量
+     */
+    @TableField(value = "emptyWeight")
+    @ApiModelProperty(value="空箱重量")
+    private BigDecimal emptyWeight;
+
+    /**
+     * 长
+     */
+    @TableField(value = "length")
+    @ApiModelProperty(value="长")
+    private BigDecimal length;
+
+    /**
+     * 宽
+     */
+    @TableField(value = "width")
+    @ApiModelProperty(value="宽")
+    private BigDecimal width;
+
+    /**
+     * 高
+     */
+    @TableField(value = "height")
+    @ApiModelProperty(value="高")
+    private BigDecimal height;
+
+    /**
+     * 重
+     */
+    @TableField(value = "weight")
+    @ApiModelProperty(value="重")
+    private BigDecimal weight;
+
+    /**
+     * 最大重量
+     */
+    @TableField(value = "maxWeight")
+    @ApiModelProperty(value="最大重量")
+    private BigDecimal maxWeight;
+
+    /**
+     * 装满度
+     */
+    @TableField(value = "fillPercent")
+    @ApiModelProperty(value="装满度")
+    private Integer fillPercent;
+
+    /**
+     * 作为默认货箱
+     */
+    @TableField(value = "useAsDEFAULT")
+    @ApiModelProperty(value="作为默认货箱")
+    private Integer useAsDEFAULT;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1-robot交互用字段
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1-robot交互用字段")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_SEQUENCE = "sequence";
+
+    public static final String COL_EMPTYWEIGHT = "emptyWeight";
+
+    public static final String COL_LENGTH = "length";
+
+    public static final String COL_WIDTH = "width";
+
+    public static final String COL_HEIGHT = "height";
+
+    public static final String COL_WEIGHT = "weight";
+
+    public static final String COL_MAXWEIGHT = "maxWeight";
+
+    public static final String COL_FILLPERCENT = "fillPercent";
+
+    public static final String COL_USEASDEFAULT = "useAsDEFAULT";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+
+    /**
+     * 获取内部号
+     *
+     * @return id - 内部号
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置内部号
+     *
+     * @param id 内部号
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取箱型
+     *
+     * @return code - 箱型
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置箱型
+     *
+     * @param code 箱型
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return name - 描述
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param name 描述
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取仓库编码
+     *
+     * @return warehouseCode - 仓库编码
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 设置仓库编码
+     *
+     * @param warehouseCode 仓库编码
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    /**
+     * 获取货主编码
+     *
+     * @return companyCode - 货主编码
+     */
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    /**
+     * 设置货主编码
+     *
+     * @param companyCode 货主编码
+     */
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    /**
+     * 获取启用；0—禁用状态
+     *
+     * @return enable - 启用；0—禁用状态
+     */
+    public Integer getEnable() {
+        return enable;
+    }
+
+    /**
+     * 设置启用；0—禁用状态
+     *
+     * @param enable 启用；0—禁用状态
+     */
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    /**
+     * 获取序号
+     *
+     * @return sequence - 序号
+     */
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    /**
+     * 设置序号
+     *
+     * @param sequence 序号
+     */
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    /**
+     * 获取空箱重量
+     *
+     * @return emptyWeight - 空箱重量
+     */
+    public BigDecimal getEmptyWeight() {
+        return emptyWeight;
+    }
+
+    /**
+     * 设置空箱重量
+     *
+     * @param emptyWeight 空箱重量
+     */
+    public void setEmptyWeight(BigDecimal emptyWeight) {
+        this.emptyWeight = emptyWeight;
+    }
+
+    /**
+     * 获取长
+     *
+     * @return length - 长
+     */
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    /**
+     * 设置长
+     *
+     * @param length 长
+     */
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    /**
+     * 获取宽
+     *
+     * @return width - 宽
+     */
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    /**
+     * 设置宽
+     *
+     * @param width 宽
+     */
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    /**
+     * 获取高
+     *
+     * @return height - 高
+     */
+    public BigDecimal getHeight() {
+        return height;
+    }
+
+    /**
+     * 设置高
+     *
+     * @param height 高
+     */
+    public void setHeight(BigDecimal height) {
+        this.height = height;
+    }
+
+    /**
+     * 获取重
+     *
+     * @return weight - 重
+     */
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    /**
+     * 设置重
+     *
+     * @param weight 重
+     */
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    /**
+     * 获取最大重量
+     *
+     * @return maxWeight - 最大重量
+     */
+    public BigDecimal getMaxWeight() {
+        return maxWeight;
+    }
+
+    /**
+     * 设置最大重量
+     *
+     * @param maxWeight 最大重量
+     */
+    public void setMaxWeight(BigDecimal maxWeight) {
+        this.maxWeight = maxWeight;
+    }
+
+    /**
+     * 获取装满度
+     *
+     * @return fillPercent - 装满度
+     */
+    public Integer getFillPercent() {
+        return fillPercent;
+    }
+
+    /**
+     * 设置装满度
+     *
+     * @param fillPercent 装满度
+     */
+    public void setFillPercent(Integer fillPercent) {
+        this.fillPercent = fillPercent;
+    }
+
+    /**
+     * 获取作为默认货箱
+     *
+     * @return useAsDEFAULT - 作为默认货箱
+     */
+    public Integer getUseAsDEFAULT() {
+        return useAsDEFAULT;
+    }
+
+    /**
+     * 设置作为默认货箱
+     *
+     * @param useAsDEFAULT 作为默认货箱
+     */
+    public void setUseAsDEFAULT(Integer useAsDEFAULT) {
+        this.useAsDEFAULT = useAsDEFAULT;
+    }
+
+    /**
+     * 获取状态
+     *
+     * @return status - 状态
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态
+     *
+     * @param status 状态
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created - 创建时间
+     */
+    public Date getCreated() {
+        return created;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param created 创建时间
+     */
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    /**
+     * 获取创建用户
+     *
+     * @return createdBy - 创建用户
+     */
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * 设置创建用户
+     *
+     * @param createdBy 创建用户
+     */
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return lastUpdated - 创建时间
+     */
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param lastUpdated 创建时间
+     */
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    /**
+     * 获取更新用户
+     *
+     * @return lastUpdatedBy - 更新用户
+     */
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    /**
+     * 设置更新用户
+     *
+     * @param lastUpdatedBy 更新用户
+     */
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+
+    /**
+     * 获取数据版本
+     *
+     * @return version - 数据版本
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置数据版本
+     *
+     * @param version 数据版本
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取自定义字段1-robot交互用字段
+     *
+     * @return userDef1 - 自定义字段1-robot交互用字段
+     */
+    public String getUserDef1() {
+        return userDef1;
+    }
+
+    /**
+     * 设置自定义字段1-robot交互用字段
+     *
+     * @param userDef1 自定义字段1-robot交互用字段
+     */
+    public void setUserDef1(String userDef1) {
+        this.userDef1 = userDef1;
+    }
+
+    /**
+     * 获取自定义字段2
+     *
+     * @return userDef2 - 自定义字段2
+     */
+    public String getUserDef2() {
+        return userDef2;
+    }
+
+    /**
+     * 设置自定义字段2
+     *
+     * @param userDef2 自定义字段2
+     */
+    public void setUserDef2(String userDef2) {
+        this.userDef2 = userDef2;
+    }
+
+    /**
+     * 获取自定义字段3
+     *
+     * @return userDef3 - 自定义字段3
+     */
+    public String getUserDef3() {
+        return userDef3;
+    }
+
+    /**
+     * 设置自定义字段3
+     *
+     * @param userDef3 自定义字段3
+     */
+    public void setUserDef3(String userDef3) {
+        this.userDef3 = userDef3;
+    }
+
+    /**
+     * 获取自定义字段4
+     *
+     * @return userDef4 - 自定义字段4
+     */
+    public String getUserDef4() {
+        return userDef4;
+    }
+
+    /**
+     * 设置自定义字段4
+     *
+     * @param userDef4 自定义字段4
+     */
+    public void setUserDef4(String userDef4) {
+        this.userDef4 = userDef4;
+    }
+
+    /**
+     * 获取自定义字段5
+     *
+     * @return userDef5 - 自定义字段5
+     */
+    public String getUserDef5() {
+        return userDef5;
+    }
+
+    /**
+     * 设置自定义字段5
+     *
+     * @param userDef5 自定义字段5
+     */
+    public void setUserDef5(String userDef5) {
+        this.userDef5 = userDef5;
+    }
+
+    /**
+     * 获取自定义字段6
+     *
+     * @return userDef6 - 自定义字段6
+     */
+    public String getUserDef6() {
+        return userDef6;
+    }
+
+    /**
+     * 设置自定义字段6
+     *
+     * @param userDef6 自定义字段6
+     */
+    public void setUserDef6(String userDef6) {
+        this.userDef6 = userDef6;
+    }
+
+    /**
+     * 获取自定义字段7
+     *
+     * @return userDef7 - 自定义字段7
+     */
+    public String getUserDef7() {
+        return userDef7;
+    }
+
+    /**
+     * 设置自定义字段7
+     *
+     * @param userDef7 自定义字段7
+     */
+    public void setUserDef7(String userDef7) {
+        this.userDef7 = userDef7;
+    }
+
+    /**
+     * 获取自定义字段8
+     *
+     * @return userDef8 - 自定义字段8
+     */
+    public String getUserDef8() {
+        return userDef8;
+    }
+
+    /**
+     * 设置自定义字段8
+     *
+     * @param userDef8 自定义字段8
+     */
+    public void setUserDef8(String userDef8) {
+        this.userDef8 = userDef8;
+    }
+
+    /**
+     * 获取处理标记
+     *
+     * @return processStamp - 处理标记
+     */
+    public String getProcessStamp() {
+        return processStamp;
+    }
+
+    /**
+     * 设置处理标记
+     *
+     * @param processStamp 处理标记
+     */
+    public void setProcessStamp(String processStamp) {
+        this.processStamp = processStamp;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", name=").append(name);
+        sb.append(", warehouseCode=").append(warehouseCode);
+        sb.append(", companyCode=").append(companyCode);
+        sb.append(", enable=").append(enable);
+        sb.append(", sequence=").append(sequence);
+        sb.append(", emptyWeight=").append(emptyWeight);
+        sb.append(", length=").append(length);
+        sb.append(", width=").append(width);
+        sb.append(", height=").append(height);
+        sb.append(", weight=").append(weight);
+        sb.append(", maxWeight=").append(maxWeight);
+        sb.append(", fillPercent=").append(fillPercent);
+        sb.append(", useAsDEFAULT=").append(useAsDEFAULT);
+        sb.append(", status=").append(status);
+        sb.append(", created=").append(created);
+        sb.append(", createdBy=").append(createdBy);
+        sb.append(", lastUpdated=").append(lastUpdated);
+        sb.append(", lastUpdatedBy=").append(lastUpdatedBy);
+        sb.append(", version=").append(version);
+        sb.append(", userDef1=").append(userDef1);
+        sb.append(", userDef2=").append(userDef2);
+        sb.append(", userDef3=").append(userDef3);
+        sb.append(", userDef4=").append(userDef4);
+        sb.append(", userDef5=").append(userDef5);
+        sb.append(", userDef6=").append(userDef6);
+        sb.append(", userDef7=").append(userDef7);
+        sb.append(", userDef8=").append(userDef8);
+        sb.append(", processStamp=").append(processStamp);
+        sb.append("]");
+        return sb.toString();
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.config.containerType.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+
+public interface ContainerTypeMapper extends BaseMapper<ContainerType> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.containerType.service;
+
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface ContainerTypeService extends IService<ContainerType>{
+
+    public Boolean checkConfig(String code);
+}
+package com.huaheng.pc.config.containerType.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.mapper.ContainerTypeMapper;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+@Service
+public class ContainerTypeServiceImpl extends ServiceImpl<ContainerTypeMapper, ContainerType> implements ContainerTypeService{
+
+    @Override
+    public Boolean checkConfig(String code) {
+        LambdaQueryWrapper<ContainerType> lambda = Wrappers.lambdaQuery();
+        lambda.eq(ContainerType::getWarehouseCode, ShiroUtils.getWarehouseCode())
+            .eq(ContainerType::getCode, code);
+        return this.count(lambda) != 0;
+    }
+}
+package com.huaheng.pc.config.locationType.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+import com.huaheng.pc.general.location.service.LocationService;
+import com.huaheng.pc.config.locationType.service.LocationTypeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+@Controller
+@RequestMapping("/config/locationType")
+public class LocationTypeController extends BaseController {
+
+    private String prefix = "config/locationType";
+
+    @Resource
+    private LocationTypeService locationTypeService;
+    @Resource
+    private LocationService locationService;
+
+    @RequestMapping("config:locationType:view")
+    @GetMapping
+    public String locationType() {
+        return prefix + "/location";
+    }
+
+    /**
+     * 查询库位类型列表
+     */
+    @RequiresPermissions("config:locationType:list")
+    @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(LocationType locationType)  {
+        LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /**
+             * 使用分页查询
+             */
+            Page<LocationType> page = new Page<>(pageNum, pageSize);
+            IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
+            return getDataTable(iPage.getRecords());
+        } else {
+            List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增库位类型
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存库位类型
+     */
+    @RequiresPermissions("config:locationType:add")
+    @Log(title = "通用-库位类型管理", operating = "新增库位类型", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(LocationType locationType)  {
+        Boolean result = locationTypeService.save(locationType);
+        return toAjax(result);
+    }
+
+    /**
+     * 修改库位类型
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        LocationType locationType = locationTypeService.getById(id);
+        mmap.put("locationType", locationType);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存库位类型
+     */
+    @RequiresPermissions("config:locationType:edit")
+    @Log(title = "通用-库位类型管理", operating = "修改库位类型", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(LocationType locationType) {
+        locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
+        Boolean result = locationTypeService.updateById(locationType);
+        return toAjax(result);
+    }
+
+    /**
+     * 删除库位
+     */
+    @RequiresPermissions("config:locationType:remove")
+    @Log(title = "通用-库位类型管理", operating = "删除库位类型", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+
+        for (Integer id : Convert.toIntArray(ids)) {
+            LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(Location::getLocationType,id);
+
+            int count = locationService.count(lambdaQueryWrapper);
+            if (count != 0){
+                return AjaxResult.error("库位类型id="+id+",存在库位，不能删除。");
+            }
+        }
+        List<Integer> list = Arrays.asList(Convert.toIntArray(ids));
+        locationTypeService.removeByIds(list);
+        return AjaxResult.success("删除成功！");
+    }
+}
+package com.huaheng.pc.config.locationType.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "location_type")
+public class LocationType implements Serializable {
+    /**
+     * 内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 货位类型
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    private String warehouseCode;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 长
+     */
+    @TableField(value = "length")
+    private Integer length;
+
+    /**
+     * 宽
+     */
+    @TableField(value = "width")
+    private Integer width;
+
+    /**
+     * 高
+     */
+    @TableField(value = "height")
+    private Integer height;
+
+    /**
+     * 最大重量
+     */
+    @TableField(value = "maxWeight")
+    private Integer maxWeight;
+
+    /**
+     * 最小允许单位
+     */
+    @TableField(value = "minQtyUm")
+    private String minQtyUm;
+
+    /**
+     * 校验位
+     */
+    @TableField(value = "checkDigit")
+    private String checkDigit;
+
+    /**
+     * 最多混放物料数
+     */
+    @TableField(value = "maxMaterials")
+    private Integer maxMaterials;
+
+    /**
+     * 最大批号数量
+     */
+    @TableField(value = "maxLots")
+    private Integer maxLots;
+
+    /**
+     * 最大允许托盘数
+     */
+    @TableField(value = "maxContainers")
+    private Integer maxContainers;
+
+    /**
+     * 有效
+     */
+    @TableField(value = "enable")
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    private Date created;
+
+    /**
+     * 创建者
+     */
+    @TableField(value = "createdBy")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    private Date lastUpdated;
+
+    /**
+     * 更新者
+     */
+    @TableField(value = "lastUpdatedBy")
+    private String lastUpdatedBy;
+
+    /**
+     * 处理类型
+     */
+    @TableField(value = "processStamp")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_LENGTH = "length";
+
+    public static final String COL_WIDTH = "width";
+
+    public static final String COL_HEIGHT = "height";
+
+    public static final String COL_MAXWEIGHT = "maxWeight";
+
+    public static final String COL_MINQTYUM = "minQtyUm";
+
+    public static final String COL_CHECKDIGIT = "checkDigit";
+
+    public static final String COL_MAXMATERIALS = "maxMaterials";
+
+    public static final String COL_MAXLOTS = "maxLots";
+
+    public static final String COL_MAXCONTAINERS = "maxContainers";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+}
 \ No newline at end of file
+package com.huaheng.pc.config.locationType.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+
+public interface LocationTypeMapper extends BaseMapper<LocationType> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.locationType.service;
+
+import com.huaheng.pc.config.locationType.domain.LocationType;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface LocationTypeService extends IService<LocationType>{
+
+
+}
+package com.huaheng.pc.config.locationType.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.locationType.mapper.LocationTypeMapper;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+
+@Service
+public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{
+
+}
@@ -52,7 +52,7 @@ public class ZoneController extends BaseController {
         LambdaQueryWrapper<Zone> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize() >> 1;  //除2
+        Integer pageSize = pageDomain.getPageSize();
  
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Zone::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), Zone::getCreated, createdEnd)
@@ -56,7 +56,7 @@ public class CompanyController extends BaseController {
         LambdaQueryWrapper<Company> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize() >> 1;  //除2
+        Integer pageSize = pageDomain.getPageSize();
  
         lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Company::getCreated, createdBegin)
                 .lt(StringUtils.isNotEmpty(createdEnd), Company::getCreated, createdEnd)
+package com.huaheng.pc.general.container.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.container.domain.Container;
+import com.huaheng.pc.general.container.service.ContainerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags={"容器操作类"})
+@Controller
+@RequestMapping("/general/container")
+public class ContainerController extends BaseController {
+
+    private String prefix = "general/container";
+
+    @Resource
+    private ContainerService containerService;
+
+    @RequiresPermissions("general:container:view")
+    @GetMapping()
+    public String container() {
+        return prefix + "/container";
+    }
+
+    /**
+     * 查询库位列表
+     */
+    @ApiOperation(value="查看容器列表",
+            notes="根据容器编号、库位编码、容器状态、容器类型、创建时间获取库位的详细信息",
+            httpMethod = "POST")
+    @RequiresPermissions("general:location:list")
+    @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="location",value="容器编号、库位编码、容器状态、容器类型") Container container,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Container::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Container::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(container.getCode()), Container::getCode, container.getCode())
+                .eq(StringUtils.isNotEmpty(container.getStatus()), Container::getStatus, container.getStatus())
+                .eq(StringUtils.isNotEmpty(container.getContainerType()), Container::getContainerType, container.getContainerType())
+                .eq(StringUtils.isNotEmpty(container.getWarehouseCode()), Container::getWarehouseCode, container.getWarehouseCode())
+                .eq(StringUtils.isNotEmpty(container.getLocationCode()), Container::getLocationCode, container.getLocationCode())
+                .eq(Container::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(Container::getDeleted,false)
+                .orderByDesc(Container::getCreated);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Container> page = new Page<>(pageNum, pageSize);
+            IPage<Container> iPage = containerService.page(page, lambdaQueryWrapper);
+            return getDataTable(iPage.getRecords());
+        } else {
+            List<Container> list = containerService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增容器
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存容器
+     */
+    @ApiOperation(value="新增容器", notes="根据容器类型、数量批量新增容器", httpMethod = "POST")
+    @RequiresPermissions("general:container:add")
+    @Log(title = "通用-容器", operating = "新增容器", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(
+            @ApiParam(name = "containerType", value = "容器类型", required = true)String containerType,
+            @ApiParam(name = "quantity", value = "数量", required = true)Integer quantity)  {
+        AjaxResult result = containerService.insertContainer(containerType, quantity);
+        result.setData(null);
+        return result;
+    }
+
+    /**
+     * 修改容器
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        Container container = containerService.getById(id);
+        mmap.put("container", container);
+        return prefix + "/edit";
+    }
+
+    /**
+	 * 修改保存容器
+	 */
+    @ApiOperation(value="修改容器", notes="修改容器", httpMethod = "POST")
+	@RequiresPermissions("general:container:edit")
+	@Log(title = "通用-容器", operating = "修改容器", action = BusinessType.UPDATE)
+	@PostMapping("/edit")
+	@ResponseBody
+	public AjaxResult editSave(
+	        @ApiParam(name = "Container", value = "容器实体", required = true)Container container) {
+		return toAjax(containerService.updateById(container));
+	}
+
+    /**
+     * 删除容器
+     */
+    @ApiOperation(value="删除容器", notes="根据id批量删除容器，参数示例1,2,3", httpMethod = "POST")
+    @RequiresPermissions("general:container:remove")
+    @Log(title = "通用-容器", operating = "删除容器", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+
+        for (Integer id : Convert.toIntArray(ids)) {
+            Container container = containerService.getById(id);
+            if (container.getStatus().equals("empty") && StringUtils.isEmpty(container.getLocationCode())) {
+                container.setDeleted(true);
+                container.setLastUpdatedBy(ShiroUtils.getLoginName());
+                containerService.updateById(container);
+            } else {
+                return AjaxResult.error("容器(" + container.getCode() + ")不是空，或者已在货架上，不能删除成功！");
+            }
+        }
+        return AjaxResult.success("删除成功！");
+    }
+}
+package com.huaheng.pc.general.container.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value="com.huaheng.pc.general.container.domain.Container")
+@TableName(value = "container")
+public class Container implements Serializable {
+    /**
+     * 内部号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="内部号")
+    private Integer id;
+
+    /**
+     * 容器名字
+     */
+    @TableField(value = "name")
+    @ApiModelProperty(value="容器名字")
+    private String name;
+
+    /**
+     * 容器编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="容器编码")
+    private String code;
+
+    /**
+     * 仓库代码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库代码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    @TableField(value = "locationCode")
+    @ApiModelProperty(value = "库位编码")
+    private String locationCode;
+
+    /**
+     * 容器类型
+     */
+    @TableField(value = "containerType")
+    @ApiModelProperty(value="容器类型")
+    private String containerType;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建人")
+    private String createdBy;
+
+    /**
+     * 最后更新时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="最后更新时间")
+    private Date lastUpdated;
+
+    /**
+     * 最后更新人
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="最后更新人")
+    private String lastUpdatedBy;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态")
+    private String status;
+
+    /**
+     * 启用；0—禁用
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="启用；0—禁用")
+    private Integer enable;
+
+    /**
+     * 打印次数
+     */
+    @TableField(value = "printNum")
+    @ApiModelProperty(value="打印次数")
+    private Integer printNum;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_CONTAINERTYPE = "containerType";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_PRINTNUM = "printNum";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", code=").append(code);
+        sb.append(", warehouseCode=").append(warehouseCode);
+        sb.append(", companyCode=").append(companyCode);
+        sb.append(", containerType=").append(containerType);
+        sb.append(", created=").append(created);
+        sb.append(", createdBy=").append(createdBy);
+        sb.append(", lastUpdated=").append(lastUpdated);
+        sb.append(", lastUpdatedBy=").append(lastUpdatedBy);
+        sb.append(", status=").append(status);
+        sb.append(", enable=").append(enable);
+        sb.append(", printNum=").append(printNum);
+        sb.append(", version=").append(version);
+        sb.append(", userDef1=").append(userDef1);
+        sb.append(", userDef2=").append(userDef2);
+        sb.append(", userDef3=").append(userDef3);
+        sb.append(", userDef4=").append(userDef4);
+        sb.append(", userDef5=").append(userDef5);
+        sb.append(", userDef6=").append(userDef6);
+        sb.append(", userDef7=").append(userDef7);
+        sb.append(", userDef8=").append(userDef8);
+        sb.append(", processStamp=").append(processStamp);
+        sb.append("]");
+        return sb.toString();
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.general.container.domain;
+
+public enum  ContainerStatus {
+    empty,
+    some,
+    full;
+}
+package com.huaheng.pc.general.container.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.general.container.domain.Container;
+
+public interface ContainerMapper extends BaseMapper<Container> {
+
+}
 \ No newline at end of file
+package com.huaheng.pc.general.container.service;
+
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.general.container.domain.Container;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface ContainerService extends IService<Container>{
+
+    public AjaxResult<List<Container>> insertContainer(String type, Integer quantity);
+}
+package com.huaheng.pc.general.container.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+import com.huaheng.pc.general.container.domain.ContainerStatus;
+import org.apache.commons.collections.functors.ConstantFactory;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.general.container.domain.Container;
+import com.huaheng.pc.general.container.mapper.ContainerMapper;
+import com.huaheng.pc.general.container.service.ContainerService;
+@Service
+public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
+
+    @Resource
+    private ContainerTypeService containerTypeService;
+    @Resource
+    private ContainerMapper containerMapper;
+
+    @Override
+    public AjaxResult<List<Container>> insertContainer(String type, Integer quantity) {
+        List<Container>  containerList = new ArrayList<>();
+        Integer number = getNumber(type);
+        for(int i=0; i<quantity; i++) {
+            number++;
+            Container container = new Container();
+            container.setId(null);
+            container.setContainerType(type);
+            container.setCode(String.format("%s%05d", type, number));
+            container.setStatus(ContainerStatus.empty.name());
+            container.setCreated(new Date());
+            container.setCreatedBy(ShiroUtils.getLoginName());
+            container.setLastUpdated(null);
+            container.setLastUpdatedBy(null);
+            container.setEnable(0);
+            container.setDeleted(false);
+            container.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            this.save(container);
+            containerList.add(container);
+        }
+        return AjaxResult.success(containerList);
+    }
+
+    private Integer getNumber(String type) {
+        if (!containerTypeService.checkConfig(type))
+            throw new ServiceException("容器类型编码不存在");
+        LambdaQueryWrapper<Container> lambda = Wrappers.lambdaQuery();
+        lambda.select(Container::getCode).eq(Container::getContainerType, type)
+            .orderByDesc(Container::getId).last("Limit 1");
+        String maxCode = containerMapper.selectOne(lambda).getCode();
+
+        //如果指定类型的最后的code存在，那么 code = 容器类型 + (排序号 + 1)
+        if (maxCode != null) {
+            Integer number = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
+            return  number;
+        } else {
+            return  0;
+        }
+    }
+}
+package com.huaheng.pc.general.customer.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.customer.domain.Customer;
+import com.huaheng.pc.general.customer.service.CustomerService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags={"客户操作类"})
+@Controller
+@RequestMapping("/general/customer")
+public class CustomerController extends BaseController {
+
+    private String prefix = "general/customer";
+
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private ShipmentHeaderService shipmentHeaderService;
+
+    @RequiresPermissions("general:customer:view")
+    @GetMapping()
+    public String customer(){
+        return prefix + "/customer";
+    }
+
+    /**
+     * 查询客户列表
+     */
+    @ApiOperation(value="查看客户列表", notes="根据编码、名称、创建时间获取客户的详细信息", httpMethod = "POST")
+    @RequiresPermissions("general:customer:list")
+    @Log(title = "通用-客户管理",operating = "查看客户信息", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(@ApiParam(name="customer",value="编码、名称")Customer customer,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd){
+        LambdaQueryWrapper<Customer> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize() >> 1;
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Customer::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Customer::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(customer.getCode()), Customer::getCode, customer.getCode())
+                .eq(StringUtils.isNotEmpty(customer.getName()), Customer::getName, customer.getName())
+                .eq(Customer::getDeleted, false)
+                .eq(Customer::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .orderByDesc(Customer::getCreated);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Customer> page = new Page<>(pageNum, pageSize);
+            IPage<Customer> iPage = customerService.page(page, lambdaQueryWrapper);
+            return getDataTable(iPage.getRecords());
+        } else {
+            List<Customer> list = customerService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增客户
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存客户
+     */
+    @ApiOperation(value="新增客户", notes="新增客户", httpMethod = "POST")
+    @RequiresPermissions("general:customer:add")
+    @Log(title = "通用-客户管理",operating = "新增客户", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Customer customer) {
+        customer.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        customer.setCreatedBy(ShiroUtils.getLoginName());
+        customer.setLastUpdatedBy(ShiroUtils.getLoginName());
+        customer.setDeleted(false);
+        return toAjax(customerService.save(customer));
+    }
+
+    /**
+     * 修改客户
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        Customer customer = customerService.getById(id);
+        mmap.put("customer", customer);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存客户
+     */
+    @ApiOperation(value="修改客户信息", notes="修改客户信息", httpMethod = "POST")
+    @RequiresPermissions("general:customer:edit")
+    @Log(title = "通用-客户管理",operating = "修改客户信息", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Customer customer) {
+        customer.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(customerService.updateById(customer));
+    }
+
+    /**
+     * 删除客户
+     */
+    @ApiOperation(value="删除客户信息", notes="单条删除或批量删除客户信息，示例1或1,2,3", httpMethod = "POST")
+    @RequiresPermissions("general:customer:remove")
+    @Log(title = "通用-客户管理",operating = "修改客户", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
+
+        for (Integer id : Convert.toIntArray(ids)) {
+            Customer customer = customerService.getById(id);
+            ShipmentHeader shipmentHeader = new ShipmentHeader();
+            shipmentHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            shipmentHeader.setCustomerCode(customer.getCode());
+            shipmentHeader.setDeleted(false);
+            LambdaQueryWrapper<ShipmentHeader> lambda = Wrappers.lambdaQuery(shipmentHeader);
+
+            Map<String, Object> map = shipmentHeaderService.getMap(lambda);
+            if (map != null) {
+                return AjaxResult.error("客户编码(" + customer.getCode() +")存在出库单，不能删除！");
+            }
+            customer.setDeleted(true);
+            customer.setLastUpdatedBy(ShiroUtils.getLoginName());
+            customerService.updateById(customer);
+        }
+        return AjaxResult.success("删除成功！");
+    }
+}
+package com.huaheng.pc.general.customer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.general.customer.domain.Customer")
+@Data
+@TableName(value = "customer")
+public class Customer implements Serializable {
+    /**
+     * 客户内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="客户内部号")
+    private Integer id;
+
+    /**
+     * 客户ID
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="客户ID")
+    private String code;
+
+    /**
+     * 配送点代码
+     */
+    @TableField(value = "shipToCode")
+    @ApiModelProperty(value="配送点代码")
+    private String shipToCode;
+
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="null")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @ApiModelProperty(value="名称")
+    private String name;
+
+    /**
+     * 地址1
+     */
+    @TableField(value = "address1")
+    @ApiModelProperty(value="地址1")
+    private String address1;
+
+    /**
+     * 地址2
+     */
+    @TableField(value = "address2")
+    @ApiModelProperty(value="地址2")
+    private String address2;
+
+    /**
+     * 城市
+     */
+    @TableField(value = "city")
+    @ApiModelProperty(value="城市")
+    private String city;
+
+    /**
+     * 省份
+     */
+    @TableField(value = "province")
+    @ApiModelProperty(value="省份")
+    private String province;
+
+    /**
+     * 国家
+     */
+    @TableField(value = "country")
+    @ApiModelProperty(value="国家")
+    private String country;
+
+    /**
+     * 邮编
+     */
+    @TableField(value = "postalCode")
+    @ApiModelProperty(value="邮编")
+    private String postalCode;
+
+    /**
+     * 父
+     */
+    @TableField(value = "parent")
+    @ApiModelProperty(value="父")
+    private Integer parent;
+
+    /**
+     * 联系人
+     */
+    @TableField(value = "attentionTo")
+    @ApiModelProperty(value="联系人")
+    private String attentionTo;
+
+    /**
+     * 电话
+     */
+    @TableField(value = "phoneNum")
+    @ApiModelProperty(value="电话")
+    private String phoneNum;
+
+    @TableField(value = "mobile")
+    @ApiModelProperty(value="null")
+    private String mobile;
+
+    /**
+     * 传真
+     */
+    @TableField(value = "faxNum")
+    @ApiModelProperty(value="传真")
+    private String faxNum;
+
+    /**
+     * E-mail
+     */
+    @TableField(value = "email")
+    @ApiModelProperty(value="E-mail")
+    private String email;
+
+    /**
+     * 有效
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="有效")
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 发票开票人
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="发票开票人")
+    private String userDef1;
+
+    /**
+     * 发票收款人
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="发票收款人")
+    private String userDef2;
+
+    /**
+     * 开票单位
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="开票单位")
+    private String userDef3;
+
+    /**
+     * 发票代码
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="发票代码")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    @TableField(value = "deleted")
+    @ApiModelProperty(value="是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_SHIPTOCODE = "shipToCode";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_ADDRESS1 = "address1";
+
+    public static final String COL_ADDRESS2 = "address2";
+
+    public static final String COL_CITY = "city";
+
+    public static final String COL_PROVINCE = "province";
+
+    public static final String COL_COUNTRY = "country";
+
+    public static final String COL_POSTALCODE = "postalCode";
+
+    public static final String COL_PARENT = "parent";
+
+    public static final String COL_ATTENTIONTO = "attentionTo";
+
+    public static final String COL_PHONENUM = "phoneNum";
+
+    public static final String COL_MOBILE = "mobile";
+
+    public static final String COL_FAXNUM = "faxNum";
+
+    public static final String COL_EMAIL = "email";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+}
 \ No newline at end of file
+package com.huaheng.pc.general.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.general.customer.domain.Customer;
+
+public interface CustomerMapper extends BaseMapper<Customer> {
+}
 \ No newline at end of file
+package com.huaheng.pc.general.customer.service;
+
+import com.huaheng.pc.general.customer.domain.Customer;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface CustomerService extends IService<Customer>{
+
+
+}
+package com.huaheng.pc.general.customer.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.general.customer.mapper.CustomerMapper;
+import com.huaheng.pc.general.customer.domain.Customer;
+import com.huaheng.pc.general.customer.service.CustomerService;
+@Service
+public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService{
+
+}
+package com.huaheng.pc.general.location.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.general.location.service.LocationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags={"库位操作类"})
+@Controller
+@RequestMapping("/general/location")
+public class LocationController extends BaseController {
+
+    private String prefix = "general/location";
+    
+    @Resource
+    private LocationService locationService;
+
+    @RequiresPermissions("general:location:view")
+    @GetMapping()
+    public String location() {
+        return prefix + "/location";
+    }
+
+    /**
+     * 查询库位列表
+     */
+    @ApiOperation(value="查看库位列表",
+            notes="根据行、列、层、格、库位类型、库区、库位状态、容器编码、库位名称、库位编码、创建时间获取库位的详细信息",
+            httpMethod = "POST")
+    @RequiresPermissions("general:location:list")
+    @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="location",value="行、列、层、格、库位类型、库区、库位状态、容器编码、库位名称、库位编码") Location location,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Location::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Location::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(location.getCode()), Location::getCode, location.getCode())
+                .eq(StringUtils.isNotEmpty(location.getName()), Location::getName,location.getName())
+                .eq(StringUtils.isNotEmpty(location.getContainerCode()), Location::getContainerCode, location.getContainerCode())
+                .eq(StringUtils.isNotNull(location.getEnable()), Location::getEnable, location.getEnable())
+                .eq(StringUtils.isNotEmpty(location.getZoneCode()), Location::getZoneCode, location.getZoneCode())
+                .eq(StringUtils.isNotNull(location.getIRow()), Location::getIRow, location.getIRow())
+                .eq(StringUtils.isNotNull(location.getIColumn()), Location::getIColumn, location.getIColumn())
+                .eq(StringUtils.isNotNull(location.getIGrid()), Location::getIGrid, location.getIGrid())
+                .eq(StringUtils.isNotNull(location.getILayer()), Location::getILayer, location.getILayer())
+                .eq(StringUtils.isNotEmpty(location.getLocationType()), Location::getLocationType, location.getLocationType())
+                .eq(Location::getDeleted,false)
+                .orderByDesc(Location::getCreated);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Location> page = new Page<>(pageNum, pageSize);
+            IPage<Location> iPage = locationService.page(page, lambdaQueryWrapper);
+            return getDataTable(iPage.getRecords());
+        } else {
+            List<Location> list = locationService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增库位
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存库位
+     */
+    @ApiOperation(value="新增库位", notes="新增单个库位", httpMethod = "POST")
+    @RequiresPermissions("general:location:add")
+    @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Location location)  {
+        Boolean result = locationService.save(location);
+        return toAjax(result);
+    }
+
+
+    /**
+     * 批量新增库位
+     */
+
+    @GetMapping("/addBatch")
+    public String addBatch()
+    {
+        return prefix + "/addBatch";
+    }
+
+    /**
+     * 批量新增保存库位
+     */
+    @RequiresPermissions("general:location:add")
+    @ApiOperation(value="新增库位", notes="批量新增库位", httpMethod = "POST")
+    @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
+    @PostMapping("/addBatchSave")
+    @ResponseBody
+    public AjaxResult addBatchSave(Location lastLocation)  {
+        return toAjax(locationService.insertLocation(lastLocation));
+    }
+
+    /**
+     * 修改库位
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        mmap.put("location", locationService.getById(id));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存库位
+     */
+    @RequiresPermissions("general:location:edit")
+    @ApiOperation(value="修改库位", notes="批量修改库位", httpMethod = "POST")
+    @Log(title = "通用-库位管理", operating = "修改库位", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Location location) {
+        location.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(locationService.updateById(location));
+    }
+
+    /**
+     * 删除库位
+     */
+    @RequiresPermissions("general:location:remove")
+    @Log(title = "通用-库位管理", operating = "删除库位", action = BusinessType.DELETE)
+    @ApiOperation(value="删除库位", notes="批量删除库位", httpMethod = "POST")
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("id不能为空");
+        for (Integer id : Convert.toIntArray(ids)) {
+            Location location = locationService.getById(id);
+            if (StringUtils.isEmpty(location.getContainerCode())) {
+                location.setDeleted(true);
+                location.setLastUpdatedBy(ShiroUtils.getLoginName());
+                locationService.updateById(location);
+            }
+            else    {
+                return AjaxResult.error("库位(" + location.getCode() + ")不是空，或者有容器，不能删除成功！");
+            }
+        }
+        return AjaxResult.success("删除成功！");
+    }
+}
+package com.huaheng.pc.general.location.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "location")
+public class Location implements Serializable {
+    /**
+     * ID
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 货位
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    private String warehouseCode;
+
+    /**
+     * 区域
+     */
+    @TableField(value = "zoneCode")
+    private String zoneCode;
+
+    /**
+     * 货位类型
+     */
+    @TableField(value = "locationType")
+    private String locationType;
+
+    /**
+     * 容器编码
+     */
+    @TableField(value = "containerCode")
+    private String containerCode;
+
+    /**
+     * 行
+     */
+    @TableField(value = "iRow")
+    private Integer iRow;
+
+    /**
+     * 列
+     */
+    @TableField(value = "iColumn")
+    private Integer iColumn;
+
+    /**
+     * 层
+     */
+    @TableField(value = "iLayer")
+    private Integer iLayer;
+
+    /**
+     * 格
+     */
+    @TableField(value = "iGrid")
+    private Integer iGrid;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "enable")
+    private Integer enable;
+
+    /**
+     * 上次盘点日期
+     */
+    @TableField(value = "lastCycleCountDate")
+    private Date lastCycleCountDate;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    private String userDef8;
+
+    @TableField(value = "systemCreated")
+    private Integer systemCreated;
+
+    @TableField(value = "deleted")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_ZONECODE = "zoneCode";
+
+    public static final String COL_LOCATIONTYPE = "locationType";
+
+    public static final String COL_CONTAINERCODE = "containerCode";
+
+    public static final String COL_IROW = "iRow";
+
+    public static final String COL_ICOLUMN = "iColumn";
+
+    public static final String COL_ILAYER = "iLayer";
+
+    public static final String COL_IGRID = "iGrid";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_LASTCYCLECOUNTDATE = "lastCycleCountDate";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_SYSTEMCREATED = "systemCreated";
+}
 \ No newline at end of file
+package com.huaheng.pc.general.location.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.general.location.domain.Location;
+
+public interface LocationMapper extends BaseMapper<Location> {
+}
 \ No newline at end of file
+package com.huaheng.pc.general.location.service;
+
+import com.huaheng.pc.general.location.domain.Location;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface LocationService extends IService<Location>{
+
+    boolean insertLocation(Location location);
+
+}
+package com.huaheng.pc.general.location.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+import com.huaheng.pc.config.locationType.service.LocationTypeService;
+import com.huaheng.pc.config.zone.domain.Zone;
+import com.huaheng.pc.config.zone.service.ZoneService;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.general.location.mapper.LocationMapper;
+import com.huaheng.pc.general.location.service.LocationService;
+@Service
+public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService{
+
+    @Resource
+    private LocationService locationService;
+    @Resource
+    private LocationTypeService locationTypeService;
+    @Resource
+    private ZoneService zoneService;
+
+    @Override
+    public boolean insertLocation(Location location) {
+        /* 判断库位类型编码是否存在*/
+        LambdaQueryWrapper<LocationType> typelambda = Wrappers.lambdaQuery();
+        typelambda.eq(LocationType::getCode,location.getLocationType())
+                        .select(LocationType::getCode);
+        List<Map<String, Object>> list = locationTypeService.listMaps(typelambda);
+        if (list.size() < 1){
+            throw new ServiceException("库位类型编码不存在");
+        }
+
+        /* 判断库区编码是否存在*/
+        LambdaQueryWrapper<Zone> zoneLambda= Wrappers.lambdaQuery();
+        zoneLambda.eq(Zone::getCode, location.getZoneCode())
+                .select(Zone::getCode);
+
+        list = zoneService.listMaps(zoneLambda);
+        if (list.size() < 1){
+            throw new ServiceException("库区编码不存在");
+        }
+
+
+        List<Location> locations = new ArrayList<>();
+        for (int i=1; i<=location.getIRow().intValue(); i++)  {
+            for (int j=1; j<=location.getIColumn().intValue(); j++)  {
+                for (int k=1; k<=location.getILayer().intValue(); k++)  {
+                    for (int m=1; m<=location.getIGrid().intValue(); m++)  {
+                        //Integer roadway = (j / 2) + 1;
+                        Location param = new Location();
+                        param.setIRow(i);
+                        param.setIColumn(j);
+                        param.setILayer(k);
+                        param.setIGrid(m);
+                        param.setZoneCode(location.getZoneCode());
+                        param.setLocationType(location.getLocationType());
+                        param.setEnable(location.getEnable());
+
+
+                        String code = MessageFormat.format("{0}{1}-{2}-{3}-{4}",
+                                location.getLocationType(),
+                                String.format("%02d", location.getIRow()),
+                                String.format("%02d", location.getIColumn()),
+                                String.format("%02d", location.getILayer()),
+                                String.format("%02d", location.getIGrid()));
+                        QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
+                        if (locationService.list(queryWrapper.eq("code", code)) != null){
+                            return true;
+                        } else {
+                            param.setCode(code);
+                            location.setWarehouseCode(ShiroUtils.getWarehouseCode());
+                            location.setCreatedBy(ShiroUtils.getLoginName());
+                            location.setLastUpdatedBy(ShiroUtils.getLoginName());
+                        }
+                        param.setCode(code);
+                        locations.add(param);
+                    }
+                }
+            }
+        }
+
+        return locationService.saveBatch(locations);
+    }
+}
+package com.huaheng.pc.general.supplier.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.general.supplier.domain.Supplier;
+import com.huaheng.pc.general.supplier.service.SupplierService;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags={"供应商操作类"})
+@Controller
+@RequestMapping("/general/supplier")
+public class SupplierController extends BaseController {
+
+    private String prefix = "general/supplier";
+
+    @Resource
+    private SupplierService supplierService;
+    @Resource
+    private ReceiptDetailService receiptDetailService;
+
+    @RequiresPermissions("general:supplier:view")
+    @GetMapping()
+    public String supplier() {
+        return prefix + "/supplier";
+    }
+
+    /**
+     * 查询供应商列表
+     */
+    @ApiOperation(value="查询供应商列表", notes="根据编码、名称、创建时间获取库位的详细信息", httpMethod = "POST")
+    @RequiresPermissions("general:supplier:list")
+    @Log(title = "通用-供应商管理", operating = "查看供应商列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(@ApiParam(name = "supplier", value = "编码、名称")Supplier supplier,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<Supplier> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Supplier::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Supplier::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(supplier.getCode()), Supplier::getCode, supplier.getCode())
+                .eq(StringUtils.isNotEmpty(supplier.getName()), Supplier::getName, supplier.getName())
+                .eq(Supplier::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(Supplier::getDeleted,false)
+                .orderByDesc(Supplier::getCreated);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Supplier> page = new Page<>(pageNum, pageSize);
+            IPage<Supplier> iPage = supplierService.page(page, lambdaQueryWrapper);
+            return getDataTable(iPage.getRecords());
+        } else {
+            List<Supplier> list = supplierService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增供应商
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存供应商
+     */
+    @ApiOperation(value="新增供应商", notes="新增供应商", httpMethod = "POST")
+    @RequiresPermissions("general:supplier:add")
+    @Log(title = "通用-供应商管理", operating = "新增供应商", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Supplier supplier) {
+        supplier.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        supplier.setCreatedBy(ShiroUtils.getLoginName());
+        supplier.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(supplierService.save(supplier));
+    }
+
+    /**
+     * 修改供应商
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+    {
+        Supplier supplier = supplierService.getById(id);
+        mmap.put("supplier", supplier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存供应商
+     */
+    @ApiOperation(value="修改供应商", notes="修改供应商", httpMethod = "POST")
+    @RequiresPermissions("general:supplier:edit")
+    @Log(title = "通用-供应商管理", operating = "修改供应商", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(@ApiParam(name = "Supplier", value = "供应商") Supplier supplier) {
+        supplier.setEnable(1);
+        supplier.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(supplierService.updateById(supplier));
+    }
+
+    /**
+     * 删除供应商
+     */
+    @ApiOperation(value="删除供应商", notes="单条删除或批量删除供应商信息，示例1或1,2,3", httpMethod = "POST")
+    @RequiresPermissions("general:supplier:remove")
+    @Log(title = "通用-供应商管理", operating = "删除供应商", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("id不能为空");
+        for (Integer id : Convert.toIntArray(ids)) {
+            Supplier supplier = supplierService.getById(id);
+
+            LambdaQueryWrapper<ReceiptDetail> lambda = Wrappers.lambdaQuery();
+            lambda.select(ReceiptDetail::getId)
+                    .eq(ReceiptDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                    .eq(ReceiptDetail::getSupplierCode, supplier.getCode())
+                    .eq(ReceiptDetail::getDeleted, false);
+
+            Map<String, Object> map = receiptDetailService.getMap(lambda);
+            if (map != null) {
+                return AjaxResult.error("供应商编码(" + supplier.getCode() +")存在入库单，不能删除！");
+            }
+
+            supplier.setDeleted(true);
+            supplier.setLastUpdatedBy(ShiroUtils.getLoginName());
+            supplierService.updateById(supplier);
+        }
+        return AjaxResult.success("删除成功！");
+    }
+}
+package com.huaheng.pc.general.supplier.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.general.supplier.domain.Supplier")
+@Data
+@TableName(value = "supplier")
+public class Supplier implements Serializable {
+    /**
+     * 供应商内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="供应商内部号")
+    private Integer id;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="供应商ID")
+    private String code;
+
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="null")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "name")
+    @ApiModelProperty(value="供应商名称")
+    private String name;
+
+    /**
+     * 地址1
+     */
+    @TableField(value = "address1")
+    @ApiModelProperty(value="地址1")
+    private String address1;
+
+    /**
+     * 地址2
+     */
+    @TableField(value = "address2")
+    @ApiModelProperty(value="地址2")
+    private String address2;
+
+    /**
+     * 城市
+     */
+    @TableField(value = "city")
+    @ApiModelProperty(value="城市")
+    private String city;
+
+    /**
+     * 省份
+     */
+    @TableField(value = "state")
+    @ApiModelProperty(value="省份")
+    private String state;
+
+    /**
+     * 国家
+     */
+    @TableField(value = "country")
+    @ApiModelProperty(value="国家")
+    private String country;
+
+    /**
+     * 邮编
+     */
+    @TableField(value = "postalCode")
+    @ApiModelProperty(value="邮编")
+    private String postalCode;
+
+    /**
+     * 父
+     */
+    @TableField(value = "parent")
+    @ApiModelProperty(value="父")
+    private Integer parent;
+
+    /**
+     * 联系人
+     */
+    @TableField(value = "attentionTo")
+    @ApiModelProperty(value="联系人")
+    private String attentionTo;
+
+    /**
+     * 电话
+     */
+    @TableField(value = "phoneNum")
+    @ApiModelProperty(value="电话")
+    private String phoneNum;
+
+    /**
+     * 传真
+     */
+    @TableField(value = "faxNum")
+    @ApiModelProperty(value="传真")
+    private String faxNum;
+
+    /**
+     * E-mail
+     */
+    @TableField(value = "email")
+    @ApiModelProperty(value="E-mail")
+    private String email;
+
+    /**
+     * 有效
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="有效")
+    private Integer enable;
+
+    /**
+     * 承运人
+     */
+    @TableField(value = "carrier")
+    @ApiModelProperty(value="承运人")
+    private String carrier;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_ADDRESS1 = "address1";
+
+    public static final String COL_ADDRESS2 = "address2";
+
+    public static final String COL_CITY = "city";
+
+    public static final String COL_STATE = "state";
+
+    public static final String COL_COUNTRY = "country";
+
+    public static final String COL_POSTALCODE = "postalCode";
+
+    public static final String COL_PARENT = "parent";
+
+    public static final String COL_ATTENTIONTO = "attentionTo";
+
+    public static final String COL_PHONENUM = "phoneNum";
+
+    public static final String COL_FAXNUM = "faxNum";
+
+    public static final String COL_EMAIL = "email";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_CARRIER = "carrier";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+}
 \ No newline at end of file
+package com.huaheng.pc.general.supplier.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.general.supplier.domain.Supplier;
+
+public interface SupplierMapper extends BaseMapper<Supplier> {
+}
 \ No newline at end of file
+package com.huaheng.pc.general.supplier.service;
+
+import com.huaheng.pc.general.supplier.domain.Supplier;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface SupplierService extends IService<Supplier>{
+
+
+}
+package com.huaheng.pc.general.supplier.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.general.supplier.mapper.SupplierMapper;
+import com.huaheng.pc.general.supplier.domain.Supplier;
+import com.huaheng.pc.general.supplier.service.SupplierService;
+@Service
+public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService{
+
+}
@@ -63,7 +63,7 @@ public class WareHouseController extends BaseController {
         LambdaQueryWrapper<Warehouse> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize()/2;
+        Integer pageSize = pageDomain.getPageSize();
         lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Warehouse::getCreated, createdBegin)
                 .lt(StringUtils.isNotEmpty(createdEnd),Warehouse::getCreated, createdEnd)
                 .eq(StringUtils.isNotEmpty(warehouse.getCode()),Warehouse::getCode, warehouse.getCode())
@@ -135,11 +135,10 @@ public class WareHouseController extends BaseController {
     @Log(title = "通用-仓库管理", operating = "删除仓库", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-    public AjaxResult remove(String Codes) {
-        if (StringUtils.isEmpty(Codes))
+    public AjaxResult remove(String codes) {
+        if (StringUtils.isEmpty(codes))
             return AjaxResult.error("id不能为空");
-        for (String code : Convert.toStrArray(Codes))
-        {
+        for (String code : Convert.toStrArray(codes)) {
             Warehouse warehouse = new Warehouse();
             InventoryHeader inventory = new InventoryHeader();
             inventory.setWarehouseCode(code);
@@ -147,7 +146,7 @@ public class WareHouseController extends BaseController {
             LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
             lambdaQueryWrapper.eq(InventoryHeader::getWarehouseCode,code);
             int count = inventoryHeaderService.count(lambdaQueryWrapper);
-            if (count == 0) {
+            if (count != 0) {
                 return AjaxResult.error("仓库编码(" + warehouse.getCode() +")还有库存，不能删除！");
             }
             warehouse.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -4,284 +4,346 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
  
+@ApiModel(value = "com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail")
 @Data
 @TableName(value = "receipt_detail")
 public class ReceiptDetail implements Serializable {
     /**
      * 入库明细内部号
      */
-     @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "入库明细内部号")
     private Integer id;
  
     /**
      * 入库单头内部号
      */
     @TableField(value = "receiptId")
+    @ApiModelProperty(value = "入库单头内部号")
     private Integer receiptId;
  
     /**
      * 入库单
      */
     @TableField(value = "receiptCode")
+    @ApiModelProperty(value = "入库单")
     private String receiptCode;
  
     /**
      * 仓库
      */
     @TableField(value = "warehouseCode")
+    @ApiModelProperty(value = "仓库")
     private String warehouseCode;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
+    @ApiModelProperty(value = "货主")
     private String companyCode;
  
     /**
      * 物料
      */
     @TableField(value = "materialCode")
+    @ApiModelProperty(value = "物料")
     private String materialCode;
  
     /**
      * 物料信息
      */
     @TableField(value = "materialName")
+    @ApiModelProperty(value = "物料信息")
     private String materialName;
  
     /**
      * 物料规格
      */
     @TableField(value = "materialSpec")
+    @ApiModelProperty(value = "物料规格")
     private String materialSpec;
  
     /**
      * 物料单位
      */
     @TableField(value = "materialUnit")
+    @ApiModelProperty(value = "物料单位")
     private String materialUnit;
  
     /**
+     * 供应商编码
+     */
+    @TableField(value = "supplierCode")
+    @ApiModelProperty(value = "供应商编码")
+    private String supplierCode;
+
+    /**
      * 批次
      */
     @TableField(value = "batch")
+    @ApiModelProperty(value = "批次")
     private String batch;
  
     /**
      * 批号
      */
     @TableField(value = "lot")
+    @ApiModelProperty(value = "批号")
     private String lot;
  
     /**
      * 质检
      */
     @TableField(value = "qcCheck")
+    @ApiModelProperty(value = "质检")
     private String qcCheck;
  
     /**
      * 项目号
      */
     @TableField(value = "projectNo")
+    @ApiModelProperty(value = "项目号")
     private String projectNo;
  
     /**
      * 生产日期
      */
     @TableField(value = "manufactureDate")
+    @ApiModelProperty(value = "生产日期")
     private Date manufactureDate;
  
     /**
      * 失效日期
      */
     @TableField(value = "expirationDate")
+    @ApiModelProperty(value = "失效日期")
     private Date expirationDate;
  
     /**
      * 入库日期
      */
     @TableField(value = "agingDate")
+    @ApiModelProperty(value = "入库日期")
     private Date agingDate;
  
     /**
      * 属性模板
      */
     @TableField(value = "attributeTemplateCode")
+    @ApiModelProperty(value = "属性模板")
     private String attributeTemplateCode;
  
     /**
      * 属性1
      */
     @TableField(value = "attribute1")
+    @ApiModelProperty(value = "属性1")
     private String attribute1;
  
     /**
      * 属性2
      */
     @TableField(value = "attribute2")
+    @ApiModelProperty(value = "属性2")
     private String attribute2;
  
     /**
      * 属性3
      */
     @TableField(value = "attribute3")
+    @ApiModelProperty(value = "属性3")
     private String attribute3;
  
     /**
      * 属性4
      */
     @TableField(value = "attribute4")
+    @ApiModelProperty(value = "属性4")
     private String attribute4;
  
     /**
      * 总数量
      */
     @TableField(value = "totalQty")
+    @ApiModelProperty(value = "总数量")
     private Integer totalQty;
  
     /**
      * 未收数量
      */
     @TableField(value = "openQty")
+    @ApiModelProperty(value = "未收数量")
     private Integer openQty;
  
     /**
      * ERP单号
      */
     @TableField(value = "referCode")
+    @ApiModelProperty(value = "ERP单号")
     private String referCode;
  
     /**
      * ERP内部号
      */
     @TableField(value = "referId")
+    @ApiModelProperty(value = "ERP内部号")
     private Integer referId;
  
     /**
      * ERP行号
      */
     @TableField(value = "referLineNum")
+    @ApiModelProperty(value = "ERP行号")
     private String referLineNum;
  
     /**
      * 定位规则
      */
     @TableField(value = "locatingRule")
+    @ApiModelProperty(value = "定位规则")
     private String locatingRule;
  
     /**
      * 库存状态
      */
     @TableField(value = "inventorySts")
+    @ApiModelProperty(value = "库存状态")
     private String inventorySts;
  
     /**
      * 标价
      */
     @TableField(value = "itemListPrice")
+    @ApiModelProperty(value = "标价")
     private BigDecimal itemListPrice;
  
     /**
      * 净价
      */
     @TableField(value = "itemNetPrice")
+    @ApiModelProperty(value = "净价")
     private BigDecimal itemNetPrice;
  
     /**
      * 是否虚拟套件
      */
     @TableField(value = "isVirtualBom")
+    @ApiModelProperty(value = "是否虚拟套件")
     private Integer isVirtualBom;
  
     /**
      * 创建时间
      */
     @TableField(value = "created")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy")
+    @ApiModelProperty(value = "创建用户")
     private String createdBy;
  
     /**
      * 创建时间
      */
     @TableField(value = "lastUpdated")
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
+    @ApiModelProperty(value = "自定义字段1")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
+    @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean deleted;
+
     private static final long serialVersionUID = 1L;
  
     public static final String COL_RECEIPTID = "receiptId";
@@ -300,6 +362,8 @@ public class ReceiptDetail implements Serializable {
  
     public static final String COL_MATERIALUNIT = "materialUnit";
  
+    public static final String COL_SUPPLIERCODE = "supplierCode";
+
     public static final String COL_BATCH = "batch";
  
     public static final String COL_LOT = "lot";
@@ -371,4 +435,6 @@ public class ReceiptDetail implements Serializable {
     public static final String COL_USERDEF8 = "userDef8";
  
     public static final String COL_PROCESSSTAMP = "processStamp";
+
+    public static final String COL_DELETED = "deleted";
 }
 \ No newline at end of file
@@ -249,6 +249,9 @@ public class ReceiptHeader implements Serializable {
     @TableField(value = "processStamp")
     private String processStamp;
  
+    @TableField(value = "deleted")
+    private Boolean deleted;
+
     private static final long serialVersionUID = 1L;
  
     public static final String COL_WAREHOUSECODE = "warehouseCode";
@@ -4,368 +4,437 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
  
+@ApiModel(value = "com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader")
 @Data
 @TableName(value = "shipment_header")
 public class ShipmentHeader implements Serializable {
     /**
      * 出库单内部号
      */
-     @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "出库单内部号")
     private Integer id;
  
     /**
      * 仓库
      */
     @TableField(value = "warehouseCode")
+    @ApiModelProperty(value = "仓库")
     private String warehouseCode;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
+    @ApiModelProperty(value = "货主")
     private String companyCode;
  
     /**
      * 装载号
      */
     @TableField(value = "loadId")
+    @ApiModelProperty(value = "装载号")
     private Integer loadId;
  
     /**
      * 出库单号
      */
     @TableField(value = "code")
+    @ApiModelProperty(value = "出库单号")
     private String code;
  
     /**
      * erp订单号
      */
     @TableField(value = "referCode")
+    @ApiModelProperty(value = "erp订单号")
     private String referCode;
  
     /**
      * erp订单类型
      */
     @TableField(value = "referCodeType")
+    @ApiModelProperty(value = "erp订单类型")
     private String referCodeType;
  
     /**
      * erp订单内部号
      */
     @TableField(value = "referId")
+    @ApiModelProperty(value = "erp订单内部号")
     private Integer referId;
  
     /**
      * 订单平台
      */
     @TableField(value = "referPlatform")
+    @ApiModelProperty(value = "订单平台")
     private Integer referPlatform;
  
     /**
      * 主状态
      */
     @TableField(value = "firstStatus")
+    @ApiModelProperty(value = "主状态")
     private Integer firstStatus;
  
     /**
      * 拖状态
      */
     @TableField(value = "lastStatus")
+    @ApiModelProperty(value = "拖状态")
     private Integer lastStatus;
  
     /**
      * 出库单类型
      */
     @TableField(value = "shipmentType")
+    @ApiModelProperty(value = "出库单类型")
     private String shipmentType;
  
     /**
      * 路线
      */
     @TableField(value = "route")
+    @ApiModelProperty(value = "路线")
     private String route;
  
     /**
      * 客户编号
      */
     @TableField(value = "customerCode")
+    @ApiModelProperty(value = "客户编号")
     private String customerCode;
  
     /**
      * 客户名称
      */
     @TableField(value = "customerName")
+    @ApiModelProperty(value = "客户名称")
     private String customerName;
  
     /**
      * 优先级
      */
     @TableField(value = "priority")
+    @ApiModelProperty(value = "优先级")
     private Integer priority;
  
     /**
      * 要求到货时间
      */
     @TableField(value = "requestedDeliveryDate")
+    @ApiModelProperty(value = "要求到货时间")
     private Date requestedDeliveryDate;
  
     /**
      * 要求到货类型
      */
     @TableField(value = "requestedDeliveryType")
+    @ApiModelProperty(value = "要求到货类型")
     private String requestedDeliveryType;
  
     /**
      * 计划发车日期
      */
     @TableField(value = "scheduledShipDate")
+    @ApiModelProperty(value = "计划发车日期")
     private Date scheduledShipDate;
  
     /**
      * 实际发车时间
      */
     @TableField(value = "actualShipDateTime")
+    @ApiModelProperty(value = "实际发车时间")
     private Date actualShipDateTime;
  
     /**
      * 实际到货时间
      */
     @TableField(value = "actualDeliveryDate")
+    @ApiModelProperty(value = "实际到货时间")
     private Date actualDeliveryDate;
  
     /**
      * 配送要求
      */
     @TableField(value = "deliveryNote")
+    @ApiModelProperty(value = "配送要求")
     private String deliveryNote;
  
     /**
      * 失败原因
      */
     @TableField(value = "rejectionNote")
+    @ApiModelProperty(value = "失败原因")
     private String rejectionNote;
  
     /**
      * 波次号
      */
     @TableField(value = "waveId")
+    @ApiModelProperty(value = "波次号")
     private Integer waveId;
  
     /**
      * 发货月台
      */
     @TableField(value = "shipDock")
+    @ApiModelProperty(value = "发货月台")
     private String shipDock;
  
     /**
      * 分配完成
      */
     @TableField(value = "allocateComplete")
+    @ApiModelProperty(value = "分配完成")
     private Integer allocateComplete;
  
     /**
      * 总重量
      */
     @TableField(value = "totalWeight")
+    @ApiModelProperty(value = "总重量")
     private BigDecimal totalWeight;
  
     /**
      * 总数量
      */
     @TableField(value = "totalQty")
+    @ApiModelProperty(value = "总数量")
     private Integer totalQty;
  
     /**
      * 总体积
      */
     @TableField(value = "totalVolume")
+    @ApiModelProperty(value = "总体积")
     private BigDecimal totalVolume;
  
     /**
      * 总行数
      */
     @TableField(value = "totalLines")
+    @ApiModelProperty(value = "总行数")
     private Integer totalLines;
  
     /**
      * 总拼箱数
      */
     @TableField(value = "totalContainers")
+    @ApiModelProperty(value = "总拼箱数")
     private Integer totalContainers;
  
     /**
      * 总整箱数
      */
     @TableField(value = "totalCases")
+    @ApiModelProperty(value = "总整箱数")
     private Integer totalCases;
  
     /**
      * 总价值
      */
     @TableField(value = "totalValue")
+    @ApiModelProperty(value = "总价值")
     private BigDecimal totalValue;
  
     /**
      * 处理类型
      */
     @TableField(value = "processType")
+    @ApiModelProperty(value = "处理类型")
     private String processType;
  
     /**
      * 上次波次号
      */
     @TableField(value = "lastWaveId")
+    @ApiModelProperty(value = "上次波次号")
     private Integer lastWaveId;
  
     /**
      * 特征值
      */
     @TableField(value = "signValue")
+    @ApiModelProperty(value = "特征值")
     private String signValue;
  
     /**
      * 承运人
      */
     @TableField(value = "carrierCode")
+    @ApiModelProperty(value = "承运人")
     private String carrierCode;
  
     /**
      * 承运人服务商
      */
     @TableField(value = "carrierService")
+    @ApiModelProperty(value = "承运人服务商")
     private String carrierService;
  
     /**
      * 订单备注
      */
     @TableField(value = "shipmentNote")
+    @ApiModelProperty(value = "订单备注")
     private String shipmentNote;
  
     /**
      * 承运商编码
      */
     @TableField(value = "carrierServer")
+    @ApiModelProperty(value = "承运商编码")
     private String carrierServer;
  
     /**
      * 承运商名称
      */
     @TableField(value = "carrierServerName")
+    @ApiModelProperty(value = "承运商名称")
     private String carrierServerName;
  
     /**
      * 车牌号
      */
     @TableField(value = "plateNumber")
+    @ApiModelProperty(value = "车牌号")
     private String plateNumber;
  
     /**
      * 车型
      */
     @TableField(value = "carModel")
+    @ApiModelProperty(value = "车型")
     private String carModel;
  
     /**
      * 司机名称
      */
     @TableField(value = "driverName")
+    @ApiModelProperty(value = "司机名称")
     private String driverName;
  
     /**
      * 司机联系方式
      */
     @TableField(value = "driverTel")
+    @ApiModelProperty(value = "司机联系方式")
     private String driverTel;
  
     /**
      * 创建时间
      */
     @TableField(value = "created")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy")
+    @ApiModelProperty(value = "创建用户")
     private String createdBy;
  
     /**
      * 创建时间
      */
     @TableField(value = "lastUpdated")
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
+    @ApiModelProperty(value = "自定义字段1")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
+    @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean deleted;
+
     private static final long serialVersionUID = 1L;
  
     public static final String COL_WAREHOUSECODE = "warehouseCode";
@@ -483,4 +552,6 @@ public class ShipmentHeader implements Serializable {
     public static final String COL_USERDEF8 = "userDef8";
  
     public static final String COL_PROCESSSTAMP = "processStamp";
+
+    public static final String COL_DELETED = "deleted";
 }
 \ No newline at end of file
@@ -22,6 +22,8 @@ import com.huaheng.pc.system.menu.mapper.MenuMapper;
 import com.huaheng.pc.system.role.domain.Role;
 import com.huaheng.pc.system.role.mapper.RoleMenuMapper;
  
+import javax.annotation.Resource;
+
 /**
  * 菜单 业务层处理
  * 
@@ -32,10 +34,10 @@ public class MenuServiceImpl implements IMenuService
 {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
  
-    @Autowired
+    @Resource
     private MenuMapper menuMapper;
  
-    @Autowired
+    @Resource
     private RoleMenuMapper roleMenuMapper;
  
     /**
@@ -65,8 +65,7 @@ public class LoginController extends BaseController
  
     @PostMapping(value = "/login")
     @ResponseBody
-    public AjaxResult ajaxLogin(String username, String password, String warehouse, String warehouseCode, Boolean rememberMe)
-    {
+    public AjaxResult ajaxLogin(String username, String password, String warehouse, String warehouseCode, Boolean rememberMe) {
         if (StringUtils.isNotEmpty(warehouse))
         {
             String[] warehouseArray = warehouse.split(",");
+<?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.huaheng.pc.config.containerType.mapper.ContainerTypeMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.containerType.domain.ContainerType">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="sequence" jdbcType="INTEGER" property="sequence" />
+    <result column="emptyWeight" jdbcType="DECIMAL" property="emptyWeight" />
+    <result column="length" jdbcType="DECIMAL" property="length" />
+    <result column="width" jdbcType="DECIMAL" property="width" />
+    <result column="height" jdbcType="DECIMAL" property="height" />
+    <result column="weight" jdbcType="DECIMAL" property="weight" />
+    <result column="maxWeight" jdbcType="DECIMAL" property="maxWeight" />
+    <result column="fillPercent" jdbcType="INTEGER" property="fillPercent" />
+    <result column="useAsDEFAULT" jdbcType="INTEGER" property="useAsDEFAULT" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, `name`, warehouseCode, companyCode, `enable`, `sequence`, emptyWeight, 
+    `length`, width, height, weight, maxWeight, fillPercent, useAsDEFAULT, `status`, 
+    created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, 
+    userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.config.locationType.mapper.LocationTypeMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.locationType.domain.LocationType">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="length" jdbcType="INTEGER" property="length" />
+    <result column="width" jdbcType="INTEGER" property="width" />
+    <result column="height" jdbcType="INTEGER" property="height" />
+    <result column="maxWeight" jdbcType="INTEGER" property="maxWeight" />
+    <result column="minQtyUm" jdbcType="VARCHAR" property="minQtyUm" />
+    <result column="checkDigit" jdbcType="VARCHAR" property="checkDigit" />
+    <result column="maxMaterials" jdbcType="INTEGER" property="maxMaterials" />
+    <result column="maxLots" jdbcType="INTEGER" property="maxLots" />
+    <result column="maxContainers" jdbcType="INTEGER" property="maxContainers" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, warehouseCode, `name`, `length`, width, height, maxWeight, minQtyUm, checkDigit, 
+    maxMaterials, maxLots, maxContainers, `enable`, created, createdBy, lastUpdated, 
+    lastUpdatedBy, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.general.container.mapper.ContainerMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.container.domain.Container">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="containerType" jdbcType="VARCHAR" property="containerType" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="printNum" jdbcType="INTEGER" property="printNum" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `name`, code, warehouseCode, companyCode, containerType, created, createdBy, 
+    lastUpdated, lastUpdatedBy, `status`, `enable`, printNum, version, userDef1, userDef2, 
+    userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.general.customer.mapper.CustomerMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.customer.domain.Customer">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="shipToCode" jdbcType="VARCHAR" property="shipToCode" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="address1" jdbcType="VARCHAR" property="address1" />
+    <result column="address2" jdbcType="VARCHAR" property="address2" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="province" jdbcType="VARCHAR" property="province" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
+    <result column="postalCode" jdbcType="VARCHAR" property="postalCode" />
+    <result column="parent" jdbcType="INTEGER" property="parent" />
+    <result column="attentionTo" jdbcType="VARCHAR" property="attentionTo" />
+    <result column="phoneNum" jdbcType="VARCHAR" property="phoneNum" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="faxNum" jdbcType="VARCHAR" property="faxNum" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, shipToCode, warehouseCode, companyCode, `name`, address1, address2, city, 
+    province, country, postalCode, parent, attentionTo, phoneNum, mobile, faxNum, email, 
+    `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, 
+    userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.general.location.mapper.LocationMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.location.domain.Location">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="zoneCode" jdbcType="VARCHAR" property="zoneCode" />
+    <result column="locationType" jdbcType="VARCHAR" property="locationType" />
+    <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
+    <result column="iRow" jdbcType="INTEGER" property="iRow" />
+    <result column="iColumn" jdbcType="INTEGER" property="iColumn" />
+    <result column="iLayer" jdbcType="INTEGER" property="iLayer" />
+    <result column="iGrid" jdbcType="INTEGER" property="iGrid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer, 
+    iGrid, `name`, `enable`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, 
+    version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
+    systemCreated
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.general.supplier.mapper.SupplierMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.supplier.domain.Supplier">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="address1" jdbcType="VARCHAR" property="address1" />
+    <result column="address2" jdbcType="VARCHAR" property="address2" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="state" jdbcType="VARCHAR" property="state" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
+    <result column="postalCode" jdbcType="VARCHAR" property="postalCode" />
+    <result column="parent" jdbcType="INTEGER" property="parent" />
+    <result column="attentionTo" jdbcType="VARCHAR" property="attentionTo" />
+    <result column="phoneNum" jdbcType="VARCHAR" property="phoneNum" />
+    <result column="faxNum" jdbcType="VARCHAR" property="faxNum" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="carrier" jdbcType="VARCHAR" property="carrier" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, warehouseCode, companyCode, `name`, address1, address2, city, `state`, 
+    country, postalCode, parent, attentionTo, phoneNum, faxNum, email, `enable`, carrier, 
+    created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, 
+    userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
@@ -12,6 +12,7 @@
     <result column="materialName" jdbcType="VARCHAR" property="materialName" />
     <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
     <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
     <result column="batch" jdbcType="VARCHAR" property="batch" />
     <result column="lot" jdbcType="VARCHAR" property="lot" />
     <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
@@ -48,16 +49,17 @@
     <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
     <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
     <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName, 
-    materialSpec, materialUnit, batch, lot, qcCheck, projectNo, manufactureDate, expirationDate, 
-    agingDate, attributeTemplateCode, attribute1, attribute2, attribute3, attribute4, 
-    totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts, 
+    materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate, 
+    expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3, 
+    attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts, 
     itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy, 
     version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
-    processStamp
+    processStamp, deleted
   </sql>
  
 </mapper>
 \ No newline at end of file
 <?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.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper">
+<mapper namespace="com.huaheng.pc.general.customer.mapper.ShipmentHeaderMapper">
   <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
@@ -62,6 +62,7 @@
     <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
     <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
     <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -73,7 +74,7 @@
     processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer, 
     carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy, 
     lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, 
-    userDef6, userDef7, userDef8, processStamp
+    userDef6, userDef7, userDef8, processStamp, deleted
   </sql>
  
  
@@ -35,18 +35,18 @@
 					</div>
 				</form>
 			</div>
-		</div>
-		<div class="btn-group hidden-xs" id="toolbar" role="group">
-			<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="general:warehouse:add">
-				<i class="fa fa-plus"></i> 新增
-			</a>
-			<!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="general:warehouse:remove">
-				<i class="fa fa-trash-o"></i> 删除
-			</a>-->
-		</div>
+			<div class="btn-group hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="general:warehouse:add">
+					<i class="fa fa-plus"></i> 新增
+				</a>
+				<!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="general:warehouse:remove">
+					<i class="fa fa-trash-o"></i> 删除
+				</a>-->
+			</div>
  
-		<div class="col-sm-12 select-info">
-			<table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+			<div class="col-sm-12 select-info">
+				<table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+			</div>
 		</div>
     </div>
     <div th:include="include :: footer"></div>