wms / wms4 · Commits

Commit ba4e26f61117bc46404027443e9a1f2288e7e8ce

Authored by pengyongcheng
1 parent 27ea5432

更新积木报表的打印模板

Inline Side-by-side
Showing 6 changed files with 230 additions and 109 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @ba4e26f
1 1 package org.jeecg.modules.wms.receipt.receiptHeader.controller;
2 2  
3   -import java.io.IOException;
4   -import java.util.Arrays;
5   -import java.util.Collections;
6   -import java.util.List;
7   -import java.util.Map;
8   -import java.util.stream.Collectors;
9   -
10   -import javax.annotation.Resource;
11   -import javax.servlet.http.HttpServletRequest;
12   -import javax.servlet.http.HttpServletResponse;
13   -
  3 +import cn.monitor4all.logRecord.annotation.OperationLog;
  4 +import cn.monitor4all.logRecord.context.LogRecordContext;
  5 +import com.alibaba.fastjson.JSON;
  6 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  7 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  8 +import com.baomidou.mybatisplus.core.metadata.IPage;
  9 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  10 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  11 +import io.swagger.annotations.Api;
  12 +import io.swagger.annotations.ApiOperation;
  13 +import lombok.extern.slf4j.Slf4j;
14 14 import org.apache.shiro.SecurityUtils;
15 15 import org.apache.shiro.authz.annotation.RequiresPermissions;
16 16 import org.jeecg.common.api.vo.Result;
... ... @@ -19,11 +19,9 @@ import org.jeecg.common.system.base.controller.JeecgController;
19 19 import org.jeecg.common.system.query.QueryGenerator;
20 20 import org.jeecg.common.system.vo.LoginUser;
21 21 import org.jeecg.common.util.oConvertUtils;
22   -import org.jeecg.modules.wms.api.erp.service.IErpService;
23 22 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
24 23 import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
25   -import org.jeecg.modules.wms.api.mobile.service.IMobileService;
26   -import org.jeecg.modules.wms.config.material.service.IMaterialService;
  24 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
27 25 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
28 26 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
29 27 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
... ... @@ -33,6 +31,7 @@ import org.jeecg.utils.HuahengJwtUtil;
33 31 import org.jeecg.utils.StringUtils;
34 32 import org.jeecg.utils.constant.QuantityConstant;
35 33 import org.jeecg.utils.support.ApiLogger;
  34 +import org.jeecg.utils.support.PassApiAuthentication;
36 35 import org.jeecgframework.poi.excel.ExcelImportUtil;
37 36 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
38 37 import org.jeecgframework.poi.excel.entity.ExportParams;
... ... @@ -44,24 +43,21 @@ import org.springframework.web.multipart.MultipartFile;
44 43 import org.springframework.web.multipart.MultipartHttpServletRequest;
45 44 import org.springframework.web.servlet.ModelAndView;
46 45  
47   -import com.alibaba.fastjson.JSON;
48   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
49   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
50   -import com.baomidou.mybatisplus.core.metadata.IPage;
51   -import com.baomidou.mybatisplus.core.toolkit.Wrappers;
52   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
53   -
54   -import cn.monitor4all.logRecord.annotation.OperationLog;
55   -import cn.monitor4all.logRecord.context.LogRecordContext;
56   -import io.swagger.annotations.Api;
57   -import io.swagger.annotations.ApiOperation;
58   -import lombok.extern.slf4j.Slf4j;
  46 +import javax.annotation.Resource;
  47 +import javax.servlet.http.HttpServletRequest;
  48 +import javax.servlet.http.HttpServletResponse;
  49 +import java.io.IOException;
  50 +import java.util.Arrays;
  51 +import java.util.Collections;
  52 +import java.util.List;
  53 +import java.util.Map;
  54 +import java.util.stream.Collectors;
59 55  
60 56 /**
61 57 * @Description: 入库表主表
62   - * @Author: jeecg-boot
63   - * @Date: 2022-11-01
64   - * @Version: V1.0
  58 + * @Author: jeecg-boot
  59 + * @Date: 2022-11-01
  60 + * @Version: V1.0
65 61 */
66 62 @Api(tags = "入库表主表")
67 63 @RestController
... ... @@ -71,34 +67,27 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
71 67  
72 68 @Autowired
73 69 private IReceiptHeaderService receiptHeaderService;
74   -
75   - @Resource
76   - private IMobileService mobileService;
77   -
78 70 @Autowired
79 71 private IReceiptDetailService receiptDetailService;
80 72 @Resource
81   - private IMaterialService materialService;
82   - @Resource
83   - private IErpService erpService;
84   - @Resource
85 73 private IHuahengMultiHandlerService huahengMultiHandlerService;
86 74  
87 75 /*---------------------------------主表处理-begin-------------------------------------*/
88 76  
89 77 /**
90 78 * 分页列表查询
91   - * @param receiptHeader
92   - * @param pageNo
93   - * @param pageSize
94   - * @param req
  79 + *
  80 + * @param receiptHeader
  81 + * @param pageNo
  82 + * @param pageSize
  83 + * @param req
95 84 * @return
96 85 */
97 86 // @AutoLog(value = "入库表主表-分页列表查询")
98 87 @ApiOperation(value = "入库表主表-分页列表查询", notes = "入库表主表-分页列表查询")
99 88 @GetMapping(value = "/list")
100 89 public Result<IPage<ReceiptHeader>> queryPageList(ReceiptHeader receiptHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
101   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
  90 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
102 91 HuahengJwtUtil.setWarehouseCode(request, receiptHeader);
103 92 QueryWrapper<ReceiptHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiptHeader, request.getParameterMap());
104 93 Page<ReceiptHeader> page = new Page<ReceiptHeader>(pageNo, pageSize);
... ... @@ -108,7 +97,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
108 97  
109 98 /**
110 99 * 添加
111   - * @param receiptHeader
  100 + *
  101 + * @param receiptHeader
112 102 * @return
113 103 */
114 104 @AutoLog(value = "入库表主表-添加")
... ... @@ -122,7 +112,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
122 112  
123 113 /**
124 114 * 编辑
125   - * @param receiptHeader
  115 + *
  116 + * @param receiptHeader
126 117 * @return
127 118 */
128 119 @AutoLog(value = "入库表主表-编辑")
... ... @@ -136,7 +127,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
136 127  
137 128 /**
138 129 * 通过id删除
139   - * @param id
  130 + *
  131 + * @param id
140 132 * @return
141 133 */
142 134 @AutoLog(value = "入库表主表-通过id删除")
... ... @@ -152,7 +144,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
152 144  
153 145 /**
154 146 * 批量删除
155   - * @param ids
  147 + *
  148 + * @param ids
156 149 * @return
157 150 */
158 151 @AutoLog(value = "入库表主表-批量删除")
... ... @@ -166,6 +159,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
166 159  
167 160 /**
168 161 * 导出
  162 + *
169 163 * @return
170 164 */
171 165 @RequestMapping(value = "/exportXls")
... ... @@ -176,6 +170,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
176 170  
177 171 /**
178 172 * 导入
  173 + *
179 174 * @return
180 175 */
181 176 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
... ... @@ -186,11 +181,12 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
186 181  
187 182 /**
188 183 * 导入入库单
  184 + *
189 185 * @return
190 186 */
191 187 @RequestMapping(value = "/importReceipt")
192 188 public Result<?> importFinishedProduct(HttpServletRequest request, HttpServletResponse response) throws Exception {
193   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  189 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
194 190 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
195 191 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
196 192 MultipartFile file = entity.getValue();// 获取上传文件对象
... ... @@ -232,15 +228,17 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
232 228 /*---------------------------------主表处理-end-------------------------------------*/
233 229  
234 230 /*--------------------------------子表处理-入库单详情-begin----------------------------------------------*/
  231 +
235 232 /**
236 233 * 通过主表ID查询
  234 + *
237 235 * @return
238 236 */
239 237 // @AutoLog(value = "入库单详情-通过主表ID查询")
240 238 @ApiOperation(value = "入库单详情-通过主表ID查询", notes = "入库单详情-通过主表ID查询")
241 239 @GetMapping(value = "/listReceiptDetailByMainId")
242 240 public Result<IPage<ReceiptDetail>> listReceiptDetailByMainId(ReceiptDetail receiptDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
243   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  241 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
244 242 QueryWrapper<ReceiptDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetail, req.getParameterMap());
245 243 Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize);
246 244 IPage<ReceiptDetail> pageList = receiptDetailService.page(page, queryWrapper);
... ... @@ -256,11 +254,11 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
256 254 @ApiOperation(value = "入库单详情-查询未收完的明细", notes = "入库单详情-查询未收完的明细")
257 255 @GetMapping(value = "/listReceiptDetailByCode")
258 256 public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, String materialCode, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
259   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
  257 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
260 258 LambdaQueryWrapper<ReceiptDetail> query = Wrappers.lambdaQuery();
261 259 query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code)
262   - .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode)
263   - .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).last(" and qty-task_qty>0");
  260 + .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode)
  261 + .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).last(" and qty-task_qty>0");
264 262 Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize);
265 263 IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query);
266 264 return Result.ok(pageList);
... ... @@ -268,7 +266,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
268 266  
269 267 /**
270 268 * 添加
271   - * @param receiptDetail
  269 + *
  270 + * @param receiptDetail
272 271 * @return
273 272 */
274 273 @AutoLog(value = "入库单详情-添加")
... ... @@ -281,7 +280,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
281 280  
282 281 /**
283 282 * 编辑
284   - * @param receiptDetail
  283 + *
  284 + * @param receiptDetail
285 285 * @return
286 286 */
287 287 @AutoLog(value = "入库单详情-编辑")
... ... @@ -297,7 +297,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
297 297  
298 298 /**
299 299 * 通过id删除
300   - * @param id
  300 + *
  301 + * @param id
301 302 * @return
302 303 */
303 304 @AutoLog(value = "入库单详情-通过id删除")
... ... @@ -311,7 +312,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
311 312  
312 313 /**
313 314 * 批量删除
314   - * @param ids
  315 + *
  316 + * @param ids
315 317 * @return
316 318 */
317 319 @AutoLog(value = "入库单详情-批量删除")
... ... @@ -325,6 +327,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
325 327  
326 328 /**
327 329 * 导出
  330 + *
328 331 * @return
329 332 */
330 333 @RequestMapping(value = "/exportReceiptDetail")
... ... @@ -332,7 +335,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
332 335 public ModelAndView exportReceiptDetail(HttpServletRequest request, ReceiptDetail receiptDetail) {
333 336 // Step.1 组装查询条件
334 337 QueryWrapper<ReceiptDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetail, request.getParameterMap());
335   - LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
  338 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
336 339  
337 340 // Step.2 获取导出数据
338 341 List<ReceiptDetail> pageList = receiptDetailService.list(queryWrapper);
... ... @@ -358,12 +361,13 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
358 361  
359 362 /**
360 363 * 导入
  364 + *
361 365 * @return
362 366 */
363 367 @RequestMapping(value = "/importReceiptDetail/{mainId}")
364 368 @RequiresPermissions("receiptDetail:import")
365 369 public Result<?> importReceiptDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) {
366   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  370 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
367 371 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
368 372 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
369 373 MultipartFile file = entity.getValue();// 获取上传文件对象
... ... @@ -398,7 +402,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
398 402  
399 403 /**
400 404 * 回传入库单
401   - * @param receiptHeader
  405 + *
  406 + * @param receiptHeader
402 407 * @return
403 408 */
404 409 @AutoLog(value = "回传入库单")
... ... @@ -458,4 +463,46 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
458 463 public Result<?> crossDocking(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
459 464 return receiptHeaderService.crossDocking(id);
460 465 }
  466 +
  467 + /**
  468 + * 积木报表API数据集：入库单主表
  469 + */
  470 + @PassApiAuthentication
  471 + @GetMapping(value = "/listPrintContent")
  472 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  473 + LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
  474 + receiptHeaderQueryWrapper.in(ReceiptHeader::getId, Arrays.asList(ids.split(",")));
  475 + List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
  476 + JimuReportResult jimuReportResult = new JimuReportResult();
  477 + jimuReportResult.setData(receiptHeaderList);
  478 + return jimuReportResult;
  479 + }
  480 +
  481 + /**
  482 + * 积木报表API数据集：入库单详情
  483 + */
  484 + @PassApiAuthentication
  485 + @GetMapping(value = "/listPrintContentDetail")
  486 + public JimuReportResult listPrintContentDetail(@RequestParam(name = "ids", required = true) String ids) {
  487 + LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
  488 + receiptDetailQueryWrapper.in(ReceiptDetail::getReceiptId, Arrays.asList(ids.split(",")));
  489 + List<ReceiptDetail> receiptDetailList = receiptDetailService.list(receiptDetailQueryWrapper);
  490 + JimuReportResult jimuReportResult = new JimuReportResult();
  491 + jimuReportResult.setData(receiptDetailList);
  492 + return jimuReportResult;
  493 + }
  494 +
  495 + /**
  496 + * 积木报表API数据集：入库单详情
  497 + */
  498 + @PassApiAuthentication
  499 + @GetMapping(value = "/listPrintReceiptDetail")
  500 + public JimuReportResult listPrintReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
  501 + LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
  502 + receiptDetailQueryWrapper.in(ReceiptDetail::getId, Arrays.asList(ids.split(",")));
  503 + List<ReceiptDetail> receiptDetailList = receiptDetailService.list(receiptDetailQueryWrapper);
  504 + JimuReportResult jimuReportResult = new JimuReportResult();
  505 + jimuReportResult.setData(receiptDetailList);
  506 + return jimuReportResult;
  507 + }
461 508 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerAdvice/controller/ShipmentContainerAdviceController.java
  View file @ba4e26f
... ... @@ -6,12 +6,18 @@ import java.util.List;
6 6 import javax.servlet.http.HttpServletRequest;
7 7 import javax.servlet.http.HttpServletResponse;
8 8  
  9 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  10 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
9 11 import org.jeecg.common.api.vo.Result;
10 12 import org.jeecg.common.aspect.annotation.AutoLog;
11 13 import org.jeecg.common.system.base.controller.JeecgController;
12 14 import org.jeecg.common.system.query.QueryGenerator;
  15 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
13 16 import org.jeecg.modules.wms.shipment.shipmentContainerAdvice.entity.ShipmentContainerAdvice;
14 17 import org.jeecg.modules.wms.shipment.shipmentContainerAdvice.service.IShipmentContainerAdviceService;
  18 +import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
  19 +import org.jeecg.utils.constant.QuantityConstant;
  20 +import org.jeecg.utils.support.PassApiAuthentication;
15 21 import org.springframework.beans.factory.annotation.Autowired;
16 22 import org.springframework.web.bind.annotation.*;
17 23 import org.springframework.web.servlet.ModelAndView;
... ... @@ -160,4 +166,20 @@ public class ShipmentContainerAdviceController extends JeecgController&lt;ShipmentC
160 166 }
161 167 return Result.OK(shipmentContainerAdviceList);
162 168 }
  169 +
  170 +
  171 + /**
  172 + * 积木报表API数据集：预配盘查询
  173 + */
  174 + @PassApiAuthentication
  175 + @GetMapping(value = "/listPrintShipmentAdvice")
  176 + public JimuReportResult listPrintShipmentAdvice(@RequestParam(name = "ids", required = true) String ids) {
  177 + LambdaQueryWrapper<ShipmentContainerAdvice> shipmentContainerAdviceQueryWrapper = Wrappers.lambdaQuery();
  178 + shipmentContainerAdviceQueryWrapper.in(ShipmentContainerAdvice::getShipmentId, Arrays.asList(ids.split(",")))
  179 + .lt(ShipmentContainerAdvice::getStatus, QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
  180 + List<ShipmentContainerAdvice> shipmentContainerAdviceList = shipmentContainerAdviceService.list(shipmentContainerAdviceQueryWrapper);
  181 + JimuReportResult jimuReportResult = new JimuReportResult();
  182 + jimuReportResult.setData(shipmentContainerAdviceList);
  183 + return jimuReportResult;
  184 + }
163 185 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @ba4e26f
1 1 package org.jeecg.modules.wms.shipment.shipmentHeader.controller;
2 2  
3   -import java.io.IOException;
4   -import java.math.BigDecimal;
5   -import java.util.Arrays;
6   -import java.util.List;
7   -import java.util.Map;
8   -import java.util.stream.Collectors;
9   -
10   -import javax.annotation.Resource;
11   -import javax.servlet.http.HttpServletRequest;
12   -import javax.servlet.http.HttpServletResponse;
13   -
  3 +import cn.monitor4all.logRecord.annotation.OperationLog;
  4 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  5 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  6 +import com.baomidou.mybatisplus.core.metadata.IPage;
  7 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  8 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  9 +import io.swagger.annotations.Api;
  10 +import io.swagger.annotations.ApiOperation;
  11 +import lombok.extern.slf4j.Slf4j;
14 12 import org.apache.shiro.SecurityUtils;
15 13 import org.apache.shiro.authz.annotation.RequiresPermissions;
16 14 import org.jeecg.common.api.vo.Result;
... ... @@ -19,9 +17,8 @@ import org.jeecg.common.system.base.controller.JeecgController;
19 17 import org.jeecg.common.system.query.QueryGenerator;
20 18 import org.jeecg.common.system.vo.LoginUser;
21 19 import org.jeecg.common.util.oConvertUtils;
22   -import org.jeecg.modules.wms.api.erp.service.IErpService;
23 20 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
24   -import org.jeecg.modules.wms.api.mobile.service.IMobileService;
  21 +import org.jeecg.modules.wms.config.container.entity.JimuReportResult;
25 22 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
26 23 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
27 24 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
... ... @@ -34,6 +31,7 @@ import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
34 31 import org.jeecg.utils.HuahengJwtUtil;
35 32 import org.jeecg.utils.constant.QuantityConstant;
36 33 import org.jeecg.utils.support.ApiLogger;
  34 +import org.jeecg.utils.support.PassApiAuthentication;
37 35 import org.jeecgframework.poi.excel.ExcelImportUtil;
38 36 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
39 37 import org.jeecgframework.poi.excel.entity.ExportParams;
... ... @@ -45,20 +43,21 @@ import org.springframework.web.multipart.MultipartFile;
45 43 import org.springframework.web.multipart.MultipartHttpServletRequest;
46 44 import org.springframework.web.servlet.ModelAndView;
47 45  
48   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
49   -import com.baomidou.mybatisplus.core.metadata.IPage;
50   -import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
51   -
52   -import cn.monitor4all.logRecord.annotation.OperationLog;
53   -import io.swagger.annotations.Api;
54   -import io.swagger.annotations.ApiOperation;
55   -import lombok.extern.slf4j.Slf4j;
  46 +import javax.annotation.Resource;
  47 +import javax.servlet.http.HttpServletRequest;
  48 +import javax.servlet.http.HttpServletResponse;
  49 +import java.io.IOException;
  50 +import java.math.BigDecimal;
  51 +import java.util.Arrays;
  52 +import java.util.List;
  53 +import java.util.Map;
  54 +import java.util.stream.Collectors;
56 55  
57 56 /**
58 57 * @Description: 出库单
59   - * @Author: jeecg-boot
60   - * @Date: 2022-11-21
61   - * @Version: V1.0
  58 + * @Author: jeecg-boot
  59 + * @Date: 2022-11-21
  60 + * @Version: V1.0
62 61 */
63 62 @Api(tags = "出库单")
64 63 @RestController
... ... @@ -66,9 +65,6 @@ import lombok.extern.slf4j.Slf4j;
66 65 @Slf4j
67 66 public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IShipmentHeaderService> {
68 67  
69   - @Resource
70   - private IMobileService mobileService;
71   -
72 68 @Autowired
73 69 private IShipmentHeaderService shipmentHeaderService;
74 70  
... ... @@ -76,9 +72,6 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
76 72 private IShipmentDetailService shipmentDetailService;
77 73  
78 74 @Resource
79   - private IErpService erpService;
80   -
81   - @Resource
82 75 private IInventoryDetailService inventoryDetailService;
83 76  
84 77 @Resource
... ... @@ -88,17 +81,18 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
88 81  
89 82 /**
90 83 * 分页列表查询
91   - * @param shipmentHeader
92   - * @param pageNo
93   - * @param pageSize
94   - * @param req
  84 + *
  85 + * @param shipmentHeader
  86 + * @param pageNo
  87 + * @param pageSize
  88 + * @param req
95 89 * @return
96 90 */
97 91 // @AutoLog(value = "出库单-分页列表查询")
98 92 @ApiOperation(value = "出库单-分页列表查询", notes = "出库单-分页列表查询")
99 93 @GetMapping(value = "/list")
100 94 public Result<IPage<ShipmentHeader>> queryPageList(ShipmentHeader shipmentHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
101   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  95 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
102 96 HuahengJwtUtil.setWarehouseCode(req, shipmentHeader);
103 97 QueryWrapper<ShipmentHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeader, req.getParameterMap());
104 98 Page<ShipmentHeader> page = new Page<ShipmentHeader>(pageNo, pageSize);
... ... @@ -108,7 +102,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
108 102  
109 103 /**
110 104 * 添加
111   - * @param shipmentHeader
  105 + *
  106 + * @param shipmentHeader
112 107 * @return
113 108 */
114 109 @AutoLog(value = "出库单-添加")
... ... @@ -130,7 +125,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
130 125  
131 126 /**
132 127 * 编辑
133   - * @param shipmentHeader
  128 + *
  129 + * @param shipmentHeader
134 130 * @return
135 131 */
136 132 @AutoLog(value = "出库单-编辑")
... ... @@ -143,7 +139,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
143 139  
144 140 /**
145 141 * 通过id删除
146   - * @param id
  142 + *
  143 + * @param id
147 144 * @return
148 145 */
149 146 @AutoLog(value = "出库单-通过id删除")
... ... @@ -159,7 +156,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
159 156  
160 157 /**
161 158 * 批量删除
162   - * @param ids
  159 + *
  160 + * @param ids
163 161 * @return
164 162 */
165 163 @AutoLog(value = "出库单-批量删除")
... ... @@ -173,6 +171,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
173 171  
174 172 /**
175 173 * 导出
  174 + *
176 175 * @return
177 176 */
178 177 @RequestMapping(value = "/exportXls")
... ... @@ -183,6 +182,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
183 182  
184 183 /**
185 184 * 导入
  185 + *
186 186 * @return
187 187 */
188 188 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
... ... @@ -193,15 +193,17 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
193 193 /*---------------------------------主表处理-end-------------------------------------*/
194 194  
195 195 /*--------------------------------子表处理-出库单详情-begin----------------------------------------------*/
  196 +
196 197 /**
197 198 * 通过主表ID查询
  199 + *
198 200 * @return
199 201 */
200 202 // @AutoLog(value = "出库单详情-通过主表ID查询")
201 203 @ApiOperation(value = "出库单详情-通过主表ID查询", notes = "出库单详情-通过主表ID查询")
202 204 @GetMapping(value = "/listShipmentDetailByMainId")
203 205 public Result<IPage<ShipmentDetail>> listShipmentDetailByMainId(ShipmentDetail shipmentDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
204   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  206 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
205 207 QueryWrapper<ShipmentDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentDetail, null);
206 208 Page<ShipmentDetail> page = new Page<ShipmentDetail>(pageNo, pageSize);
207 209 IPage<ShipmentDetail> pageList = shipmentDetailService.page(page, queryWrapper);
... ... @@ -226,7 +228,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
226 228  
227 229 /**
228 230 * 添加
229   - * @param shipmentDetail
  231 + *
  232 + * @param shipmentDetail
230 233 * @return
231 234 */
232 235 @AutoLog(value = "出库单详情-添加")
... ... @@ -239,7 +242,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
239 242  
240 243 /**
241 244 * 编辑
242   - * @param shipmentDetail
  245 + *
  246 + * @param shipmentDetail
243 247 * @return
244 248 */
245 249 @AutoLog(value = "出库单详情-编辑")
... ... @@ -252,7 +256,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
252 256  
253 257 /**
254 258 * 通过id删除
255   - * @param id
  259 + *
  260 + * @param id
256 261 * @return
257 262 */
258 263 @AutoLog(value = "出库单详情-通过id删除")
... ... @@ -266,7 +271,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
266 271  
267 272 /**
268 273 * 批量删除
269   - * @param ids
  274 + *
  275 + * @param ids
270 276 * @return
271 277 */
272 278 @AutoLog(value = "出库单详情-批量删除")
... ... @@ -279,6 +285,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
279 285  
280 286 /**
281 287 * 导出
  288 + *
282 289 * @return
283 290 */
284 291 @RequestMapping(value = "/exportShipmentDetail")
... ... @@ -286,7 +293,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
286 293 public ModelAndView exportShipmentDetail(HttpServletRequest request, ShipmentDetail shipmentDetail) {
287 294 // Step.1 组装查询条件
288 295 QueryWrapper<ShipmentDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentDetail, request.getParameterMap());
289   - LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
  296 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
290 297  
291 298 // Step.2 获取导出数据
292 299 List<ShipmentDetail> pageList = shipmentDetailService.list(queryWrapper);
... ... @@ -312,12 +319,13 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
312 319  
313 320 /**
314 321 * 导入
  322 + *
315 323 * @return
316 324 */
317 325 @RequestMapping(value = "/importShipmentDetail/{mainId}")
318 326 @RequiresPermissions("shipmentDetail:import")
319 327 public Result<?> importShipmentDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) {
320   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  328 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
321 329 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
322 330 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
323 331 MultipartFile file = entity.getValue();// 获取上传文件对象
... ... @@ -350,11 +358,12 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
350 358  
351 359 /**
352 360 * 导入出库单
  361 + *
353 362 * @return
354 363 */
355 364 @RequestMapping(value = "/importShipment")
356 365 public Result<?> importFinishedProduct(HttpServletRequest request, HttpServletResponse response) throws Exception {
357   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
  366 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
358 367 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
359 368 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
360 369 MultipartFile file = entity.getValue();// 获取上传文件对象
... ... @@ -398,7 +407,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
398 407  
399 408 /**
400 409 * 回传出库单
401   - * @param shipmentHeader
  410 + *
  411 + * @param shipmentHeader
402 412 * @return
403 413 */
404 414 @AutoLog(value = "回传出库单")
... ... @@ -483,6 +493,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
483 493  
484 494 /**
485 495 * 获取出库单物料库存信息
  496 + *
486 497 * @return
487 498 */
488 499 @ApiOperation(value = "获取出库单物料库存信息", notes = "获取出库单物料库存信息")
... ... @@ -507,4 +518,45 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
507 518 return Result.OK(shipmentInventory);
508 519 }
509 520  
  521 + /**
  522 + * 积木报表API数据集：出库单主表
  523 + */
  524 + @PassApiAuthentication
  525 + @GetMapping(value = "/listPrintContent")
  526 + public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
  527 + LambdaQueryWrapper<ShipmentHeader> shipmentHeaderQueryWrapper = Wrappers.lambdaQuery();
  528 + shipmentHeaderQueryWrapper.in(ShipmentHeader::getId, Arrays.asList(ids.split(",")));
  529 + List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderQueryWrapper);
  530 + JimuReportResult jimuReportResult = new JimuReportResult();
  531 + jimuReportResult.setData(shipmentHeaderList);
  532 + return jimuReportResult;
  533 + }
  534 +
  535 + /**
  536 + * 积木报表API数据集：出库单详情
  537 + */
  538 + @PassApiAuthentication
  539 + @GetMapping(value = "/listPrintContentDetail")
  540 + public JimuReportResult listPrintContentDetail(@RequestParam(name = "ids", required = true) String ids) {
  541 + LambdaQueryWrapper<ShipmentDetail> shipmentHeaderQueryWrapper = Wrappers.lambdaQuery();
  542 + shipmentHeaderQueryWrapper.in(ShipmentDetail::getShipmentId, Arrays.asList(ids.split(",")));
  543 + List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentHeaderQueryWrapper);
  544 + JimuReportResult jimuReportResult = new JimuReportResult();
  545 + jimuReportResult.setData(shipmentDetailList);
  546 + return jimuReportResult;
  547 + }
  548 +
  549 + /**
  550 + * 积木报表API数据集：出库单详情
  551 + */
  552 + @PassApiAuthentication
  553 + @GetMapping(value = "/listPrintShipmentDetail")
  554 + public JimuReportResult listPrintShipmentDetail(@RequestParam(name = "ids", required = true) String ids) {
  555 + LambdaQueryWrapper<ShipmentDetail> shipmentHeaderQueryWrapper = Wrappers.lambdaQuery();
  556 + shipmentHeaderQueryWrapper.in(ShipmentDetail::getId, Arrays.asList(ids.split(",")));
  557 + List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentHeaderQueryWrapper);
  558 + JimuReportResult jimuReportResult = new JimuReportResult();
  559 + jimuReportResult.setData(shipmentDetailList);
  560 + return jimuReportResult;
  561 + }
510 562 }
... ...
huaheng-wms-core/src/main/resources/application-dev.yml
  View file @ba4e26f
... ... @@ -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,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/container/listPrintContent,/config/location/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
  217 + excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiptHeader/listPrintContent,/receipt/receiptHeader/listPrintContentDetail,/receipt/receiptHeader/listPrintReceiptDetail,/shipment/shipmentHeader/listPrintContent,/shipment/shipmentHeader/listPrintContentDetail,/shipment/shipmentHeader/listPrintShipmentDetail,/shipment/shipmentContainerAdvice/listPrintShipmentAdvice,/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
  View file @ba4e26f
... ... @@ -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,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/location/listPrintContent,/config/container/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
  217 + excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiptHeader/listPrintContent,/receipt/receiptHeader/listPrintContentDetail,/receipt/receiptHeader/listPrintReceiptDetail,/shipment/shipmentHeader/listPrintContent,/shipment/shipmentHeader/listPrintContentDetail,/shipment/shipmentHeader/listPrintShipmentDetail,/shipment/shipmentContainerAdvice/listPrintShipmentAdvice,/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
  View file @ba4e26f
... ... @@ -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,/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
  220 + excludeUrls: /test/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/receipt/receiptHeader/listPrintContent,/receipt/receiptHeader/listPrintContentDetail,/receipt/receiptHeader/listPrintReceiptDetail,/shipment/shipmentHeader/listPrintContent,/shipment/shipmentHeader/listPrintContentDetail,/shipment/shipmentHeader/listPrintShipmentDetail,/shipment/shipmentContainerAdvice/listPrintShipmentAdvice,/receipt/receiveHeader/**,/config/materialSn/listPrintContent,/config/material/listPrintContent,/config/container/listPrintContent,/config/location/listPrintContent,/api/**,/sys/cas/client/validateLogin,/sys/common/static/**,/sys/systemActivation
221 221 #阿里云oss存储和大鱼短信秘钥配置
222 222 oss:
223 223 accessKey: ??
... ...