diff --git a/src/main/java/com/huaheng/pc/config/FilterConfigDetail/controller/FilterConfigDetailController.java b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/controller/FilterConfigDetailController.java
new file mode 100644
index 0000000..917873c
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/controller/FilterConfigDetailController.java
@@ -0,0 +1,92 @@
+package com.huaheng.pc.config.FilterConfigDetail.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 订单分析过滤子表
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"订单分析过滤子表"})
+@Controller
+@RequestMapping("/config/filterConfigDetail")
+public class FilterConfigDetailController extends BaseController {
+
+ private String prefix = "config/filterConfigDetail";
+
+ @Autowired
+ private FilterConfigDetailService filterConfigDetailService;
+
+
+ @RequiresPermissions("config:filterConfigDetail:view")
+ @GetMapping()
+ public String filterConfigDetail() {
+ return prefix + "/filterConfigDetail";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("config:filterConfigDetail:list")
+ @Log(title = "配置-订单分析过滤子表", operating="查看订单分析过滤子表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(FilterConfigDetail filterConfigDetail, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),FilterConfigDetail::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), FilterConfigDetail::getCreated, createdEnd)
+ .eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(filterConfigDetail.getModuleType()
+ ),FilterConfigDetail::getModuleType,filterConfigDetail.getModuleType())
+ .eq(StringUtils.isNotEmpty(filterConfigDetail.getRecordType()
+ ),FilterConfigDetail::getRecordType,filterConfigDetail.getRecordType())
+ .eq(StringUtils.isNotEmpty(filterConfigDetail.getFilterCode()
+ ),FilterConfigDetail::getFilterCode,filterConfigDetail.getFilterCode())
+ .like(StringUtils.isNotEmpty(filterConfigDetail.getFilterName()
+ ),FilterConfigDetail::getFilterName,filterConfigDetail.getFilterName());
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<FilterConfigDetail> page = new Page<>(pageNum, pageSize);
+ IPage<FilterConfigDetail> iPage = filterConfigDetailService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<FilterConfigDetail> list = filterConfigDetailService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/domain/FilterConfigDetail.java b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
index aa2fe41..2a1cd7b 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/domain/FilterConfigDetail.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.shipment.FilterConfigDetail.domain;
+package com.huaheng.pc.config.FilterConfigDetail.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ 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;
-import lombok.Data;
@ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail")
@Data
@@ -154,33 +155,6 @@ public class FilterConfigDetail implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/mapper/FilterConfigDetailMapper.java b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/mapper/FilterConfigDetailMapper.java
index f71d68d..470bf8b 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/mapper/FilterConfigDetailMapper.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/mapper/FilterConfigDetailMapper.java
@@ -1,7 +1,7 @@
-package com.huaheng.pc.shipment.FilterConfigDetail.mapper;
+package com.huaheng.pc.config.FilterConfigDetail.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
public interface FilterConfigDetailMapper extends BaseMapper<FilterConfigDetail> {
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/service/FilterConfigDetailService.java b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java
index ee911a8..507823a 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/service/FilterConfigDetailService.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java
@@ -1,11 +1,10 @@
-package com.huaheng.pc.shipment.FilterConfigDetail.service;
+package com.huaheng.pc.config.FilterConfigDetail.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.shipment.FilterConfigDetail.domain.FilterConfigDetail;
-import com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper;
+import org.springframework.stereotype.Service;
+
@Service
public class FilterConfigDetailService extends ServiceImpl<FilterConfigDetailMapper, FilterConfigDetail> {
diff --git a/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java
new file mode 100644
index 0000000..7b50bc8
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java
@@ -0,0 +1,92 @@
+package com.huaheng.pc.config.FilterConfigHeader.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
+import com.huaheng.pc.config.FilterConfigHeader.service.FilterConfigHeaderService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 订单分析过滤主表
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"订单分析过滤主表"})
+@Controller
+@RequestMapping("/config/filterConfigHeader")
+public class FilterConfigHeaderController extends BaseController {
+
+ private String prefix = "config/filterConfigHeader";
+
+ @Autowired
+ private FilterConfigHeaderService filterConfigHeaderService;
+
+ @RequiresPermissions("config:filterConfigHeader:view")
+ @GetMapping()
+ public String filterConfigHeader() {
+ return prefix + "/filterConfigHeader";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("config:filterConfigHeader:list")
+ @Log(title = "配置-订单分析过滤主表", operating="查看订单分析过滤主表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(FilterConfigHeader filterConfigHeader, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<FilterConfigHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),FilterConfigHeader::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), FilterConfigHeader::getCreated, createdEnd)
+ .eq(FilterConfigHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(filterConfigHeader.getModuleType()
+ ),FilterConfigHeader::getModuleType,filterConfigHeader.getModuleType())
+ .eq(StringUtils.isNotEmpty(filterConfigHeader.getRecordType()
+ ),FilterConfigHeader::getRecordType,filterConfigHeader.getRecordType())
+ .eq(StringUtils.isNotEmpty(filterConfigHeader.getFilterCode()
+ ),FilterConfigHeader::getFilterCode,filterConfigHeader.getFilterCode())
+ .like(StringUtils.isNotEmpty(filterConfigHeader.getFilterName()
+ ),FilterConfigHeader::getFilterName,filterConfigHeader.getFilterName());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<FilterConfigHeader> page = new Page<>(pageNum, pageSize);
+ IPage<FilterConfigHeader> iPage = filterConfigHeaderService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<FilterConfigHeader> list = filterConfigHeaderService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/domain/FilterConfigHeader.java b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
index 13d058c..e9e8e02 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/domain/FilterConfigHeader.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.shipment.FilterConfigHeader.domain;
+package com.huaheng.pc.config.FilterConfigHeader.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ 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;
-import lombok.Data;
@ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader")
@Data
@@ -126,33 +127,6 @@ public class FilterConfigHeader implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java
index 19ff1be..b4391a1 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java
@@ -1,7 +1,7 @@
-package com.huaheng.pc.shipment.FilterConfigHeader.mapper;
+package com.huaheng.pc.config.FilterConfigHeader.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
+import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
public interface FilterConfigHeaderMapper extends BaseMapper<FilterConfigHeader> {
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/service/FilterConfigHeaderService.java b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java
index 7e03591..dafaf1a 100644
--- a/src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/service/FilterConfigHeaderService.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java
@@ -1,11 +1,10 @@
-package com.huaheng.pc.shipment.FilterConfigHeader.service;
+package com.huaheng.pc.config.FilterConfigHeader.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.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
-import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
+import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
+import com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
+import org.springframework.stereotype.Service;
+
@Service
public class FilterConfigHeaderService extends ServiceImpl<FilterConfigHeaderMapper, FilterConfigHeader> {
diff --git a/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
new file mode 100644
index 0000000..71f6fea
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/controller/ShipmentAnalyzeTemplateController.java
@@ -0,0 +1,88 @@
+package com.huaheng.pc.config.shipmentAnalyzeTemplate.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.config.shipmentAnalyzeTemplate.service.ShipmentAnalyzeTemplateService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 订单分析结果
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"订单分析结果"})
+@Controller
+@RequestMapping("/config/shipmentAnalyzeTemplate")
+public class ShipmentAnalyzeTemplateController extends BaseController {
+
+ private String prefix = "config/shipmentAnalyzeTemplate";
+
+ @Autowired
+ private ShipmentAnalyzeTemplateService shipmentAnalyzeTemplateService;
+
+
+ @RequiresPermissions("config:shipmentAnalyzeTemplate:view")
+ @GetMapping()
+ public String shipmentAnalyzeTemplate() {
+ return prefix + "/shipmentAnalyzeTemplate";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("config:shipmentAnalyzeTemplate:list")
+ @Log(title = "配置-订单分析结果", operating="查看订单分析结果", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(ShipmentAnalyzeTemplate shipmentAnalyzeTemplate, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<ShipmentAnalyzeTemplate> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentAnalyzeTemplate::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), ShipmentAnalyzeTemplate::getCreated, createdEnd)
+ .eq(ShipmentAnalyzeTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(shipmentAnalyzeTemplate.getCriteriaCode()
+ ),ShipmentAnalyzeTemplate::getCriteriaCode,shipmentAnalyzeTemplate.getCriteriaCode());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<ShipmentAnalyzeTemplate> page = new Page<>(pageNum, pageSize);
+ IPage<ShipmentAnalyzeTemplate> iPage = shipmentAnalyzeTemplateService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<ShipmentAnalyzeTemplate> list = shipmentAnalyzeTemplateService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
index 9358b53..4414573 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain;
+package com.huaheng.pc.config.shipmentAnalyzeTemplate.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ 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;
-import lombok.Data;
@ApiModel(value="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate")
@Data
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
index 514a56a..849ef20 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java
@@ -1,7 +1,7 @@
-package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper;
+package com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> {
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
index c43e37f..d85d784 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java
@@ -1,11 +1,10 @@
-package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.service;
+package com.huaheng.pc.config.shipmentAnalyzeTemplate.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.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
-import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
+import com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
+import com.huaheng.pc.config.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
+import org.springframework.stereotype.Service;
+
@Service
public class ShipmentAnalyzeTemplateService extends ServiceImpl<ShipmentAnalyzeTemplateMapper, ShipmentAnalyzeTemplate> {
diff --git a/src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java b/src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java
new file mode 100644
index 0000000..b5b2a49
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java
@@ -0,0 +1,89 @@
+package com.huaheng.pc.shipment.wave.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.shipment.wave.domain.Wave;
+import com.huaheng.pc.shipment.wave.service.WaveService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 波次
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"波次"})
+@Controller
+@RequestMapping("/shipment/wave")
+public class WaveController extends BaseController {
+
+ private String prefix = "shipment/wave";
+
+ @Autowired
+ private WaveService waveService;
+
+ @RequiresPermissions("shipment:wave:view")
+ @GetMapping()
+ public String wave() {
+ return prefix + "/wave";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("shipment:wave:list")
+ @Log(title = "出库-波次", operating="查看波次", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(Wave wave, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<Wave> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Wave::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), Wave::getCreated, createdEnd)
+ .eq(Wave::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(wave.getWaveMode()
+ ),Wave::getWaveMode,wave.getWaveMode())
+ .eq(wave.getStatus()!=null,Wave::getStatus,wave.getStatus())
+ .like(StringUtils.isNotEmpty(wave.getWaveName()
+ ),Wave::getWaveName,wave.getWaveName());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<Wave> page = new Page<>(pageNum, pageSize);
+ IPage<Wave> iPage = waveService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<Wave> list = waveService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java b/src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java
index b9521f2..718b813 100644
--- a/src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java
+++ b/src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java
@@ -45,9 +45,9 @@ public class Wave implements Serializable {
/**
* 状态
*/
- @TableField(value = "enable")
+ @TableField(value = "status")
@ApiModelProperty(value="状态")
- private Integer enable;
+ private Integer status;
/**
* 当前波次步骤
@@ -217,33 +217,6 @@ public class Wave implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/controller/WaveFlowDetailController.java b/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/controller/WaveFlowDetailController.java
new file mode 100644
index 0000000..7785a02
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/controller/WaveFlowDetailController.java
@@ -0,0 +1,84 @@
+package com.huaheng.pc.shipment.waveFlowDetail.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail;
+import com.huaheng.pc.shipment.waveFlowDetail.service.WaveFlowDetailService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 波次流明细
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"波次流明细"})
+@Controller
+@RequestMapping("/shipment/waveFlowDetail")
+public class WaveFlowDetailController extends BaseController {
+
+ private String prefix = "shipment/waveFlowDetail";
+
+ @Autowired
+ private WaveFlowDetailService waveFlowDetailService;
+
+ @RequiresPermissions("shipment:waveFlowDetail:view")
+ @GetMapping()
+ public String waveFlowDetail() {
+ return prefix + "/waveFlowDetail";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("shipment:waveFlowDetail:list")
+ @Log(title = "出库-波次流明细", operating="查看波次流明细", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(WaveFlowDetail waveFlowDetail, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<WaveFlowDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowDetail::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), WaveFlowDetail::getCreated, createdEnd)
+ .eq(WaveFlowDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<WaveFlowDetail> page = new Page<>(pageNum, pageSize);
+ IPage<WaveFlowDetail> iPage = waveFlowDetailService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<WaveFlowDetail> list = waveFlowDetailService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java b/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java
index 8cf10f3..9d16257 100644
--- a/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java
+++ b/src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java
@@ -151,33 +151,6 @@ public class WaveFlowDetail implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/controller/WaveMasterController.java b/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/controller/WaveMasterController.java
new file mode 100644
index 0000000..13969f7
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/controller/WaveMasterController.java
@@ -0,0 +1,86 @@
+package com.huaheng.pc.shipment.waveFlowHeader.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader;
+import com.huaheng.pc.shipment.waveFlowHeader.service.WaveFlowHeaderService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 波次流头表
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"波次流头表"})
+@Controller
+@RequestMapping("/shipment/waveFlowHeader")
+public class WaveMasterController extends BaseController {
+
+ private String prefix = "shipment/waveFlowHeader";
+
+ @Autowired
+ private WaveFlowHeaderService waveFlowHeaderService;
+
+ @RequiresPermissions("shipment:waveFlowHeader:view")
+ @GetMapping()
+ public String waveFlowHeader() {
+ return prefix + "/waveFlowHeader";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("shipment:waveFlowHeader:list")
+ @Log(title = "出库-波次流头表", operating="查看波次流头表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(WaveFlowHeader waveFlowHeader, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<WaveFlowHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowHeader::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), WaveFlowHeader::getCreated, createdEnd)
+ .eq(WaveFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(waveFlowHeader.getCode()
+ ),WaveFlowHeader::getCode,waveFlowHeader.getCode());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<WaveFlowHeader> page = new Page<>(pageNum, pageSize);
+ IPage<WaveFlowHeader> iPage = waveFlowHeaderService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<WaveFlowHeader> list = waveFlowHeaderService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java b/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java
index 592a71b..5bfc476 100644
--- a/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java
+++ b/src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java
@@ -98,33 +98,6 @@ public class WaveFlowHeader implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/waveMaster/controller/WaveMasterController.java b/src/main/java/com/huaheng/pc/shipment/waveMaster/controller/WaveMasterController.java
new file mode 100644
index 0000000..ca38a65
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/shipment/waveMaster/controller/WaveMasterController.java
@@ -0,0 +1,89 @@
+package com.huaheng.pc.shipment.waveMaster.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.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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.shipment.wave.domain.Wave;
+import com.huaheng.pc.shipment.waveMaster.domain.WaveMaster;
+import com.huaheng.pc.shipment.waveMaster.service.WaveMasterService;
+import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 波次主表
+ * @author ricard
+ * @date 19.8.26
+ *
+ */
+
+@Api(tags={"波次主表"})
+@Controller
+@RequestMapping("/shipment/waveMaster")
+public class WaveMasterController extends BaseController {
+
+ private String prefix = "shipment/waveMaster";
+
+ @Autowired
+ private WaveMasterService waveMasterService;
+
+ @RequiresPermissions("shipment:waveMaster:view")
+ @GetMapping()
+ public String WaveMaster() {
+ return prefix + "/waveMaster";
+ }
+
+ /**
+ * 查询订单分析结果
+ */
+ @RequiresPermissions("shipment:waveMaster:list")
+ @Log(title = "出库-波次主表", operating="查看波次主表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(WaveMaster waveMaster, String createdBegin, String createdEnd)
+ {
+ LambdaQueryWrapper<WaveMaster> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveMaster::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), WaveMaster::getCreated, createdEnd)
+ .eq(WaveMaster::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(waveMaster.getCode()
+ ),WaveMaster::getCode,waveMaster.getCode())
+ .like(StringUtils.isNotEmpty(waveMaster.getShipmentFilterCode()
+ ),WaveMaster::getShipmentFilterCode,waveMaster.getShipmentFilterCode());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /**
+ * 使用分页查询
+ */
+ Page<WaveMaster> page = new Page<>(pageNum, pageSize);
+ IPage<WaveMaster> iPage = waveMasterService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<WaveMaster> list = waveMasterService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java b/src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java
index 3b7e71e..a44fe78 100644
--- a/src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java
+++ b/src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java
@@ -224,33 +224,6 @@ public class WaveMaster implements Serializable {
@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;
/**
* 处理标记
diff --git a/src/main/resources/mybatis/shipment/FilterConfigDetailMapper.xml b/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
index 44445f1..0e0c5be 100644
--- a/src/main/resources/mybatis/shipment/FilterConfigDetailMapper.xml
+++ b/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
@@ -1,7 +1,7 @@
<?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.FilterConfigDetail.mapper.FilterConfigDetailMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="headerId" jdbcType="INTEGER" property="headerId" />
diff --git a/src/main/resources/mybatis/shipment/FilterConfigHeaderMapper.xml b/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
index 50a666b..b33fe57 100644
--- a/src/main/resources/mybatis/shipment/FilterConfigHeaderMapper.xml
+++ b/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
@@ -1,7 +1,7 @@
<?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.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
diff --git a/src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml b/src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml
index 5d3ed9e..48db35f 100644
--- a/src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml
+++ b/src/main/resources/mybatis/config/ShipmentAnalyzeTemplateMapper.xml
@@ -1,7 +1,7 @@
<?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.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />