修改库区service

mahuandong
1 parent ea41cbef
Showing 3 changed files with 253 additions and 128 deletions
src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java
src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java
src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java
 package com.huaheng.pc.config.zone.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.mapper.ZoneMapper;
 import org.springframework.stereotype.Service;
  
+import java.util.List;
+import java.util.Map;
+
 @Service("zone")
 public class ZoneServiceImpl extends ServiceImpl<ZoneMapper, Zone> implements ZoneService {
  
+    @Override
+    public List<Map<String, Object>> getZoneCodeList() {
+        LambdaQueryWrapper<Zone> lambda = Wrappers.lambdaQuery();
+        lambda.select(Zone::getId, Zone::getCode, Zone::getName);
+        return this.listMaps(lambda);
+    }
 }
@@ -4,15 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-<<<<<<< HEAD
 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.config.zoneCapacity.domain.ZoneCapacity")
-@Data
 @TableName(value = "zone_capacity")
 public class ZoneCapacity implements Serializable {
     /**
@@ -20,255 +17,166 @@ public class ZoneCapacity implements Serializable {
      */
      @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value="内部号")
-=======
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 库区容量
- * @author ricard
- * @Date   2019.8.8
- */
-
-
-@Data
-@TableName(value = "zone_capacity")
-public class ZoneCapacity implements Serializable {
-
-    /**
-     * 唯一值
-     */
-    @TableId(value = "id", type = IdType.AUTO)
->>>>>>> origin/develop
     private Integer id;
  
     /**
      * 仓库
      */
     @TableField(value = "warehouseCode")
-<<<<<<< HEAD
     @ApiModelProperty(value="仓库")
-=======
->>>>>>> origin/develop
     private String warehouseCode;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
-<<<<<<< HEAD
     @ApiModelProperty(value="货主")
-=======
->>>>>>> origin/develop
     private String companyCode;
  
     /**
      * 商品编码
      */
     @TableField(value = "materialCode")
-<<<<<<< HEAD
     @ApiModelProperty(value="商品编码")
-=======
->>>>>>> origin/develop
     private String materialCode;
  
     /**
      * 商品名称
      */
     @TableField(value = "materialName")
-<<<<<<< HEAD
     @ApiModelProperty(value="商品名称")
-=======
->>>>>>> origin/develop
     private String materialName;
  
     /**
      * 商品规格
      */
     @TableField(value = "materialSpec")
-<<<<<<< HEAD
     @ApiModelProperty(value="商品规格")
-=======
->>>>>>> origin/develop
     private String materialSpec;
  
     /**
      * 商品单位
      */
     @TableField(value = "materialUnit")
-<<<<<<< HEAD
     @ApiModelProperty(value="商品单位")
-=======
->>>>>>> origin/develop
     private String materialUnit;
  
     /**
      * 货位过滤条件
      */
     @TableField(value = "filterCode")
-<<<<<<< HEAD
     @ApiModelProperty(value="货位过滤条件")
-=======
->>>>>>> origin/develop
     private String filterCode;
  
     /**
      * 最大数量
      */
     @TableField(value = "maxQty")
-<<<<<<< HEAD
     @ApiModelProperty(value="最大数量")
-=======
->>>>>>> origin/develop
     private Integer maxQty;
  
     /**
      * 最小数量
      */
     @TableField(value = "minQty")
-<<<<<<< HEAD
     @ApiModelProperty(value="最小数量")
-=======
->>>>>>> origin/develop
     private Integer minQty;
  
     /**
      * 创建时间
      */
     @TableField(value = "created")
-<<<<<<< HEAD
     @ApiModelProperty(value="创建时间")
-=======
->>>>>>> origin/develop
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy")
-<<<<<<< HEAD
     @ApiModelProperty(value="创建用户")
-=======
->>>>>>> origin/develop
     private String createdBy;
  
     /**
      * 创建时间
      */
     @TableField(value = "lastUpdated")
-<<<<<<< HEAD
     @ApiModelProperty(value="创建时间")
-=======
->>>>>>> origin/develop
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy")
-<<<<<<< HEAD
     @ApiModelProperty(value="更新用户")
-=======
->>>>>>> origin/develop
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-<<<<<<< HEAD
     @ApiModelProperty(value="数据版本")
-=======
->>>>>>> origin/develop
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段1")
-=======
->>>>>>> origin/develop
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段2")
-=======
->>>>>>> origin/develop
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段3")
-=======
->>>>>>> origin/develop
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段4")
-=======
->>>>>>> origin/develop
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段5")
-=======
->>>>>>> origin/develop
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段6")
-=======
->>>>>>> origin/develop
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段7")
-=======
->>>>>>> origin/develop
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
-<<<<<<< HEAD
     @ApiModelProperty(value="自定义字段8")
-=======
->>>>>>> origin/develop
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
-<<<<<<< HEAD
     @ApiModelProperty(value="处理标记")
     private String processStamp;
  
@@ -319,230 +227,436 @@ public class ZoneCapacity implements Serializable {
     public static final String COL_USERDEF8 = "userDef8";
  
     public static final String COL_PROCESSSTAMP = "processStamp";
-}
-=======
-    private String processStamp;
  
+    /**
+     * 获取内部号
+     *
+     * @return id - 内部号
+     */
     public Integer getId() {
         return id;
     }
  
+    /**
+     * 设置内部号
+     *
+     * @param id 内部号
+     */
     public void setId(Integer id) {
         this.id = id;
     }
  
+    /**
+     * 获取仓库
+     *
+     * @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;
     }
  
+    /**
+     * 获取商品编码
+     *
+     * @return materialCode - 商品编码
+     */
     public String getMaterialCode() {
         return materialCode;
     }
  
+    /**
+     * 设置商品编码
+     *
+     * @param materialCode 商品编码
+     */
     public void setMaterialCode(String materialCode) {
         this.materialCode = materialCode;
     }
  
+    /**
+     * 获取商品名称
+     *
+     * @return materialName - 商品名称
+     */
     public String getMaterialName() {
         return materialName;
     }
  
+    /**
+     * 设置商品名称
+     *
+     * @param materialName 商品名称
+     */
     public void setMaterialName(String materialName) {
         this.materialName = materialName;
     }
  
+    /**
+     * 获取商品规格
+     *
+     * @return materialSpec - 商品规格
+     */
     public String getMaterialSpec() {
         return materialSpec;
     }
  
+    /**
+     * 设置商品规格
+     *
+     * @param materialSpec 商品规格
+     */
     public void setMaterialSpec(String materialSpec) {
         this.materialSpec = materialSpec;
     }
  
+    /**
+     * 获取商品单位
+     *
+     * @return materialUnit - 商品单位
+     */
     public String getMaterialUnit() {
         return materialUnit;
     }
  
+    /**
+     * 设置商品单位
+     *
+     * @param materialUnit 商品单位
+     */
     public void setMaterialUnit(String materialUnit) {
         this.materialUnit = materialUnit;
     }
  
+    /**
+     * 获取货位过滤条件
+     *
+     * @return filterCode - 货位过滤条件
+     */
     public String getFilterCode() {
         return filterCode;
     }
  
+    /**
+     * 设置货位过滤条件
+     *
+     * @param filterCode 货位过滤条件
+     */
     public void setFilterCode(String filterCode) {
         this.filterCode = filterCode;
     }
  
+    /**
+     * 获取最大数量
+     *
+     * @return maxQty - 最大数量
+     */
     public Integer getMaxQty() {
         return maxQty;
     }
  
+    /**
+     * 设置最大数量
+     *
+     * @param maxQty 最大数量
+     */
     public void setMaxQty(Integer maxQty) {
         this.maxQty = maxQty;
     }
  
+    /**
+     * 获取最小数量
+     *
+     * @return minQty - 最小数量
+     */
     public Integer getMinQty() {
         return minQty;
     }
  
+    /**
+     * 设置最小数量
+     *
+     * @param minQty 最小数量
+     */
     public void setMinQty(Integer minQty) {
         this.minQty = minQty;
     }
  
+    /**
+     * 获取创建时间
+     *
+     * @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
+     *
+     * @return userDef1 - 自定义字段1
+     */
     public String getUserDef1() {
         return userDef1;
     }
  
+    /**
+     * 设置自定义字段1
+     *
+     * @param userDef1 自定义字段1
+     */
     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() {
-        return "ZoneCapacity{" +
-                "id=" + id +
-                ", warehouseCode='" + warehouseCode + '\'' +
-                ", companyCode='" + companyCode + '\'' +
-                ", materialCode='" + materialCode + '\'' +
-                ", materialName='" + materialName + '\'' +
-                ", materialSpec='" + materialSpec + '\'' +
-                ", materialUnit='" + materialUnit + '\'' +
-                ", filterCode='" + filterCode + '\'' +
-                ", maxQty=" + maxQty +
-                ", minQty=" + minQty +
-                ", created=" + created +
-                ", createdBy='" + createdBy + '\'' +
-                ", lastUpdated=" + lastUpdated +
-                ", lastUpdatedBy='" + lastUpdatedBy + '\'' +
-                ", version=" + version +
-                ", userDef1='" + userDef1 + '\'' +
-                ", userDef2='" + userDef2 + '\'' +
-                ", userDef3='" + userDef3 + '\'' +
-                ", userDef4='" + userDef4 + '\'' +
-                ", userDef5='" + userDef5 + '\'' +
-                ", userDef6='" + userDef6 + '\'' +
-                ", userDef7='" + userDef7 + '\'' +
-                ", userDef8='" + userDef8 + '\'' +
-                ", processStamp='" + processStamp + '\'' +
-                '}';
-    }
-}
->>>>>>> origin/develop
+}
 \ No newline at end of file
@@ -4,4 +4,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
  
 public interface ZoneCapacityMapper extends BaseMapper<ZoneCapacity> {
 -}
+}
 \ No newline at end of file