From 27ea54329337acd342813358d20bcd6151676ac7 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Wed, 25 Dec 2024 15:49:06 +0800
Subject: [PATCH] 1. 更新积木报表的打印模板，采用后端接口的方式，避免重复每个项目都要配置
---
ant-design-vue-jeecg/.env.development | 2 +-
ant-design-vue-jeecg/.env.production | 2 +-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java | 14 ++++++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java | 13 +++++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
huaheng-wms-core/src/main/resources/application-dev.yml | 2 +-
huaheng-wms-core/src/main/resources/application-prod.yml | 6 +++---
huaheng-wms-core/src/main/resources/application-test.yml | 10 +++++-----
11 files changed, 297 insertions(+), 155 deletions(-)
create mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java
diff --git a/ant-design-vue-jeecg/.env.development b/ant-design-vue-jeecg/.env.development
index 27a2ac0..ebfcbf0 100644
--- a/ant-design-vue-jeecg/.env.development
+++ b/ant-design-vue-jeecg/.env.development
@@ -1,7 +1,7 @@
NODE_ENV=development
VUE_APP_ENV=development
outputDir=dist
-VUE_APP_API_BASE_URL=http://localhost:8080/wms
+VUE_APP_API_BASE_URL=http://172.16.43.123:8080/wms
VUE_APP_CAS_BASE_URL=http://172.16.29.77:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/ant-design-vue-jeecg/.env.production b/ant-design-vue-jeecg/.env.production
index 88cd75d..52e1549 100644
--- a/ant-design-vue-jeecg/.env.production
+++ b/ant-design-vue-jeecg/.env.production
@@ -1,6 +1,6 @@
NODE_ENV=production
VUE_APP_ENV=production
outputDir=dist
-VUE_APP_API_BASE_URL=http://wms.huahengrobot.com/wms
+VUE_APP_API_BASE_URL=http://172.16.43.123:8080/wms
VUE_APP_CAS_BASE_URL=http://localhost:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
index 0c5faff..cb83c66 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.wms.config.container.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,12 +15,14 @@ import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.wms.config.container.entity.Container;
+import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
import org.jeecg.modules.wms.config.container.service.IContainerService;
import org.jeecg.modules.wms.config.location.entity.Location;
import org.jeecg.modules.wms.config.location.service.ILocationService;
import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -260,4 +263,15 @@ public class ContainerController extends JeecgController<Container, IContainerSe
return Result.OK(containerList);
}
+ @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContent")
+ public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+ containerLambdaQueryWrapper.in(Container::getId, Arrays.asList(ids.split(",")));
+ List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(containerList);
+ return jimuReportResult;
+ }
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java
new file mode 100644
index 0000000..b478f02
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.wms.config.container.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class JimuReportResult<T> extends Object implements Serializable {
+
+ private T data;
+
+
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
index 14d3cca..455ce3d 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
@@ -1,17 +1,19 @@
package org.jeecg.modules.wms.config.location.controller;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
import org.jeecg.modules.wms.config.location.dto.*;
import org.jeecg.modules.wms.config.location.entity.BatchLocation;
import org.jeecg.modules.wms.config.location.entity.Location;
@@ -21,25 +23,23 @@ import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.PageUtil;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
/**
* @Description: 库位管理
- * @Author: jeecg-boot
- * @Date: 2022-10-26
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2022-10-26
+ * @Version: V1.0
*/
@Api(tags = "库位管理")
@RestController
@@ -55,17 +55,18 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 分页列表查询
- * @param location
- * @param pageNo
- * @param pageSize
- * @param req
+ *
+ * @param location
+ * @param pageNo
+ * @param pageSize
+ * @param req
* @return
*/
// @AutoLog(value = "库位管理-分页列表查询")
@ApiOperation(value = "库位管理-分页列表查询", notes = "库位管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Location>> queryPageList(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
HuahengJwtUtil.setWarehouseCode(req, location);
Integer haveContainer = location.getHaveContainerInLocation();
location.setHaveContainer(null);
@@ -87,52 +88,55 @@ public class LocationController extends JeecgController<Location, ILocationServi
@ApiOperation(value = "库位管理-获取有货库位", notes = "库位管理-获取有货库位")
@GetMapping(value = "/listSomeContainerInLocation")
public Result<IPage<Location>> listSomeContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Page<Location> page = new Page<Location>(pageNo, pageSize);
HuahengJwtUtil.setWarehouseCode(req, location);
IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
- QuantityConstant.STATUS_CONTAINER_FILL_SOME, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
- location.getCode(), location.getRoadWay());
+ QuantityConstant.STATUS_CONTAINER_FILL_SOME, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
+ location.getCode(), location.getRoadWay());
return Result.OK(pageList);
}
/**
* 选取在库内的空托盘
- * @param location
+ *
+ * @param location
* @return
*/
@ApiOperation(value = "库位管理-获取空托盘库位", notes = "库位管理-获取空托盘库位")
@GetMapping(value = "/listEmptyContainerInLocation")
public Result<IPage<Location>> listEmptyContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Page<Location> page = new Page<Location>(pageNo, pageSize);
HuahengJwtUtil.setWarehouseCode(req, location);
IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
- QuantityConstant.STATUS_CONTAINER_EMPTY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
- location.getCode(), location.getRoadWay());
+ QuantityConstant.STATUS_CONTAINER_EMPTY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
+ location.getCode(), location.getRoadWay());
return Result.OK(pageList);
}
/**
* 选取在库内的空托盘组
- * @param location
+ *
+ * @param location
* @return
*/
@ApiOperation(value = "库位管理-获取空托盘组库位", notes = "库位管理-获取空托盘组库位")
@GetMapping(value = "/getManyContainerInLocation")
public Result<IPage<Location>> getManyContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Page<Location> page = new Page<Location>(pageNo, pageSize);
HuahengJwtUtil.setWarehouseCode(req, location);
IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
- QuantityConstant.STATUS_CONTAINER_FILL_MANY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
- location.getCode(), location.getRoadWay());
+ QuantityConstant.STATUS_CONTAINER_FILL_MANY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
+ location.getCode(), location.getRoadWay());
return Result.OK(pageList);
}
/**
* 添加
- * @param location
+ *
+ * @param location
* @return
*/
@AutoLog(value = "库位管理-添加")
@@ -147,7 +151,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 批量添加
- * @param batchLocation
+ *
+ * @param batchLocation
* @return
*/
@AutoLog(value = "库位管理-批量添加")
@@ -163,7 +168,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 获取打印数据
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "库位管理-获取打印数据")
@@ -178,7 +184,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 编辑
- * @param location
+ *
+ * @param location
* @return
*/
@AutoLog(value = "库位管理-编辑")
@@ -192,7 +199,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 通过id删除
- * @param id
+ *
+ * @param id
* @return
*/
@AutoLog(value = "库位管理-通过id删除")
@@ -206,7 +214,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 批量删除
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "库位管理-批量删除")
@@ -220,6 +229,7 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 查询库位列表
+ *
* @return
*/
@ApiOperation(value = "库位监控-查询库位列表", notes = "库位监控-查询库位列表")
@@ -236,7 +246,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 通过id查询
- * @param id
+ *
+ * @param id
* @return
*/
// @AutoLog(value = "库位管理-通过id查询")
@@ -252,6 +263,7 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 导出excel
+ *
* @param request
* @param location
*/
@@ -263,8 +275,9 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* 通过excel导入数据
- * @param request
- * @param response
+ *
+ * @param request
+ * @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@@ -275,7 +288,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* WCS库位信息比较
- * @param location
+ *
+ * @param location
* @return
*/
@AutoLog(value = "WCS库位信息比较")
@@ -289,7 +303,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* WCS库位信息比较
- * @param location
+ *
+ * @param location
* @return
*/
@ApiOperation(value = "库位管理-WCS库位任务信息比较", notes = "库位管理-WCS库位任务信息比较")
@@ -302,7 +317,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* WCS库位信息比较
- * @param location
+ *
+ * @param location
* @return
*/
@ApiOperation(value = "库位管理-WCS托盘任务信息比较", notes = "库位管理-WCS托盘任务信息比较")
@@ -313,4 +329,16 @@ public class LocationController extends JeecgController<Location, ILocationServi
return Result.OK(compareContainerTaskDtoPage);
}
+ @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContent")
+ public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+ locationLambdaQueryWrapper.in(Location::getId, Arrays.asList(ids.split(",")));
+ List<Location> locationList = locationService.list(locationLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(locationList);
+ return jimuReportResult;
+ }
+
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
index f6446e2..bf0f68e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
@@ -1,21 +1,24 @@
package org.jeecg.modules.wms.config.material.controller;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.config.material.entity.SearchDomain;
import org.jeecg.modules.wms.config.material.service.IMaterialService;
import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,19 +27,17 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 物料管理
- * @Author: jeecg-boot
- * @Date: 2022-10-14
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2022-10-14
+ * @Version: V1.0
*/
@Api(tags = "物料管理")
@RestController
@@ -48,17 +49,18 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 分页列表查询
- * @param material
- * @param pageNo
- * @param pageSize
- * @param req
+ *
+ * @param material
+ * @param pageNo
+ * @param pageSize
+ * @param req
* @return
*/
// @AutoLog(value = "物料管理-分页列表查询")
@ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<Material>> queryPageList(Material material, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
HuahengJwtUtil.setWarehouseCode(req, material);
QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
Page<Material> page = new Page<Material>(pageNo, pageSize);
@@ -68,7 +70,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 添加
- * @param material
+ *
+ * @param material
* @return
*/
@AutoLog(value = "物料管理-添加")
@@ -83,7 +86,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 编辑
- * @param material
+ *
+ * @param material
* @return
*/
@AutoLog(value = "物料管理-编辑")
@@ -97,7 +101,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 通过id删除
- * @param id
+ *
+ * @param id
* @return
*/
@AutoLog(value = "物料管理-通过id删除")
@@ -111,7 +116,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 批量删除
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "物料管理-批量删除")
@@ -125,7 +131,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 通过id查询
- * @param id
+ *
+ * @param id
* @return
*/
// @AutoLog(value = "物料管理-通过id查询")
@@ -141,6 +148,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 导出excel
+ *
* @param request
* @param material
*/
@@ -152,7 +160,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 获取打印数据
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "物料管理-获取打印数据")
@@ -168,19 +177,20 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
/**
* 通过excel导入数据
- * @param request
- * @param response
+ *
+ * @param request
+ * @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@RequiresPermissions("material:import")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
Iterator var6 = fileMap.entrySet().iterator();
if (var6.hasNext()) {
- Map.Entry<String, MultipartFile> entity = (Map.Entry)var6.next();
- MultipartFile file = (MultipartFile)entity.getValue();
+ Map.Entry<String, MultipartFile> entity = (Map.Entry) var6.next();
+ MultipartFile file = (MultipartFile) entity.getValue();
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
@@ -247,4 +257,16 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
}
return Result.OK(searchDomainList);
}
+
+ @ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContent")
+ public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
+ materialLambdaQueryWrapper.in(Material::getId, Arrays.asList(ids.split(",")));
+ List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(materialList);
+ return jimuReportResult;
+ }
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
index 8d94ac1..8ab7e8f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
@@ -1,33 +1,35 @@
package org.jeecg.modules.wms.config.materialSn.controller;
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
import org.jeecg.modules.wms.config.materialSn.entity.MaterialSn;
import org.jeecg.modules.wms.config.materialSn.service.IMaterialSnService;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
/**
* @Description: 物料序列号
- * @Author: jeecg-boot
- * @Date: 2023-12-22
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-12-22
+ * @Version: V1.0
*/
@Api(tags = "物料序列号")
@RestController
@@ -39,17 +41,18 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 分页列表查询
- * @param materialSn
- * @param pageNo
- * @param pageSize
- * @param req
+ *
+ * @param materialSn
+ * @param pageNo
+ * @param pageSize
+ * @param req
* @return
*/
// @AutoLog(value = "物料序列号-分页列表查询")
@ApiOperation(value = "物料序列号-分页列表查询", notes = "物料序列号-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MaterialSn>> queryPageList(MaterialSn materialSn, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<MaterialSn> queryWrapper = QueryGenerator.initQueryWrapper(materialSn, req.getParameterMap());
Page<MaterialSn> page = new Page<MaterialSn>(pageNo, pageSize);
IPage<MaterialSn> pageList = materialSnService.page(page, queryWrapper);
@@ -58,7 +61,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 添加
- * @param materialSn
+ *
+ * @param materialSn
* @return
*/
@AutoLog(value = "物料序列号-添加")
@@ -71,7 +75,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 批量添加
- * @param materialSn
+ *
+ * @param materialSn
* @return
*/
@AutoLog(value = "物料序列号-批量添加")
@@ -83,7 +88,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 编辑
- * @param materialSn
+ *
+ * @param materialSn
* @return
*/
@AutoLog(value = "物料序列号-编辑")
@@ -96,7 +102,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 通过id删除
- * @param id
+ *
+ * @param id
* @return
*/
@AutoLog(value = "物料序列号-通过id删除")
@@ -109,7 +116,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 批量删除
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "物料序列号-批量删除")
@@ -122,7 +130,8 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 通过id查询
- * @param id
+ *
+ * @param id
* @return
*/
// @AutoLog(value = "物料序列号-通过id查询")
@@ -138,6 +147,7 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 导出excel
+ *
* @param request
* @param materialSn
*/
@@ -148,8 +158,9 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
/**
* 通过excel导入数据
- * @param request
- * @param response
+ *
+ * @param request
+ * @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@@ -157,4 +168,15 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
return super.importExcel(request, response, MaterialSn.class);
}
+ @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContent")
+ public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<MaterialSn> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+ containerLambdaQueryWrapper.in(MaterialSn::getId, Arrays.asList(ids.split(",")));
+ List<MaterialSn> materialSnList = materialSnService.list(containerLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(materialSnList);
+ return jimuReportResult;
+ }
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
index f7fa08f..802b987 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
@@ -1,16 +1,13 @@
package org.jeecg.modules.wms.receipt.receiveHeader.controller;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -19,6 +16,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
import org.jeecg.modules.wms.receipt.receiveHeader.entity.ReceiveDetail;
import org.jeecg.modules.wms.receipt.receiveHeader.entity.ReceiveHeader;
import org.jeecg.modules.wms.receipt.receiveHeader.service.IReceiveDetailService;
@@ -26,6 +24,7 @@ import org.jeecg.modules.wms.receipt.receiveHeader.service.IReceiveHeaderService
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.support.PassApiAuthentication;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -37,19 +36,21 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description: 收货单表头
- * @Author: jeecg-boot
- * @Date: 2023-08-22
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-08-22
+ * @Version: V1.0
*/
@Api(tags = "收货单表头")
@RestController
@@ -67,17 +68,18 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 分页列表查询
- * @param receiveHeader
- * @param pageNo
- * @param pageSize
- * @param req
+ *
+ * @param receiveHeader
+ * @param pageNo
+ * @param pageSize
+ * @param req
* @return
*/
// @AutoLog(value = "收货单表头-分页列表查询")
@ApiOperation(value = "收货单表头-分页列表查询", notes = "收货单表头-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ReceiveHeader>> queryPageList(ReceiveHeader receiveHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
receiveHeader.setDelFlag(0);
QueryWrapper<ReceiveHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiveHeader, req.getParameterMap());
Page<ReceiveHeader> page = new Page<ReceiveHeader>(pageNo, pageSize);
@@ -87,7 +89,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 添加
- * @param receiveHeader
+ *
+ * @param receiveHeader
* @return
*/
@AutoLog(value = "收货单表头-添加")
@@ -101,7 +104,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 编辑
- * @param receiveHeader
+ *
+ * @param receiveHeader
* @return
*/
@AutoLog(value = "收货单表头-编辑")
@@ -114,7 +118,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 通过id删除
- * @param id
+ *
+ * @param id
* @return
*/
@AutoLog(value = "收货单表头-通过id删除")
@@ -138,7 +143,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 批量删除
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "收货单表头-批量删除")
@@ -151,6 +157,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 导出
+ *
* @return
*/
@RequestMapping(value = "/exportXls")
@@ -161,6 +168,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 导入
+ *
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@@ -171,15 +179,17 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/*---------------------------------主表处理-end-------------------------------------*/
/*--------------------------------子表处理-收货单详情-begin----------------------------------------------*/
+
/**
* 通过主表ID查询
+ *
* @return
*/
// @AutoLog(value = "收货单详情-通过主表ID查询")
@ApiOperation(value = "收货单详情-通过主表ID查询", notes = "收货单详情-通过主表ID查询")
@GetMapping(value = "/listReceiveDetailByMainId")
public Result<IPage<ReceiveDetail>> listReceiveDetailByMainId(ReceiveDetail receiveDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetail, req.getParameterMap());
Page<ReceiveDetail> page = new Page<ReceiveDetail>(pageNo, pageSize);
IPage<ReceiveDetail> pageList = receiveDetailService.page(page, queryWrapper);
@@ -188,7 +198,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 添加
- * @param receiveDetail
+ *
+ * @param receiveDetail
* @return
*/
@AutoLog(value = "收货单详情-添加")
@@ -200,7 +211,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 编辑
- * @param receiveDetail
+ *
+ * @param receiveDetail
* @return
*/
@AutoLog(value = "收货单详情-编辑")
@@ -213,7 +225,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 通过id删除
- * @param id
+ *
+ * @param id
* @return
*/
@AutoLog(value = "收货单详情-通过id删除")
@@ -230,7 +243,8 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 批量删除
- * @param ids
+ *
+ * @param ids
* @return
*/
@AutoLog(value = "收货单详情-批量删除")
@@ -243,13 +257,14 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 导出
+ *
* @return
*/
@RequestMapping(value = "/exportReceiveDetail")
public ModelAndView exportReceiveDetail(HttpServletRequest request, ReceiveDetail receiveDetail) {
// Step.1 组装查询条件
QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetail, request.getParameterMap());
- LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// Step.2 获取导出数据
List<ReceiveDetail> pageList = receiveDetailService.list(queryWrapper);
@@ -275,11 +290,12 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 导入
+ *
* @return
*/
@RequestMapping(value = "/importReceiveDetail/{mainId}")
public Result<?> importReceiveDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
@@ -314,6 +330,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 通过详情ID查询
+ *
* @return
*/
@ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
@@ -346,6 +363,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 收货
+ *
* @return
*/
@AutoLog("收货单-收货")
@@ -361,6 +379,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 全部收货
+ *
* @return
*/
@AutoLog("收货单-全部收货")
@@ -376,6 +395,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 收货详情质检
+ *
* @return
*/
@AutoLog("收货单-收货详情质检")
@@ -391,6 +411,7 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
/**
* 全部质检
+ *
* @return
*/
@AutoLog("收货单-全部质检")
@@ -402,4 +423,26 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
Result result = receiveHeaderService.receiveHeaderToQuality(id, warehouseCode);
return result;
}
+
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContent")
+ public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<ReceiveHeader> receiveHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ receiveHeaderLambdaQueryWrapper.in(ReceiveHeader::getId, Arrays.asList(ids.split(",")));
+ List<ReceiveHeader> receiveHeaderList = receiveHeaderService.list(receiveHeaderLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(receiveHeaderList);
+ return jimuReportResult;
+ }
+
+ @PassApiAuthentication
+ @GetMapping(value = "/listPrintContentDetail")
+ public JimuReportResult listPrintContentDetail(@RequestParam(name = "ids", required = true) String ids) {
+ LambdaQueryWrapper<ReceiveDetail> receiveDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ receiveDetailLambdaQueryWrapper.in(ReceiveDetail::getReceiveId, Arrays.asList(ids.split(",")));
+ List<ReceiveDetail> receiveDetailList = receiveDetailService.list(receiveDetailLambdaQueryWrapper);
+ JimuReportResult jimuReportResult = new JimuReportResult();
+ jimuReportResult.setData(receiveDetailList);
+ return jimuReportResult;
+ }
}
diff --git a/huaheng-wms-core/src/main/resources/application-dev.yml b/huaheng-wms-core/src/main/resources/application-dev.yml
index 40c78d3..52b67b6 100644
--- a/huaheng-wms-core/src/main/resources/application-dev.yml
+++ b/huaheng-wms-core/src/main/resources/application-dev.yml
@@ -214,7 +214,7 @@ jeecg:
#webapp文件路径
webapp: ./webapp
shiro:
- excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
+ excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/container/listPrintContent,/config/location/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
diff --git a/huaheng-wms-core/src/main/resources/application-prod.yml b/huaheng-wms-core/src/main/resources/application-prod.yml
index f7deb29..425af35 100644
--- a/huaheng-wms-core/src/main/resources/application-prod.yml
+++ b/huaheng-wms-core/src/main/resources/application-prod.yml
@@ -141,9 +141,9 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+ url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
username: root
- password: hhsoftware
+ password: HHsoft123.
driver-class-name: com.mysql.cj.jdbc.Driver
# sqlserver 数据源配置
# url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
@@ -214,7 +214,7 @@ jeecg:
#webapp文件路径
webapp: ./webapp
shiro:
- excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
+ excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/location/listPrintContent,/config/container/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
diff --git a/huaheng-wms-core/src/main/resources/application-test.yml b/huaheng-wms-core/src/main/resources/application-test.yml
index bbc8f92..1b8a76d 100644
--- a/huaheng-wms-core/src/main/resources/application-test.yml
+++ b/huaheng-wms-core/src/main/resources/application-test.yml
@@ -217,7 +217,7 @@ jeecg:
#webapp文件路径
webapp: ./webapp
shiro:
- excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
+ excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/location/listPrintContent,/config/container/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
@@ -270,10 +270,10 @@ jeecg:
mode: dev
#数据字典是否进行saas数据隔离，自己看自己的字典
saas: false
- #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
- # saasMode: created
- # 平台上线安全配置(v1.6.2+ 新增)
- #firewall:
+ #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
+ # saasMode: created
+ # 平台上线安全配置(v1.6.2+ 新增)
+ #firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并不允许查询数据库)
# dataSourceSafe: true
# 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可放开限制）
--
libgit2 0.22.2