wms / wms4_hh · Commits

Commit 0e55b12a17cabefb765f9e741ced3838cee6c2a2

Authored by 肖超群
1 parent 9f0d8337

增加库位管理

Inline Side-by-side
Showing 6 changed files with 178 additions and 4 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/entity/Location.java 0 → 100644
  View file @0e55b12
  1 +package org.jeecg.modules.wms.config.location.entity;
  2 +
  3 +import java.io.Serializable;
  4 +import java.io.UnsupportedEncodingException;
  5 +import java.util.Date;
  6 +import java.math.BigDecimal;
  7 +import com.baomidou.mybatisplus.annotation.IdType;
  8 +import com.baomidou.mybatisplus.annotation.TableId;
  9 +import com.baomidou.mybatisplus.annotation.TableName;
  10 +import lombok.Data;
  11 +import com.fasterxml.jackson.annotation.JsonFormat;
  12 +import org.springframework.format.annotation.DateTimeFormat;
  13 +import org.jeecgframework.poi.excel.annotation.Excel;
  14 +import org.jeecg.common.aspect.annotation.Dict;
  15 +import io.swagger.annotations.ApiModel;
  16 +import io.swagger.annotations.ApiModelProperty;
  17 +import lombok.EqualsAndHashCode;
  18 +import lombok.experimental.Accessors;
  19 +
  20 +/**
  21 + * @Description: 库位管理
  22 + * @Author: jeecg-boot
  23 + * @Date: 2022-10-27
  24 + * @Version: V1.0
  25 + */
  26 +@Data
  27 +@TableName("location")
  28 +@Accessors(chain = true)
  29 +@EqualsAndHashCode(callSuper = false)
  30 +@ApiModel(value="location对象", description="库位管理")
  31 +public class Location implements Serializable {
  32 + private static final long serialVersionUID = 1L;
  33 +
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
  36 + @ApiModelProperty(value = "主键")
  37 + private String id;
  38 + /**库位编码*/
  39 + @Excel(name = "库位编码", width = 15)
  40 + @ApiModelProperty(value = "库位编码")
  41 + private String code;
  42 + /**仓库编码*/
  43 + @Excel(name = "仓库编码", width = 15)
  44 + @ApiModelProperty(value = "仓库编码")
  45 + private String warehouseCode;
  46 + /**库区编码*/
  47 + @Excel(name = "库区编码", width = 15)
  48 + @ApiModelProperty(value = "库区编码")
  49 + private String zoneCode;
  50 + /**库位类型*/
  51 + @Excel(name = "库位类型", width = 15)
  52 + @ApiModelProperty(value = "库位类型")
  53 + private String locationTypeCode;
  54 + /**容器编码*/
  55 + @Excel(name = "容器编码", width = 15)
  56 + @ApiModelProperty(value = "容器编码")
  57 + private String containerCode;
  58 + /**状态*/
  59 + @Excel(name = "状态", width = 15, dicCode = "location_status")
  60 + @Dict(dicCode = "location_status")
  61 + @ApiModelProperty(value = "状态")
  62 + private String status;
  63 + /**巷道*/
  64 + @Excel(name = "巷道", width = 15)
  65 + @ApiModelProperty(value = "巷道")
  66 + private Integer roadWay;
  67 + /**行*/
  68 + @Excel(name = "行", width = 15)
  69 + @ApiModelProperty(value = "行")
  70 + private Integer row;
  71 + /**列*/
  72 + @Excel(name = "列", width = 15)
  73 + @ApiModelProperty(value = "列")
  74 + private Integer icolumn;
  75 + /**层*/
  76 + @Excel(name = "层", width = 15)
  77 + @ApiModelProperty(value = "层")
  78 + private Integer layer;
  79 + /**格*/
  80 + @Excel(name = "格", width = 15)
  81 + @ApiModelProperty(value = "格")
  82 + private Integer grid;
  83 + /**高低位*/
  84 + @Excel(name = "高低位", width = 15)
  85 + @Dict(dicCode = "high_status")
  86 + @ApiModelProperty(value = "高低位")
  87 + private Integer high;
  88 + /**内外侧*/
  89 + @Excel(name = "内外侧", width = 15, dicCode = "row_type")
  90 + @Dict(dicCode = "row_type")
  91 + @ApiModelProperty(value = "内外侧")
  92 + private Integer rowFlag;
  93 + /**物料分区存放*/
  94 + @Excel(name = "物料分区存放", width = 15)
  95 + @ApiModelProperty(value = "物料分区存放")
  96 + private String materialAreaCode;
  97 + /**是否可用*/
  98 + @Excel(name = "是否可用", width = 15, dicCode = "enable_status")
  99 + @Dict(dicCode = "enable_status")
  100 + @ApiModelProperty(value = "是否可用")
  101 + private Integer enable;
  102 + /**备用字段1*/
  103 + @Excel(name = "备用字段1", width = 15)
  104 + @ApiModelProperty(value = "备用字段1")
  105 + private String userdef1;
  106 + /**备用字段2*/
  107 + @Excel(name = "备用字段2", width = 15)
  108 + @ApiModelProperty(value = "备用字段2")
  109 + private String userdef2;
  110 + /**备用字段3*/
  111 + @Excel(name = "备用字段3", width = 15)
  112 + @ApiModelProperty(value = "备用字段3")
  113 + private String userdef3;
  114 + /**创建人*/
  115 + @ApiModelProperty(value = "创建人")
  116 + private String createBy;
  117 + /**创建日期*/
  118 + @ApiModelProperty(value = "创建日期")
  119 + private Date createTime;
  120 + /**更新人*/
  121 + @ApiModelProperty(value = "更新人")
  122 + private String updateBy;
  123 + /**更新日期*/
  124 + @ApiModelProperty(value = "更新日期")
  125 + private Date updateTime;
  126 +}
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/mapper/LocationMapper.java 0 → 100644
  View file @0e55b12
  1 +package org.jeecg.modules.wms.config.location.mapper;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.apache.ibatis.annotations.Param;
  6 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  7 +import org.jeecg.modules.wms.config.location.entity.Location;
  8 +
  9 +/**
  10 + * @Description: 库位管理
  11 + * @Author: jeecg-boot
  12 + * @Date: 2022-10-27
  13 + * @Version: V1.0
  14 + */
  15 +public interface LocationMapper extends BaseMapper<Location> {
  16 +
  17 +}
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java 0 → 100644
  View file @0e55b12
  1 +package org.jeecg.modules.wms.config.location.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.IService;
  4 +import org.jeecg.modules.wms.config.location.entity.Location;
  5 +
  6 +/**
  7 + * @Description: 库位管理
  8 + * @Author: jeecg-boot
  9 + * @Date: 2022-10-27
  10 + * @Version: V1.0
  11 + */
  12 +public interface ILocationService extends IService<Location> {
  13 +
  14 +}
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java 0 → 100644
  View file @0e55b12
  1 +package org.jeecg.modules.wms.config.location.service.impl;
  2 +
  3 +import org.jeecg.modules.wms.config.location.entity.Location;
  4 +import org.jeecg.modules.wms.config.location.mapper.LocationMapper;
  5 +import org.jeecg.modules.wms.config.location.service.ILocationService;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  9 +
  10 +/**
  11 + * @Description: 库位管理
  12 + * @Author: jeecg-boot
  13 + * @Date: 2022-10-27
  14 + * @Version: V1.0
  15 + */
  16 +@Service
  17 +public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements ILocationService {
  18 +
  19 +}
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java
  View file @0e55b12
... ... @@ -68,8 +68,6 @@ public class SysUserWarehouseController extends JeecgController&lt;SysUserWarehouse
68 68 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
69 69 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
70 70 HttpServletRequest req) {
71   - String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
72   - sysUserWarehouse.setWarehouseCode(warehouseCode);
73 71 QueryWrapper<SysUserWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(sysUserWarehouse, req.getParameterMap());
74 72 Page<SysUserWarehouse> page = new Page<SysUserWarehouse>(pageNo, pageSize);
75 73 IPage<SysUserWarehouse> pageList = sysUserWarehouseService.page(page, queryWrapper);
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java
  View file @0e55b12
... ... @@ -32,9 +32,9 @@ public class Warehouse implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34 34 /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**仓库编码*/
39 39 @Excel(name = "仓库编码", width = 15)
40 40 @ApiModelProperty(value = "仓库编码")
... ...