Commit 27ea54329337acd342813358d20bcd6151676ac7

Authored by 肖超群
1 parent 96170590

1. 更新积木报表的打印模板,采用后端接口的方式,避免重复每个项目都要配置

ant-design-vue-jeecg/.env.development
1 1 NODE_ENV=development
2 2 VUE_APP_ENV=development
3 3 outputDir=dist
4   -VUE_APP_API_BASE_URL=http://localhost:8080/wms
  4 +VUE_APP_API_BASE_URL=http://172.16.43.123:8080/wms
5 5 VUE_APP_CAS_BASE_URL=http://172.16.29.77:8443/cas
6 6 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
7 7  
... ...
ant-design-vue-jeecg/.env.production
1 1 NODE_ENV=production
2 2 VUE_APP_ENV=production
3 3 outputDir=dist
4   -VUE_APP_API_BASE_URL=http://wms.huahengrobot.com/wms
  4 +VUE_APP_API_BASE_URL=http://172.16.43.123:8080/wms
5 5 VUE_APP_CAS_BASE_URL=http://localhost:8443/cas
6 6 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
7 7 \ No newline at end of file
... ...
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;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5 import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 8 import io.swagger.annotations.Api;
8 9 import io.swagger.annotations.ApiOperation;
... ... @@ -14,12 +15,14 @@ import org.jeecg.common.exception.JeecgBootException;
14 15 import org.jeecg.common.system.base.controller.JeecgController;
15 16 import org.jeecg.common.system.query.QueryGenerator;
16 17 import org.jeecg.modules.wms.config.container.entity.Container;
  18 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
17 19 import org.jeecg.modules.wms.config.container.service.IContainerService;
18 20 import org.jeecg.modules.wms.config.location.entity.Location;
19 21 import org.jeecg.modules.wms.config.location.service.ILocationService;
20 22 import org.jeecg.utils.HuahengJwtUtil;
21 23 import org.jeecg.utils.StringUtils;
22 24 import org.jeecg.utils.constant.QuantityConstant;
  25 +import org.jeecg.utils.support.PassApiAuthentication;
23 26 import org.springframework.beans.factory.annotation.Autowired;
24 27 import org.springframework.web.bind.annotation.*;
25 28 import org.springframework.web.servlet.ModelAndView;
... ... @@ -260,4 +263,15 @@ public class ContainerController extends JeecgController<Container, IContainerSe
260 263 return Result.OK(containerList);
261 264 }
262 265  
  266 + @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
  267 + @PassApiAuthentication
  268 + @GetMapping(value = "/listPrintContent")
  269 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  270 + LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
  271 + containerLambdaQueryWrapper.in(Container::getId, Arrays.asList(ids.split(",")));
  272 + List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
  273 + JimuReportResult jimuReportResult = new JimuReportResult();
  274 + jimuReportResult.setData(containerList);
  275 + return jimuReportResult;
  276 + }
263 277 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/JimuReportResult.java 0 → 100644
  1 +package org.jeecg.modules.wms.config.container.entity;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +@Data
  8 +public class JimuReportResult<T> extends Object implements Serializable {
  9 +
  10 + private T data;
  11 +
  12 +
  13 +}
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
1 1 package org.jeecg.modules.wms.config.location.controller;
2 2  
3   -import java.util.Arrays;
4   -import java.util.List;
5   -
6   -import javax.annotation.Resource;
7   -import javax.servlet.http.HttpServletRequest;
8   -import javax.servlet.http.HttpServletResponse;
9   -
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  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 io.swagger.annotations.Api;
  9 +import io.swagger.annotations.ApiOperation;
  10 +import lombok.extern.slf4j.Slf4j;
10 11 import org.apache.shiro.authz.annotation.RequiresPermissions;
11 12 import org.jeecg.common.api.vo.Result;
12 13 import org.jeecg.common.aspect.annotation.AutoLog;
13 14 import org.jeecg.common.system.base.controller.JeecgController;
14 15 import org.jeecg.common.system.query.QueryGenerator;
  16 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
15 17 import org.jeecg.modules.wms.config.location.dto.*;
16 18 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
17 19 import org.jeecg.modules.wms.config.location.entity.Location;
... ... @@ -21,25 +23,23 @@ import org.jeecg.utils.HuahengJwtUtil;
21 23 import org.jeecg.utils.PageUtil;
22 24 import org.jeecg.utils.StringUtils;
23 25 import org.jeecg.utils.constant.QuantityConstant;
  26 +import org.jeecg.utils.support.PassApiAuthentication;
24 27 import org.springframework.beans.factory.annotation.Autowired;
25 28 import org.springframework.validation.annotation.Validated;
26 29 import org.springframework.web.bind.annotation.*;
27 30 import org.springframework.web.servlet.ModelAndView;
28 31  
29   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
30   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
31   -import com.baomidou.mybatisplus.core.metadata.IPage;
32   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
33   -
34   -import io.swagger.annotations.Api;
35   -import io.swagger.annotations.ApiOperation;
36   -import lombok.extern.slf4j.Slf4j;
  32 +import javax.annotation.Resource;
  33 +import javax.servlet.http.HttpServletRequest;
  34 +import javax.servlet.http.HttpServletResponse;
  35 +import java.util.Arrays;
  36 +import java.util.List;
37 37  
38 38 /**
39 39 * @Description: 库位管理
40   - * @Author: jeecg-boot
41   - * @Date: 2022-10-26
42   - * @Version: V1.0
  40 + * @Author: jeecg-boot
  41 + * @Date: 2022-10-26
  42 + * @Version: V1.0
43 43 */
44 44 @Api(tags = "库位管理")
45 45 @RestController
... ... @@ -55,17 +55,18 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
55 55  
56 56 /**
57 57 * 分页列表查询
58   - * @param location
59   - * @param pageNo
60   - * @param pageSize
61   - * @param req
  58 + *
  59 + * @param location
  60 + * @param pageNo
  61 + * @param pageSize
  62 + * @param req
62 63 * @return
63 64 */
64 65 // @AutoLog(value = "库位管理-分页列表查询")
65 66 @ApiOperation(value = "库位管理-分页列表查询", notes = "库位管理-分页列表查询")
66 67 @GetMapping(value = "/list")
67 68 public Result<IPage<Location>> queryPageList(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
68   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  69 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
69 70 HuahengJwtUtil.setWarehouseCode(req, location);
70 71 Integer haveContainer = location.getHaveContainerInLocation();
71 72 location.setHaveContainer(null);
... ... @@ -87,52 +88,55 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
87 88 @ApiOperation(value = "库位管理-获取有货库位", notes = "库位管理-获取有货库位")
88 89 @GetMapping(value = "/listSomeContainerInLocation")
89 90 public Result<IPage<Location>> listSomeContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
90   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  91 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
91 92 Page<Location> page = new Page<Location>(pageNo, pageSize);
92 93 HuahengJwtUtil.setWarehouseCode(req, location);
93 94 IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
94   - QuantityConstant.STATUS_CONTAINER_FILL_SOME, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
95   - location.getCode(), location.getRoadWay());
  95 + QuantityConstant.STATUS_CONTAINER_FILL_SOME, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
  96 + location.getCode(), location.getRoadWay());
96 97 return Result.OK(pageList);
97 98 }
98 99  
99 100 /**
100 101 * 选取在库内的空托盘
101   - * @param location
  102 + *
  103 + * @param location
102 104 * @return
103 105 */
104 106 @ApiOperation(value = "库位管理-获取空托盘库位", notes = "库位管理-获取空托盘库位")
105 107 @GetMapping(value = "/listEmptyContainerInLocation")
106 108 public Result<IPage<Location>> listEmptyContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
107   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  109 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
108 110 Page<Location> page = new Page<Location>(pageNo, pageSize);
109 111 HuahengJwtUtil.setWarehouseCode(req, location);
110 112 IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
111   - QuantityConstant.STATUS_CONTAINER_EMPTY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
112   - location.getCode(), location.getRoadWay());
  113 + QuantityConstant.STATUS_CONTAINER_EMPTY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
  114 + location.getCode(), location.getRoadWay());
113 115 return Result.OK(pageList);
114 116 }
115 117  
116 118 /**
117 119 * 选取在库内的空托盘组
118   - * @param location
  120 + *
  121 + * @param location
119 122 * @return
120 123 */
121 124 @ApiOperation(value = "库位管理-获取空托盘组库位", notes = "库位管理-获取空托盘组库位")
122 125 @GetMapping(value = "/getManyContainerInLocation")
123 126 public Result<IPage<Location>> getManyContainerInLocation(Location location, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
124   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  127 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
125 128 Page<Location> page = new Page<Location>(pageNo, pageSize);
126 129 HuahengJwtUtil.setWarehouseCode(req, location);
127 130 IPage<Location> pageList = locationService.getContainerInLocation(page, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_CONTAINER_EMPTY,
128   - QuantityConstant.STATUS_CONTAINER_FILL_MANY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
129   - location.getCode(), location.getRoadWay());
  131 + QuantityConstant.STATUS_CONTAINER_FILL_MANY, HuahengJwtUtil.getWarehouseCodeByToken(req), location.getZoneCode(), location.getContainerCode(),
  132 + location.getCode(), location.getRoadWay());
130 133 return Result.OK(pageList);
131 134 }
132 135  
133 136 /**
134 137 * 添加
135   - * @param location
  138 + *
  139 + * @param location
136 140 * @return
137 141 */
138 142 @AutoLog(value = "库位管理-添加")
... ... @@ -147,7 +151,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
147 151  
148 152 /**
149 153 * 批量添加
150   - * @param batchLocation
  154 + *
  155 + * @param batchLocation
151 156 * @return
152 157 */
153 158 @AutoLog(value = "库位管理-批量添加")
... ... @@ -163,7 +168,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
163 168  
164 169 /**
165 170 * 获取打印数据
166   - * @param ids
  171 + *
  172 + * @param ids
167 173 * @return
168 174 */
169 175 @AutoLog(value = "库位管理-获取打印数据")
... ... @@ -178,7 +184,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
178 184  
179 185 /**
180 186 * 编辑
181   - * @param location
  187 + *
  188 + * @param location
182 189 * @return
183 190 */
184 191 @AutoLog(value = "库位管理-编辑")
... ... @@ -192,7 +199,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
192 199  
193 200 /**
194 201 * 通过id删除
195   - * @param id
  202 + *
  203 + * @param id
196 204 * @return
197 205 */
198 206 @AutoLog(value = "库位管理-通过id删除")
... ... @@ -206,7 +214,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
206 214  
207 215 /**
208 216 * 批量删除
209   - * @param ids
  217 + *
  218 + * @param ids
210 219 * @return
211 220 */
212 221 @AutoLog(value = "库位管理-批量删除")
... ... @@ -220,6 +229,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
220 229  
221 230 /**
222 231 * 查询库位列表
  232 + *
223 233 * @return
224 234 */
225 235 @ApiOperation(value = "库位监控-查询库位列表", notes = "库位监控-查询库位列表")
... ... @@ -236,7 +246,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
236 246  
237 247 /**
238 248 * 通过id查询
239   - * @param id
  249 + *
  250 + * @param id
240 251 * @return
241 252 */
242 253 // @AutoLog(value = "库位管理-通过id查询")
... ... @@ -252,6 +263,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
252 263  
253 264 /**
254 265 * 导出excel
  266 + *
255 267 * @param request
256 268 * @param location
257 269 */
... ... @@ -263,8 +275,9 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
263 275  
264 276 /**
265 277 * 通过excel导入数据
266   - * @param request
267   - * @param response
  278 + *
  279 + * @param request
  280 + * @param response
268 281 * @return
269 282 */
270 283 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
... ... @@ -275,7 +288,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
275 288  
276 289 /**
277 290 * WCS库位信息比较
278   - * @param location
  291 + *
  292 + * @param location
279 293 * @return
280 294 */
281 295 @AutoLog(value = "WCS库位信息比较")
... ... @@ -289,7 +303,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
289 303  
290 304 /**
291 305 * WCS库位信息比较
292   - * @param location
  306 + *
  307 + * @param location
293 308 * @return
294 309 */
295 310 @ApiOperation(value = "库位管理-WCS库位任务信息比较", notes = "库位管理-WCS库位任务信息比较")
... ... @@ -302,7 +317,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
302 317  
303 318 /**
304 319 * WCS库位信息比较
305   - * @param location
  320 + *
  321 + * @param location
306 322 * @return
307 323 */
308 324 @ApiOperation(value = "库位管理-WCS托盘任务信息比较", notes = "库位管理-WCS托盘任务信息比较")
... ... @@ -313,4 +329,16 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
313 329 return Result.OK(compareContainerTaskDtoPage);
314 330 }
315 331  
  332 + @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
  333 + @PassApiAuthentication
  334 + @GetMapping(value = "/listPrintContent")
  335 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  336 + LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
  337 + locationLambdaQueryWrapper.in(Location::getId, Arrays.asList(ids.split(",")));
  338 + List<Location> locationList = locationService.list(locationLambdaQueryWrapper);
  339 + JimuReportResult jimuReportResult = new JimuReportResult();
  340 + jimuReportResult.setData(locationList);
  341 + return jimuReportResult;
  342 + }
  343 +
316 344 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
1 1 package org.jeecg.modules.wms.config.material.controller;
2 2  
3   -import java.io.IOException;
4   -import java.util.*;
5   -import java.util.stream.Collectors;
6   -
7   -import javax.servlet.http.HttpServletRequest;
8   -import javax.servlet.http.HttpServletResponse;
9   -
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  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 io.swagger.annotations.Api;
  9 +import io.swagger.annotations.ApiOperation;
  10 +import lombok.extern.slf4j.Slf4j;
10 11 import org.apache.shiro.authz.annotation.RequiresPermissions;
11 12 import org.jeecg.common.api.vo.Result;
12 13 import org.jeecg.common.aspect.annotation.AutoLog;
13 14 import org.jeecg.common.system.base.controller.JeecgController;
14 15 import org.jeecg.common.system.query.QueryGenerator;
  16 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
15 17 import org.jeecg.modules.wms.config.material.entity.Material;
16 18 import org.jeecg.modules.wms.config.material.entity.SearchDomain;
17 19 import org.jeecg.modules.wms.config.material.service.IMaterialService;
18 20 import org.jeecg.utils.HuahengJwtUtil;
  21 +import org.jeecg.utils.support.PassApiAuthentication;
19 22 import org.jeecgframework.poi.excel.ExcelImportUtil;
20 23 import org.jeecgframework.poi.excel.entity.ImportParams;
21 24 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -24,19 +27,17 @@ import org.springframework.web.multipart.MultipartFile;
24 27 import org.springframework.web.multipart.MultipartHttpServletRequest;
25 28 import org.springframework.web.servlet.ModelAndView;
26 29  
27   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
28   -import com.baomidou.mybatisplus.core.metadata.IPage;
29   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
30   -
31   -import io.swagger.annotations.Api;
32   -import io.swagger.annotations.ApiOperation;
33   -import lombok.extern.slf4j.Slf4j;
  30 +import javax.servlet.http.HttpServletRequest;
  31 +import javax.servlet.http.HttpServletResponse;
  32 +import java.io.IOException;
  33 +import java.util.*;
  34 +import java.util.stream.Collectors;
34 35  
35 36 /**
36 37 * @Description: 物料管理
37   - * @Author: jeecg-boot
38   - * @Date: 2022-10-14
39   - * @Version: V1.0
  38 + * @Author: jeecg-boot
  39 + * @Date: 2022-10-14
  40 + * @Version: V1.0
40 41 */
41 42 @Api(tags = "物料管理")
42 43 @RestController
... ... @@ -48,17 +49,18 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
48 49  
49 50 /**
50 51 * 分页列表查询
51   - * @param material
52   - * @param pageNo
53   - * @param pageSize
54   - * @param req
  52 + *
  53 + * @param material
  54 + * @param pageNo
  55 + * @param pageSize
  56 + * @param req
55 57 * @return
56 58 */
57 59 // @AutoLog(value = "物料管理-分页列表查询")
58 60 @ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
59 61 @GetMapping(value = "/list")
60 62 public Result<IPage<Material>> queryPageList(Material material, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
61   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  63 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
62 64 HuahengJwtUtil.setWarehouseCode(req, material);
63 65 QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
64 66 Page<Material> page = new Page<Material>(pageNo, pageSize);
... ... @@ -68,7 +70,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
68 70  
69 71 /**
70 72 * 添加
71   - * @param material
  73 + *
  74 + * @param material
72 75 * @return
73 76 */
74 77 @AutoLog(value = "物料管理-添加")
... ... @@ -83,7 +86,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
83 86  
84 87 /**
85 88 * 编辑
86   - * @param material
  89 + *
  90 + * @param material
87 91 * @return
88 92 */
89 93 @AutoLog(value = "物料管理-编辑")
... ... @@ -97,7 +101,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
97 101  
98 102 /**
99 103 * 通过id删除
100   - * @param id
  104 + *
  105 + * @param id
101 106 * @return
102 107 */
103 108 @AutoLog(value = "物料管理-通过id删除")
... ... @@ -111,7 +116,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
111 116  
112 117 /**
113 118 * 批量删除
114   - * @param ids
  119 + *
  120 + * @param ids
115 121 * @return
116 122 */
117 123 @AutoLog(value = "物料管理-批量删除")
... ... @@ -125,7 +131,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
125 131  
126 132 /**
127 133 * 通过id查询
128   - * @param id
  134 + *
  135 + * @param id
129 136 * @return
130 137 */
131 138 // @AutoLog(value = "物料管理-通过id查询")
... ... @@ -141,6 +148,7 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
141 148  
142 149 /**
143 150 * 导出excel
  151 + *
144 152 * @param request
145 153 * @param material
146 154 */
... ... @@ -152,7 +160,8 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
152 160  
153 161 /**
154 162 * 获取打印数据
155   - * @param ids
  163 + *
  164 + * @param ids
156 165 * @return
157 166 */
158 167 @AutoLog(value = "物料管理-获取打印数据")
... ... @@ -168,19 +177,20 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
168 177  
169 178 /**
170 179 * 通过excel导入数据
171   - * @param request
172   - * @param response
  180 + *
  181 + * @param request
  182 + * @param response
173 183 * @return
174 184 */
175 185 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
176 186 @RequiresPermissions("material:import")
177 187 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
178   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  188 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
179 189 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
180 190 Iterator var6 = fileMap.entrySet().iterator();
181 191 if (var6.hasNext()) {
182   - Map.Entry<String, MultipartFile> entity = (Map.Entry)var6.next();
183   - MultipartFile file = (MultipartFile)entity.getValue();
  192 + Map.Entry<String, MultipartFile> entity = (Map.Entry) var6.next();
  193 + MultipartFile file = (MultipartFile) entity.getValue();
184 194 ImportParams params = new ImportParams();
185 195 params.setTitleRows(2);
186 196 params.setHeadRows(1);
... ... @@ -247,4 +257,16 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
247 257 }
248 258 return Result.OK(searchDomainList);
249 259 }
  260 +
  261 + @ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
  262 + @PassApiAuthentication
  263 + @GetMapping(value = "/listPrintContent")
  264 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  265 + LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
  266 + materialLambdaQueryWrapper.in(Material::getId, Arrays.asList(ids.split(",")));
  267 + List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
  268 + JimuReportResult jimuReportResult = new JimuReportResult();
  269 + jimuReportResult.setData(materialList);
  270 + return jimuReportResult;
  271 + }
250 272 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
1 1 package org.jeecg.modules.wms.config.materialSn.controller;
2 2  
3   -import java.util.Arrays;
4   -
5   -import javax.servlet.http.HttpServletRequest;
6   -import javax.servlet.http.HttpServletResponse;
7   -
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  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 io.swagger.annotations.Api;
  9 +import io.swagger.annotations.ApiOperation;
  10 +import lombok.extern.slf4j.Slf4j;
8 11 import org.jeecg.common.api.vo.Result;
9 12 import org.jeecg.common.aspect.annotation.AutoLog;
10 13 import org.jeecg.common.system.base.controller.JeecgController;
11 14 import org.jeecg.common.system.query.QueryGenerator;
  15 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
12 16 import org.jeecg.modules.wms.config.materialSn.entity.MaterialSn;
13 17 import org.jeecg.modules.wms.config.materialSn.service.IMaterialSnService;
  18 +import org.jeecg.utils.support.PassApiAuthentication;
14 19 import org.springframework.beans.factory.annotation.Autowired;
15 20 import org.springframework.web.bind.annotation.*;
16 21 import org.springframework.web.servlet.ModelAndView;
17 22  
18   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
19   -import com.baomidou.mybatisplus.core.metadata.IPage;
20   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
21   -
22   -import io.swagger.annotations.Api;
23   -import io.swagger.annotations.ApiOperation;
24   -import lombok.extern.slf4j.Slf4j;
  23 +import javax.servlet.http.HttpServletRequest;
  24 +import javax.servlet.http.HttpServletResponse;
  25 +import java.util.Arrays;
  26 +import java.util.List;
25 27  
26 28 /**
27 29 * @Description: 物料序列号
28   - * @Author: jeecg-boot
29   - * @Date: 2023-12-22
30   - * @Version: V1.0
  30 + * @Author: jeecg-boot
  31 + * @Date: 2023-12-22
  32 + * @Version: V1.0
31 33 */
32 34 @Api(tags = "物料序列号")
33 35 @RestController
... ... @@ -39,17 +41,18 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
39 41  
40 42 /**
41 43 * 分页列表查询
42   - * @param materialSn
43   - * @param pageNo
44   - * @param pageSize
45   - * @param req
  44 + *
  45 + * @param materialSn
  46 + * @param pageNo
  47 + * @param pageSize
  48 + * @param req
46 49 * @return
47 50 */
48 51 // @AutoLog(value = "物料序列号-分页列表查询")
49 52 @ApiOperation(value = "物料序列号-分页列表查询", notes = "物料序列号-分页列表查询")
50 53 @GetMapping(value = "/list")
51 54 public Result<IPage<MaterialSn>> queryPageList(MaterialSn materialSn, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
52   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  55 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
53 56 QueryWrapper<MaterialSn> queryWrapper = QueryGenerator.initQueryWrapper(materialSn, req.getParameterMap());
54 57 Page<MaterialSn> page = new Page<MaterialSn>(pageNo, pageSize);
55 58 IPage<MaterialSn> pageList = materialSnService.page(page, queryWrapper);
... ... @@ -58,7 +61,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
58 61  
59 62 /**
60 63 * 添加
61   - * @param materialSn
  64 + *
  65 + * @param materialSn
62 66 * @return
63 67 */
64 68 @AutoLog(value = "物料序列号-添加")
... ... @@ -71,7 +75,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
71 75  
72 76 /**
73 77 * 批量添加
74   - * @param materialSn
  78 + *
  79 + * @param materialSn
75 80 * @return
76 81 */
77 82 @AutoLog(value = "物料序列号-批量添加")
... ... @@ -83,7 +88,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
83 88  
84 89 /**
85 90 * 编辑
86   - * @param materialSn
  91 + *
  92 + * @param materialSn
87 93 * @return
88 94 */
89 95 @AutoLog(value = "物料序列号-编辑")
... ... @@ -96,7 +102,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
96 102  
97 103 /**
98 104 * 通过id删除
99   - * @param id
  105 + *
  106 + * @param id
100 107 * @return
101 108 */
102 109 @AutoLog(value = "物料序列号-通过id删除")
... ... @@ -109,7 +116,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
109 116  
110 117 /**
111 118 * 批量删除
112   - * @param ids
  119 + *
  120 + * @param ids
113 121 * @return
114 122 */
115 123 @AutoLog(value = "物料序列号-批量删除")
... ... @@ -122,7 +130,8 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
122 130  
123 131 /**
124 132 * 通过id查询
125   - * @param id
  133 + *
  134 + * @param id
126 135 * @return
127 136 */
128 137 // @AutoLog(value = "物料序列号-通过id查询")
... ... @@ -138,6 +147,7 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
138 147  
139 148 /**
140 149 * 导出excel
  150 + *
141 151 * @param request
142 152 * @param materialSn
143 153 */
... ... @@ -148,8 +158,9 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
148 158  
149 159 /**
150 160 * 通过excel导入数据
151   - * @param request
152   - * @param response
  161 + *
  162 + * @param request
  163 + * @param response
153 164 * @return
154 165 */
155 166 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
... ... @@ -157,4 +168,15 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
157 168 return super.importExcel(request, response, MaterialSn.class);
158 169 }
159 170  
  171 + @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
  172 + @PassApiAuthentication
  173 + @GetMapping(value = "/listPrintContent")
  174 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  175 + LambdaQueryWrapper<MaterialSn> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
  176 + containerLambdaQueryWrapper.in(MaterialSn::getId, Arrays.asList(ids.split(",")));
  177 + List<MaterialSn> materialSnList = materialSnService.list(containerLambdaQueryWrapper);
  178 + JimuReportResult jimuReportResult = new JimuReportResult();
  179 + jimuReportResult.setData(materialSnList);
  180 + return jimuReportResult;
  181 + }
160 182 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
1 1 package org.jeecg.modules.wms.receipt.receiveHeader.controller;
2 2  
3   -import java.io.IOException;
4   -import java.math.BigDecimal;
5   -import java.util.ArrayList;
6   -import java.util.Arrays;
7   -import java.util.List;
8   -import java.util.Map;
9   -import java.util.stream.Collectors;
10   -
11   -import javax.servlet.http.HttpServletRequest;
12   -import javax.servlet.http.HttpServletResponse;
13   -
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  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 io.swagger.annotations.Api;
  9 +import io.swagger.annotations.ApiOperation;
  10 +import lombok.extern.slf4j.Slf4j;
14 11 import org.apache.shiro.SecurityUtils;
15 12 import org.jeecg.common.api.vo.Result;
16 13 import org.jeecg.common.aspect.annotation.AutoLog;
... ... @@ -19,6 +16,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
19 16 import org.jeecg.common.system.query.QueryGenerator;
20 17 import org.jeecg.common.system.vo.LoginUser;
21 18 import org.jeecg.common.util.oConvertUtils;
  19 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
22 20 import org.jeecg.modules.wms.receipt.receiveHeader.entity.ReceiveDetail;
23 21 import org.jeecg.modules.wms.receipt.receiveHeader.entity.ReceiveHeader;
24 22 import org.jeecg.modules.wms.receipt.receiveHeader.service.IReceiveDetailService;
... ... @@ -26,6 +24,7 @@ import org.jeecg.modules.wms.receipt.receiveHeader.service.IReceiveHeaderService
26 24 import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
27 25 import org.jeecg.utils.HuahengJwtUtil;
28 26 import org.jeecg.utils.constant.QuantityConstant;
  27 +import org.jeecg.utils.support.PassApiAuthentication;
29 28 import org.jeecgframework.poi.excel.ExcelImportUtil;
30 29 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
31 30 import org.jeecgframework.poi.excel.entity.ExportParams;
... ... @@ -37,19 +36,21 @@ import org.springframework.web.multipart.MultipartFile;
37 36 import org.springframework.web.multipart.MultipartHttpServletRequest;
38 37 import org.springframework.web.servlet.ModelAndView;
39 38  
40   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
41   -import com.baomidou.mybatisplus.core.metadata.IPage;
42   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
43   -
44   -import io.swagger.annotations.Api;
45   -import io.swagger.annotations.ApiOperation;
46   -import lombok.extern.slf4j.Slf4j;
  39 +import javax.servlet.http.HttpServletRequest;
  40 +import javax.servlet.http.HttpServletResponse;
  41 +import java.io.IOException;
  42 +import java.math.BigDecimal;
  43 +import java.util.ArrayList;
  44 +import java.util.Arrays;
  45 +import java.util.List;
  46 +import java.util.Map;
  47 +import java.util.stream.Collectors;
47 48  
48 49 /**
49 50 * @Description: 收货单表头
50   - * @Author: jeecg-boot
51   - * @Date: 2023-08-22
52   - * @Version: V1.0
  51 + * @Author: jeecg-boot
  52 + * @Date: 2023-08-22
  53 + * @Version: V1.0
53 54 */
54 55 @Api(tags = "收货单表头")
55 56 @RestController
... ... @@ -67,17 +68,18 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
67 68  
68 69 /**
69 70 * 分页列表查询
70   - * @param receiveHeader
71   - * @param pageNo
72   - * @param pageSize
73   - * @param req
  71 + *
  72 + * @param receiveHeader
  73 + * @param pageNo
  74 + * @param pageSize
  75 + * @param req
74 76 * @return
75 77 */
76 78 // @AutoLog(value = "收货单表头-分页列表查询")
77 79 @ApiOperation(value = "收货单表头-分页列表查询", notes = "收货单表头-分页列表查询")
78 80 @GetMapping(value = "/list")
79 81 public Result<IPage<ReceiveHeader>> queryPageList(ReceiveHeader receiveHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
80   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  82 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
81 83 receiveHeader.setDelFlag(0);
82 84 QueryWrapper<ReceiveHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiveHeader, req.getParameterMap());
83 85 Page<ReceiveHeader> page = new Page<ReceiveHeader>(pageNo, pageSize);
... ... @@ -87,7 +89,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
87 89  
88 90 /**
89 91 * 添加
90   - * @param receiveHeader
  92 + *
  93 + * @param receiveHeader
91 94 * @return
92 95 */
93 96 @AutoLog(value = "收货单表头-添加")
... ... @@ -101,7 +104,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
101 104  
102 105 /**
103 106 * 编辑
104   - * @param receiveHeader
  107 + *
  108 + * @param receiveHeader
105 109 * @return
106 110 */
107 111 @AutoLog(value = "收货单表头-编辑")
... ... @@ -114,7 +118,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
114 118  
115 119 /**
116 120 * 通过id删除
117   - * @param id
  121 + *
  122 + * @param id
118 123 * @return
119 124 */
120 125 @AutoLog(value = "收货单表头-通过id删除")
... ... @@ -138,7 +143,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
138 143  
139 144 /**
140 145 * 批量删除
141   - * @param ids
  146 + *
  147 + * @param ids
142 148 * @return
143 149 */
144 150 @AutoLog(value = "收货单表头-批量删除")
... ... @@ -151,6 +157,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
151 157  
152 158 /**
153 159 * 导出
  160 + *
154 161 * @return
155 162 */
156 163 @RequestMapping(value = "/exportXls")
... ... @@ -161,6 +168,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
161 168  
162 169 /**
163 170 * 导入
  171 + *
164 172 * @return
165 173 */
166 174 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
... ... @@ -171,15 +179,17 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
171 179 /*---------------------------------主表处理-end-------------------------------------*/
172 180  
173 181 /*--------------------------------子表处理-收货单详情-begin----------------------------------------------*/
  182 +
174 183 /**
175 184 * 通过主表ID查询
  185 + *
176 186 * @return
177 187 */
178 188 // @AutoLog(value = "收货单详情-通过主表ID查询")
179 189 @ApiOperation(value = "收货单详情-通过主表ID查询", notes = "收货单详情-通过主表ID查询")
180 190 @GetMapping(value = "/listReceiveDetailByMainId")
181 191 public Result<IPage<ReceiveDetail>> listReceiveDetailByMainId(ReceiveDetail receiveDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
182   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  192 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
183 193 QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetail, req.getParameterMap());
184 194 Page<ReceiveDetail> page = new Page<ReceiveDetail>(pageNo, pageSize);
185 195 IPage<ReceiveDetail> pageList = receiveDetailService.page(page, queryWrapper);
... ... @@ -188,7 +198,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
188 198  
189 199 /**
190 200 * 添加
191   - * @param receiveDetail
  201 + *
  202 + * @param receiveDetail
192 203 * @return
193 204 */
194 205 @AutoLog(value = "收货单详情-添加")
... ... @@ -200,7 +211,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
200 211  
201 212 /**
202 213 * 编辑
203   - * @param receiveDetail
  214 + *
  215 + * @param receiveDetail
204 216 * @return
205 217 */
206 218 @AutoLog(value = "收货单详情-编辑")
... ... @@ -213,7 +225,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
213 225  
214 226 /**
215 227 * 通过id删除
216   - * @param id
  228 + *
  229 + * @param id
217 230 * @return
218 231 */
219 232 @AutoLog(value = "收货单详情-通过id删除")
... ... @@ -230,7 +243,8 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
230 243  
231 244 /**
232 245 * 批量删除
233   - * @param ids
  246 + *
  247 + * @param ids
234 248 * @return
235 249 */
236 250 @AutoLog(value = "收货单详情-批量删除")
... ... @@ -243,13 +257,14 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
243 257  
244 258 /**
245 259 * 导出
  260 + *
246 261 * @return
247 262 */
248 263 @RequestMapping(value = "/exportReceiveDetail")
249 264 public ModelAndView exportReceiveDetail(HttpServletRequest request, ReceiveDetail receiveDetail) {
250 265 // Step.1 组装查询条件
251 266 QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetail, request.getParameterMap());
252   - LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
  267 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
253 268  
254 269 // Step.2 获取导出数据
255 270 List<ReceiveDetail> pageList = receiveDetailService.list(queryWrapper);
... ... @@ -275,11 +290,12 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
275 290  
276 291 /**
277 292 * 导入
  293 + *
278 294 * @return
279 295 */
280 296 @RequestMapping(value = "/importReceiveDetail/{mainId}")
281 297 public Result<?> importReceiveDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) {
282   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  298 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
283 299 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
284 300 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
285 301 MultipartFile file = entity.getValue();// 获取上传文件对象
... ... @@ -314,6 +330,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
314 330  
315 331 /**
316 332 * 通过详情ID查询
  333 + *
317 334 * @return
318 335 */
319 336 @ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
... ... @@ -346,6 +363,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
346 363  
347 364 /**
348 365 * 收货
  366 + *
349 367 * @return
350 368 */
351 369 @AutoLog("收货单-收货")
... ... @@ -361,6 +379,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
361 379  
362 380 /**
363 381 * 全部收货
  382 + *
364 383 * @return
365 384 */
366 385 @AutoLog("收货单-全部收货")
... ... @@ -376,6 +395,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
376 395  
377 396 /**
378 397 * 收货详情质检
  398 + *
379 399 * @return
380 400 */
381 401 @AutoLog("收货单-收货详情质检")
... ... @@ -391,6 +411,7 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
391 411  
392 412 /**
393 413 * 全部质检
  414 + *
394 415 * @return
395 416 */
396 417 @AutoLog("收货单-全部质检")
... ... @@ -402,4 +423,26 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
402 423 Result result = receiveHeaderService.receiveHeaderToQuality(id, warehouseCode);
403 424 return result;
404 425 }
  426 +
  427 + @PassApiAuthentication
  428 + @GetMapping(value = "/listPrintContent")
  429 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  430 + LambdaQueryWrapper<ReceiveHeader> receiveHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
  431 + receiveHeaderLambdaQueryWrapper.in(ReceiveHeader::getId, Arrays.asList(ids.split(",")));
  432 + List<ReceiveHeader> receiveHeaderList = receiveHeaderService.list(receiveHeaderLambdaQueryWrapper);
  433 + JimuReportResult jimuReportResult = new JimuReportResult();
  434 + jimuReportResult.setData(receiveHeaderList);
  435 + return jimuReportResult;
  436 + }
  437 +
  438 + @PassApiAuthentication
  439 + @GetMapping(value = "/listPrintContentDetail")
  440 + public JimuReportResult listPrintContentDetail(@RequestParam(name = "ids", required = true) String ids) {
  441 + LambdaQueryWrapper<ReceiveDetail> receiveDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  442 + receiveDetailLambdaQueryWrapper.in(ReceiveDetail::getReceiveId, Arrays.asList(ids.split(",")));
  443 + List<ReceiveDetail> receiveDetailList = receiveDetailService.list(receiveDetailLambdaQueryWrapper);
  444 + JimuReportResult jimuReportResult = new JimuReportResult();
  445 + jimuReportResult.setData(receiveDetailList);
  446 + return jimuReportResult;
  447 + }
405 448 }
... ...
huaheng-wms-core/src/main/resources/application-dev.yml
... ... @@ -214,7 +214,7 @@ jeecg:
214 214 #webapp文件路径
215 215 webapp: ./webapp
216 216 shiro:
217   - excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
  217 + 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
218 218 #阿里云oss存储和大鱼短信秘钥配置
219 219 oss:
220 220 accessKey: ??
... ...
huaheng-wms-core/src/main/resources/application-prod.yml
... ... @@ -141,9 +141,9 @@ spring:
141 141 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
142 142 datasource:
143 143 master:
144   - 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
  144 + url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
145 145 username: root
146   - password: hhsoftware
  146 + password: HHsoft123.
147 147 driver-class-name: com.mysql.cj.jdbc.Driver
148 148 # sqlserver 数据源配置
149 149 # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
... ... @@ -214,7 +214,7 @@ jeecg:
214 214 #webapp文件路径
215 215 webapp: ./webapp
216 216 shiro:
217   - excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
  217 + 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
218 218 #阿里云oss存储和大鱼短信秘钥配置
219 219 oss:
220 220 accessKey: ??
... ...
huaheng-wms-core/src/main/resources/application-test.yml
... ... @@ -217,7 +217,7 @@ jeecg:
217 217 #webapp文件路径
218 218 webapp: ./webapp
219 219 shiro:
220   - excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
  220 + 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
221 221 #阿里云oss存储和大鱼短信秘钥配置
222 222 oss:
223 223 accessKey: ??
... ... @@ -270,10 +270,10 @@ jeecg:
270 270 mode: dev
271 271 #数据字典是否进行saas数据隔离,自己看自己的字典
272 272 saas: false
273   - #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
274   - # saasMode: created
275   - # 平台上线安全配置(v1.6.2+ 新增)
276   - #firewall:
  273 + #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
  274 + # saasMode: created
  275 + # 平台上线安全配置(v1.6.2+ 新增)
  276 + #firewall:
277 277 # 数据源安全 (开启后,不允许使用平台数据源、SQL解析加签并不允许查询数据库)
278 278 # dataSourceSafe: true
279 279 # 低代码开发模式(dev:开发模式,prod:发布模式—关闭在线报表设计功能,分配角色admin、lowdeveloper可放开限制)
... ...