wms / wms_wuhangelinmei · Commits

Commit 7a9f6ca445c7da09c5413d3e9b23e96409ed2d21

Authored by wangyanxiong
2 parents 38b06572 0aad01cc
develop ... future/yangjie moreWarehouse

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

Inline Side-by-side
Showing 23 changed files with 655 additions and 197 deletions
src/main/java/com/huaheng/pc/config/FilterConfigDetail/controller/FilterConfigDetailController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.config.FilterConfigDetail.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
  17 +import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
  18 +import io.swagger.annotations.Api;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.web.bind.annotation.GetMapping;
  23 +import org.springframework.web.bind.annotation.PostMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.ResponseBody;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 订单分析过滤子表
  31 + * @author ricard
  32 + * @date 19.8.26
  33 + *
  34 + */
  35 +
  36 +@Api(tags={"订单分析过滤子表"})
  37 +@Controller
  38 +@RequestMapping("/config/filterConfigDetail")
  39 +public class FilterConfigDetailController extends BaseController {
  40 +
  41 + private String prefix = "config/filterConfigDetail";
  42 +
  43 + @Autowired
  44 + private FilterConfigDetailService filterConfigDetailService;
  45 +
  46 +
  47 + @RequiresPermissions("config:filterConfigDetail:view")
  48 + @GetMapping()
  49 + public String filterConfigDetail() {
  50 + return prefix + "/filterConfigDetail";
  51 + }
  52 +
  53 + /**
  54 + * 查询订单分析结果
  55 + */
  56 + @RequiresPermissions("config:filterConfigDetail:list")
  57 + @Log(title = "配置-订单分析过滤子表", operating="查看订单分析过滤子表", action = BusinessType.GRANT)
  58 + @PostMapping("/list")
  59 + @ResponseBody
  60 + public TableDataInfo list(FilterConfigDetail filterConfigDetail, String createdBegin, String createdEnd)
  61 + {
  62 + LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 +
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),FilterConfigDetail::getCreated, createdBegin)
  68 + .le(StringUtils.isNotEmpty(createdEnd), FilterConfigDetail::getCreated, createdEnd)
  69 + .eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
  70 + .eq(StringUtils.isNotEmpty(filterConfigDetail.getModuleType()
  71 + ),FilterConfigDetail::getModuleType,filterConfigDetail.getModuleType())
  72 + .eq(StringUtils.isNotEmpty(filterConfigDetail.getRecordType()
  73 + ),FilterConfigDetail::getRecordType,filterConfigDetail.getRecordType())
  74 + .eq(StringUtils.isNotEmpty(filterConfigDetail.getFilterCode()
  75 + ),FilterConfigDetail::getFilterCode,filterConfigDetail.getFilterCode())
  76 + .like(StringUtils.isNotEmpty(filterConfigDetail.getFilterName()
  77 + ),FilterConfigDetail::getFilterName,filterConfigDetail.getFilterName());
  78 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  79 + /**
  80 + * 使用分页查询
  81 + */
  82 + Page<FilterConfigDetail> page = new Page<>(pageNum, pageSize);
  83 + IPage<FilterConfigDetail> iPage = filterConfigDetailService.page(page, lambdaQueryWrapper);
  84 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  85 + } else {
  86 + List<FilterConfigDetail> list = filterConfigDetailService.list(lambdaQueryWrapper);
  87 + return getDataTable(list);
  88 + }
  89 + }
  90 +
  91 +
  92 +}
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/domain/FilterConfigDetail.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigDetail.domain;
  1 +package com.huaheng.pc.config.FilterConfigDetail.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModel;
8 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 11 import java.io.Serializable;
10 12 import java.util.Date;
11   -import lombok.Data;
12 13  
13 14 @ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail")
14 15 @Data
... ... @@ -154,33 +155,6 @@ public class FilterConfigDetail implements Serializable {
154 155 @ApiModelProperty(value="自定义字段4")
155 156 private String userDef4;
156 157  
157   - /**
158   - * 自定义字段5
159   - */
160   - @TableField(value = "userDef5")
161   - @ApiModelProperty(value="自定义字段5")
162   - private String userDef5;
163   -
164   - /**
165   - * 自定义字段6
166   - */
167   - @TableField(value = "userDef6")
168   - @ApiModelProperty(value="自定义字段6")
169   - private String userDef6;
170   -
171   - /**
172   - * 自定义字段7
173   - */
174   - @TableField(value = "userDef7")
175   - @ApiModelProperty(value="自定义字段7")
176   - private String userDef7;
177   -
178   - /**
179   - * 自定义字段8
180   - */
181   - @TableField(value = "userDef8")
182   - @ApiModelProperty(value="自定义字段8")
183   - private String userDef8;
184 158  
185 159 /**
186 160 * 处理标记
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/mapper/FilterConfigDetailMapper.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/mapper/FilterConfigDetailMapper.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigDetail.mapper;
  1 +package com.huaheng.pc.config.FilterConfigDetail.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail;
  4 +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
5 5  
6 6 public interface FilterConfigDetailMapper extends BaseMapper<FilterConfigDetail> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/service/FilterConfigDetailService.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigDetail.service;
  1 +package com.huaheng.pc.config.FilterConfigDetail.service;
2 2  
3   -import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail;
8   -import com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper;
  4 +import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
  5 +import com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 8 @Service
10 9 public class FilterConfigDetailService extends ServiceImpl<FilterConfigDetailMapper, FilterConfigDetail> {
11 10  
... ...
src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.config.FilterConfigHeader.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
  17 +import com.huaheng.pc.config.FilterConfigHeader.service.FilterConfigHeaderService;
  18 +import io.swagger.annotations.Api;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.web.bind.annotation.GetMapping;
  23 +import org.springframework.web.bind.annotation.PostMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.ResponseBody;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 订单分析过滤主表
  31 + * @author ricard
  32 + * @date 19.8.26
  33 + *
  34 + */
  35 +
  36 +@Api(tags={"订单分析过滤主表"})
  37 +@Controller
  38 +@RequestMapping("/config/filterConfigHeader")
  39 +public class FilterConfigHeaderController extends BaseController {
  40 +
  41 + private String prefix = "config/filterConfigHeader";
  42 +
  43 + @Autowired
  44 + private FilterConfigHeaderService filterConfigHeaderService;
  45 +
  46 + @RequiresPermissions("config:filterConfigHeader:view")
  47 + @GetMapping()
  48 + public String filterConfigHeader() {
  49 + return prefix + "/filterConfigHeader";
  50 + }
  51 +
  52 + /**
  53 + * 查询订单分析结果
  54 + */
  55 + @RequiresPermissions("config:filterConfigHeader:list")
  56 + @Log(title = "配置-订单分析过滤主表", operating="查看订单分析过滤主表", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(FilterConfigHeader filterConfigHeader, String createdBegin, String createdEnd)
  60 + {
  61 + LambdaQueryWrapper<FilterConfigHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  62 + PageDomain pageDomain = TableSupport.buildPageRequest();
  63 + Integer pageNum = pageDomain.getPageNum();
  64 + Integer pageSize = pageDomain.getPageSize();
  65 +
  66 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),FilterConfigHeader::getCreated, createdBegin)
  67 + .le(StringUtils.isNotEmpty(createdEnd), FilterConfigHeader::getCreated, createdEnd)
  68 + .eq(FilterConfigHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  69 + .eq(StringUtils.isNotEmpty(filterConfigHeader.getModuleType()
  70 + ),FilterConfigHeader::getModuleType,filterConfigHeader.getModuleType())
  71 + .eq(StringUtils.isNotEmpty(filterConfigHeader.getRecordType()
  72 + ),FilterConfigHeader::getRecordType,filterConfigHeader.getRecordType())
  73 + .eq(StringUtils.isNotEmpty(filterConfigHeader.getFilterCode()
  74 + ),FilterConfigHeader::getFilterCode,filterConfigHeader.getFilterCode())
  75 + .like(StringUtils.isNotEmpty(filterConfigHeader.getFilterName()
  76 + ),FilterConfigHeader::getFilterName,filterConfigHeader.getFilterName());
  77 +
  78 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  79 + /**
  80 + * 使用分页查询
  81 + */
  82 + Page<FilterConfigHeader> page = new Page<>(pageNum, pageSize);
  83 + IPage<FilterConfigHeader> iPage = filterConfigHeaderService.page(page, lambdaQueryWrapper);
  84 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  85 + } else {
  86 + List<FilterConfigHeader> list = filterConfigHeaderService.list(lambdaQueryWrapper);
  87 + return getDataTable(list);
  88 + }
  89 + }
  90 +
  91 +
  92 +}
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/domain/FilterConfigHeader.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigHeader.domain;
  1 +package com.huaheng.pc.config.FilterConfigHeader.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModel;
8 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 11 import java.io.Serializable;
10 12 import java.util.Date;
11   -import lombok.Data;
12 13  
13 14 @ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader")
14 15 @Data
... ... @@ -126,33 +127,6 @@ public class FilterConfigHeader implements Serializable {
126 127 @ApiModelProperty(value="自定义字段4")
127 128 private String userDef4;
128 129  
129   - /**
130   - * 自定义字段5
131   - */
132   - @TableField(value = "userDef5")
133   - @ApiModelProperty(value="自定义字段5")
134   - private String userDef5;
135   -
136   - /**
137   - * 自定义字段6
138   - */
139   - @TableField(value = "userDef6")
140   - @ApiModelProperty(value="自定义字段6")
141   - private String userDef6;
142   -
143   - /**
144   - * 自定义字段7
145   - */
146   - @TableField(value = "userDef7")
147   - @ApiModelProperty(value="自定义字段7")
148   - private String userDef7;
149   -
150   - /**
151   - * 自定义字段8
152   - */
153   - @TableField(value = "userDef8")
154   - @ApiModelProperty(value="自定义字段8")
155   - private String userDef8;
156 130  
157 131 /**
158 132 * 处理标记
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigHeader.mapper;
  1 +package com.huaheng.pc.config.FilterConfigHeader.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
  4 +import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
5 5  
6 6 public interface FilterConfigHeaderMapper extends BaseMapper<FilterConfigHeader> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/service/FilterConfigHeaderService.java renamed to src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.FilterConfigHeader.service;
  1 +package com.huaheng.pc.config.FilterConfigHeader.service;
2 2  
3   -import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
8   -import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
  4 +import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
  5 +import com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 8 @Service
10 9 public class FilterConfigHeaderService extends ServiceImpl<FilterConfigHeaderMapper, FilterConfigHeader> {
11 10  
... ...
src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.config.shipmentAnalyzeTemplate.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  17 +import com.huaheng.pc.config.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
  18 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  19 +import io.swagger.annotations.Api;
  20 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  21 +import org.springframework.beans.factory.annotation.Autowired;
  22 +import org.springframework.stereotype.Controller;
  23 +import org.springframework.web.bind.annotation.GetMapping;
  24 +import org.springframework.web.bind.annotation.PostMapping;
  25 +import org.springframework.web.bind.annotation.RequestMapping;
  26 +import org.springframework.web.bind.annotation.ResponseBody;
  27 +
  28 +import java.util.List;
  29 +
  30 +/**
  31 + * 订单分析结果
  32 + * @author ricard
  33 + * @date 19.8.26
  34 + *
  35 + */
  36 +
  37 +@Api(tags={"订单分析结果"})
  38 +@Controller
  39 +@RequestMapping("/config/shipmentAnalyzeTemplate")
  40 +public class ShipmentAnalyzeTemplateController extends BaseController {
  41 +
  42 + private String prefix = "config/shipmentAnalyzeTemplate";
  43 +
  44 + @Autowired
  45 + private ShipmentAnalyzeTemplateService shipmentAnalyzeTemplateService;
  46 +
  47 +
  48 + @RequiresPermissions("config:shipmentAnalyzeTemplate:view")
  49 + @GetMapping()
  50 + public String shipmentAnalyzeTemplate() {
  51 + return prefix + "/shipmentAnalyzeTemplate";
  52 + }
  53 +
  54 + /**
  55 + * 查询订单分析结果
  56 + */
  57 + @RequiresPermissions("config:shipmentAnalyzeTemplate:list")
  58 + @Log(title = "配置-订单分析结果", operating="查看订单分析结果", action = BusinessType.GRANT)
  59 + @PostMapping("/list")
  60 + @ResponseBody
  61 + public TableDataInfo list(ShipmentAnalyzeTemplate shipmentAnalyzeTemplate, String createdBegin, String createdEnd)
  62 + {
  63 + LambdaQueryWrapper<ShipmentAnalyzeTemplate> lambdaQueryWrapper = Wrappers.lambdaQuery();
  64 + PageDomain pageDomain = TableSupport.buildPageRequest();
  65 + Integer pageNum = pageDomain.getPageNum();
  66 + Integer pageSize = pageDomain.getPageSize();
  67 +
  68 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentAnalyzeTemplate::getCreated, createdBegin)
  69 + .le(StringUtils.isNotEmpty(createdEnd), ShipmentAnalyzeTemplate::getCreated, createdEnd)
  70 + .eq(ShipmentAnalyzeTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
  71 + .eq(StringUtils.isNotEmpty(shipmentAnalyzeTemplate.getCriteriaCode()
  72 + ),ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
  73 +
  74 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  75 + /**
  76 + * 使用分页查询
  77 + */
  78 + Page<ShipmentAnalyzeTemplate> page = new Page<>(pageNum, pageSize);
  79 + IPage<ShipmentAnalyzeTemplate> iPage = shipmentAnalyzeTemplateService.page(page, lambdaQueryWrapper);
  80 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  81 + } else {
  82 + List<ShipmentAnalyzeTemplate> list = shipmentAnalyzeTemplateService.list(lambdaQueryWrapper);
  83 + return getDataTable(list);
  84 + }
  85 + }
  86 +
  87 +
  88 +}
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain;
  1 +package com.huaheng.pc.config.shipmentAnalyzeTemplate.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModel;
8 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 11 import java.io.Serializable;
10 12 import java.util.Date;
11   -import lombok.Data;
12 13  
13 14 @ApiModel(value="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate")
14 15 @Data
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper;
  1 +package com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  4 +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
5 5  
6 6 public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java renamed to src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
  View file @7a9f6ca
1   -package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service;
  1 +package com.huaheng.pc.config.shipmentAnalyzeTemplate.service;
2 2  
3   -import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
8   -import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
  4 +import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  5 +import com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 8 @Service
10 9 public class ShipmentAnalyzeTemplateService extends ServiceImpl<ShipmentAnalyzeTemplateMapper, ShipmentAnalyzeTemplate> {
11 10  
... ...
src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.shipment.wave.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.shipment.wave.domain.Wave;
  17 +import com.huaheng.pc.shipment.wave.service.WaveService;
  18 +import io.swagger.annotations.Api;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.web.bind.annotation.GetMapping;
  23 +import org.springframework.web.bind.annotation.PostMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.ResponseBody;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 波次
  31 + * @author ricard
  32 + * @date 19.8.26
  33 + *
  34 + */
  35 +
  36 +@Api(tags={"波次"})
  37 +@Controller
  38 +@RequestMapping("/shipment/wave")
  39 +public class WaveController extends BaseController {
  40 +
  41 + private String prefix = "shipment/wave";
  42 +
  43 + @Autowired
  44 + private WaveService waveService;
  45 +
  46 + @RequiresPermissions("shipment:wave:view")
  47 + @GetMapping()
  48 + public String wave() {
  49 + return prefix + "/wave";
  50 + }
  51 +
  52 + /**
  53 + * 查询订单分析结果
  54 + */
  55 + @RequiresPermissions("shipment:wave:list")
  56 + @Log(title = "出库-波次", operating="查看波次", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(Wave wave, String createdBegin, String createdEnd)
  60 + {
  61 + LambdaQueryWrapper<Wave> lambdaQueryWrapper = Wrappers.lambdaQuery();
  62 + PageDomain pageDomain = TableSupport.buildPageRequest();
  63 + Integer pageNum = pageDomain.getPageNum();
  64 + Integer pageSize = pageDomain.getPageSize();
  65 +
  66 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Wave::getCreated, createdBegin)
  67 + .le(StringUtils.isNotEmpty(createdEnd), Wave::getCreated, createdEnd)
  68 + .eq(Wave::getWarehouseCode, ShiroUtils.getWarehouseCode())
  69 + .eq(StringUtils.isNotEmpty(wave.getWaveMode()
  70 + ),Wave::getWaveMode,wave.getWaveMode())
  71 + .eq(wave.getStatus()!=null,Wave::getStatus,wave.getStatus())
  72 + .like(StringUtils.isNotEmpty(wave.getWaveName()
  73 + ),Wave::getWaveName,wave.getWaveName());
  74 +
  75 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  76 + /**
  77 + * 使用分页查询
  78 + */
  79 + Page<Wave> page = new Page<>(pageNum, pageSize);
  80 + IPage<Wave> iPage = waveService.page(page, lambdaQueryWrapper);
  81 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  82 + } else {
  83 + List<Wave> list = waveService.list(lambdaQueryWrapper);
  84 + return getDataTable(list);
  85 + }
  86 + }
  87 +
  88 +
  89 +}
... ...
src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java
  View file @7a9f6ca
... ... @@ -45,9 +45,9 @@ public class Wave implements Serializable {
45 45 /**
46 46 * 状态
47 47 */
48   - @TableField(value = "enable")
  48 + @TableField(value = "status")
49 49 @ApiModelProperty(value="状态")
50   - private Integer enable;
  50 + private Integer status;
51 51  
52 52 /**
53 53 * 当前波次步骤
... ... @@ -217,33 +217,6 @@ public class Wave implements Serializable {
217 217 @ApiModelProperty(value="自定义字段4")
218 218 private String userDef4;
219 219  
220   - /**
221   - * 自定义字段5
222   - */
223   - @TableField(value = "userDef5")
224   - @ApiModelProperty(value="自定义字段5")
225   - private String userDef5;
226   -
227   - /**
228   - * 自定义字段6
229   - */
230   - @TableField(value = "userDef6")
231   - @ApiModelProperty(value="自定义字段6")
232   - private String userDef6;
233   -
234   - /**
235   - * 自定义字段7
236   - */
237   - @TableField(value = "userDef7")
238   - @ApiModelProperty(value="自定义字段7")
239   - private String userDef7;
240   -
241   - /**
242   - * 自定义字段8
243   - */
244   - @TableField(value = "userDef8")
245   - @ApiModelProperty(value="自定义字段8")
246   - private String userDef8;
247 220  
248 221 /**
249 222 * 处理标记
... ...
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/controller/WaveFlowDetailController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.shipment.waveFlowDetail.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail;
  17 +import com.huaheng.pc.shipment.waveFlowDetail.service.WaveFlowDetailService;
  18 +import io.swagger.annotations.Api;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.web.bind.annotation.GetMapping;
  23 +import org.springframework.web.bind.annotation.PostMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.ResponseBody;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 波次流明细
  31 + * @author ricard
  32 + * @date 19.8.26
  33 + *
  34 + */
  35 +
  36 +@Api(tags={"波次流明细"})
  37 +@Controller
  38 +@RequestMapping("/shipment/waveFlowDetail")
  39 +public class WaveFlowDetailController extends BaseController {
  40 +
  41 + private String prefix = "shipment/waveFlowDetail";
  42 +
  43 + @Autowired
  44 + private WaveFlowDetailService waveFlowDetailService;
  45 +
  46 + @RequiresPermissions("shipment:waveFlowDetail:view")
  47 + @GetMapping()
  48 + public String waveFlowDetail() {
  49 + return prefix + "/waveFlowDetail";
  50 + }
  51 +
  52 + /**
  53 + * 查询订单分析结果
  54 + */
  55 + @RequiresPermissions("shipment:waveFlowDetail:list")
  56 + @Log(title = "出库-波次流明细", operating="查看波次流明细", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(WaveFlowDetail waveFlowDetail, String createdBegin, String createdEnd)
  60 + {
  61 + LambdaQueryWrapper<WaveFlowDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  62 + PageDomain pageDomain = TableSupport.buildPageRequest();
  63 + Integer pageNum = pageDomain.getPageNum();
  64 + Integer pageSize = pageDomain.getPageSize();
  65 +
  66 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowDetail::getCreated, createdBegin)
  67 + .le(StringUtils.isNotEmpty(createdEnd), WaveFlowDetail::getCreated, createdEnd)
  68 + .eq(WaveFlowDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
  69 +
  70 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  71 + /**
  72 + * 使用分页查询
  73 + */
  74 + Page<WaveFlowDetail> page = new Page<>(pageNum, pageSize);
  75 + IPage<WaveFlowDetail> iPage = waveFlowDetailService.page(page, lambdaQueryWrapper);
  76 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  77 + } else {
  78 + List<WaveFlowDetail> list = waveFlowDetailService.list(lambdaQueryWrapper);
  79 + return getDataTable(list);
  80 + }
  81 + }
  82 +
  83 +
  84 +}
... ...
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java
  View file @7a9f6ca
... ... @@ -151,33 +151,6 @@ public class WaveFlowDetail implements Serializable {
151 151 @ApiModelProperty(value="自定义字段4")
152 152 private String userDef4;
153 153  
154   - /**
155   - * 自定义字段5
156   - */
157   - @TableField(value = "userDef5")
158   - @ApiModelProperty(value="自定义字段5")
159   - private String userDef5;
160   -
161   - /**
162   - * 自定义字段6
163   - */
164   - @TableField(value = "userDef6")
165   - @ApiModelProperty(value="自定义字段6")
166   - private String userDef6;
167   -
168   - /**
169   - * 自定义字段7
170   - */
171   - @TableField(value = "userDef7")
172   - @ApiModelProperty(value="自定义字段7")
173   - private String userDef7;
174   -
175   - /**
176   - * 自定义字段8
177   - */
178   - @TableField(value = "userDef8")
179   - @ApiModelProperty(value="自定义字段8")
180   - private String userDef8;
181 154  
182 155 /**
183 156 * 处理标记
... ...
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/controller/WaveMasterController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.shipment.waveFlowHeader.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader;
  17 +import com.huaheng.pc.shipment.waveFlowHeader.service.WaveFlowHeaderService;
  18 +import io.swagger.annotations.Api;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.web.bind.annotation.GetMapping;
  23 +import org.springframework.web.bind.annotation.PostMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.ResponseBody;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 波次流头表
  31 + * @author ricard
  32 + * @date 19.8.26
  33 + *
  34 + */
  35 +
  36 +@Api(tags={"波次流头表"})
  37 +@Controller
  38 +@RequestMapping("/shipment/waveFlowHeader")
  39 +public class WaveMasterController extends BaseController {
  40 +
  41 + private String prefix = "shipment/waveFlowHeader";
  42 +
  43 + @Autowired
  44 + private WaveFlowHeaderService waveFlowHeaderService;
  45 +
  46 + @RequiresPermissions("shipment:waveFlowHeader:view")
  47 + @GetMapping()
  48 + public String waveFlowHeader() {
  49 + return prefix + "/waveFlowHeader";
  50 + }
  51 +
  52 + /**
  53 + * 查询订单分析结果
  54 + */
  55 + @RequiresPermissions("shipment:waveFlowHeader:list")
  56 + @Log(title = "出库-波次流头表", operating="查看波次流头表", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(WaveFlowHeader waveFlowHeader, String createdBegin, String createdEnd)
  60 + {
  61 + LambdaQueryWrapper<WaveFlowHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  62 + PageDomain pageDomain = TableSupport.buildPageRequest();
  63 + Integer pageNum = pageDomain.getPageNum();
  64 + Integer pageSize = pageDomain.getPageSize();
  65 +
  66 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowHeader::getCreated, createdBegin)
  67 + .le(StringUtils.isNotEmpty(createdEnd), WaveFlowHeader::getCreated, createdEnd)
  68 + .eq(WaveFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  69 + .eq(StringUtils.isNotEmpty(waveFlowHeader.getCode()
  70 + ),WaveFlowHeader::getCode,waveFlowHeader.getCode());
  71 +
  72 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  73 + /**
  74 + * 使用分页查询
  75 + */
  76 + Page<WaveFlowHeader> page = new Page<>(pageNum, pageSize);
  77 + IPage<WaveFlowHeader> iPage = waveFlowHeaderService.page(page, lambdaQueryWrapper);
  78 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  79 + } else {
  80 + List<WaveFlowHeader> list = waveFlowHeaderService.list(lambdaQueryWrapper);
  81 + return getDataTable(list);
  82 + }
  83 + }
  84 +
  85 +
  86 +}
... ...
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java
  View file @7a9f6ca
... ... @@ -98,33 +98,6 @@ public class WaveFlowHeader implements Serializable {
98 98 @ApiModelProperty(value="自定义字段4")
99 99 private String userDef4;
100 100  
101   - /**
102   - * 自定义字段5
103   - */
104   - @TableField(value = "userDef5")
105   - @ApiModelProperty(value="自定义字段5")
106   - private String userDef5;
107   -
108   - /**
109   - * 自定义字段6
110   - */
111   - @TableField(value = "userDef6")
112   - @ApiModelProperty(value="自定义字段6")
113   - private String userDef6;
114   -
115   - /**
116   - * 自定义字段7
117   - */
118   - @TableField(value = "userDef7")
119   - @ApiModelProperty(value="自定义字段7")
120   - private String userDef7;
121   -
122   - /**
123   - * 自定义字段8
124   - */
125   - @TableField(value = "userDef8")
126   - @ApiModelProperty(value="自定义字段8")
127   - private String userDef8;
128 101  
129 102 /**
130 103 * 处理标记
... ...
src/main/java/com/huaheng/pc/shipment/waveMaster/controller/WaveMasterController.java 0 → 100644
  View file @7a9f6ca
  1 +package com.huaheng.pc.shipment.waveMaster.controller;
  2 +
  3 +
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.shipment.wave.domain.Wave;
  17 +import com.huaheng.pc.shipment.waveMaster.domain.WaveMaster;
  18 +import com.huaheng.pc.shipment.waveMaster.service.WaveMasterService;
  19 +import io.swagger.annotations.Api;
  20 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  21 +import org.springframework.beans.factory.annotation.Autowired;
  22 +import org.springframework.stereotype.Controller;
  23 +import org.springframework.web.bind.annotation.GetMapping;
  24 +import org.springframework.web.bind.annotation.PostMapping;
  25 +import org.springframework.web.bind.annotation.RequestMapping;
  26 +import org.springframework.web.bind.annotation.ResponseBody;
  27 +
  28 +import java.util.List;
  29 +
  30 +/**
  31 + * 波次主表
  32 + * @author ricard
  33 + * @date 19.8.26
  34 + *
  35 + */
  36 +
  37 +@Api(tags={"波次主表"})
  38 +@Controller
  39 +@RequestMapping("/shipment/waveMaster")
  40 +public class WaveMasterController extends BaseController {
  41 +
  42 + private String prefix = "shipment/waveMaster";
  43 +
  44 + @Autowired
  45 + private WaveMasterService waveMasterService;
  46 +
  47 + @RequiresPermissions("shipment:waveMaster:view")
  48 + @GetMapping()
  49 + public String WaveMaster() {
  50 + return prefix + "/waveMaster";
  51 + }
  52 +
  53 + /**
  54 + * 查询订单分析结果
  55 + */
  56 + @RequiresPermissions("shipment:waveMaster:list")
  57 + @Log(title = "出库-波次主表", operating="查看波次主表", action = BusinessType.GRANT)
  58 + @PostMapping("/list")
  59 + @ResponseBody
  60 + public TableDataInfo list(WaveMaster waveMaster, String createdBegin, String createdEnd)
  61 + {
  62 + LambdaQueryWrapper<WaveMaster> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 +
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveMaster::getCreated, createdBegin)
  68 + .le(StringUtils.isNotEmpty(createdEnd), WaveMaster::getCreated, createdEnd)
  69 + .eq(WaveMaster::getWarehouseCode, ShiroUtils.getWarehouseCode())
  70 + .eq(StringUtils.isNotEmpty(waveMaster.getCode()
  71 + ),WaveMaster::getCode,waveMaster.getCode())
  72 + .like(StringUtils.isNotEmpty(waveMaster.getShipmentFilterCode()
  73 + ),WaveMaster::getShipmentFilterCode,waveMaster.getShipmentFilterCode());
  74 +
  75 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  76 + /**
  77 + * 使用分页查询
  78 + */
  79 + Page<WaveMaster> page = new Page<>(pageNum, pageSize);
  80 + IPage<WaveMaster> iPage = waveMasterService.page(page, lambdaQueryWrapper);
  81 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  82 + } else {
  83 + List<WaveMaster> list = waveMasterService.list(lambdaQueryWrapper);
  84 + return getDataTable(list);
  85 + }
  86 + }
  87 +
  88 +
  89 +}
... ...
src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java
  View file @7a9f6ca
... ... @@ -224,33 +224,6 @@ public class WaveMaster implements Serializable {
224 224 @ApiModelProperty(value="自定义字段4")
225 225 private String userDef4;
226 226  
227   - /**
228   - * 自定义字段5
229   - */
230   - @TableField(value = "userDef5")
231   - @ApiModelProperty(value="自定义字段5")
232   - private String userDef5;
233   -
234   - /**
235   - * 自定义字段6
236   - */
237   - @TableField(value = "userDef6")
238   - @ApiModelProperty(value="自定义字段6")
239   - private String userDef6;
240   -
241   - /**
242   - * 自定义字段7
243   - */
244   - @TableField(value = "userDef7")
245   - @ApiModelProperty(value="自定义字段7")
246   - private String userDef7;
247   -
248   - /**
249   - * 自定义字段8
250   - */
251   - @TableField(value = "userDef8")
252   - @ApiModelProperty(value="自定义字段8")
253   - private String userDef8;
254 227  
255 228 /**
256 229 * 处理标记
... ...
src/main/resources/mybatis/shipment/FilterConfigDetailMapper.xml renamed to src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
  View file @7a9f6ca
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="headerId" jdbcType="INTEGER" property="headerId" />
... ...
src/main/resources/mybatis/shipment/FilterConfigHeaderMapper.xml renamed to src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
  View file @7a9f6ca
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
... ...
src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml renamed to src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml
  View file @7a9f6ca
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="code" jdbcType="VARCHAR" property="code" />
... ...