wms / wms4_globaltaiguogeli · Commits

Commit 4103de85aa987f976e6c8fdbdece3d9a25d47371

Authored by 谭毅彬
1 parent f93dd6a2

多仓支持提交（6） 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 0 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
  View file @4103de8
... ... @@ -14,6 +14,7 @@ import java.util.Arrays;
14 14 import org.jeecg.modules.wms.receipt.receiptHeaderHistory.entity.ReceiptDetailHistory;
15 15 import org.jeecg.modules.wms.receipt.receiptHeaderHistory.entity.ReceiptHeaderHistory;
16 16 import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptHeaderHistoryService;
  17 +import org.jeecg.utils.HuahengJwtUtil;
17 18 import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptDetailHistoryService;
18 19 import io.swagger.annotations.Api;
19 20 import io.swagger.annotations.ApiOperation;
... ... @@ -53,6 +54,7 @@ public class ReceiptHeaderHistoryController extends JeecgController&lt;ReceiptHeade
53 54 public Result<IPage<ReceiptHeaderHistory>> queryPageList(ReceiptHeaderHistory receiptHeaderHistory,
54 55 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
55 56 HttpServletRequest req) {
  57 + HuahengJwtUtil.setWarehouseCode(req, receiptHeaderHistory);
56 58 QueryWrapper<ReceiptHeaderHistory> queryWrapper = QueryGenerator.initQueryWrapper(receiptHeaderHistory, req.getParameterMap());
57 59 Page<ReceiptHeaderHistory> page = new Page<ReceiptHeaderHistory>(pageNo, pageSize);
58 60 IPage<ReceiptHeaderHistory> pageList = receiptHeaderHistoryService.page(page, queryWrapper);
... ... @@ -111,6 +113,7 @@ public class ReceiptHeaderHistoryController extends JeecgController&lt;ReceiptHeade
111 113 public Result<IPage<ReceiptDetailHistory>> listReceiptDetailHistoryByMainId(ReceiptDetailHistory receiptDetailHistory,
112 114 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
113 115 HttpServletRequest req) {
  116 + HuahengJwtUtil.setWarehouseCode(req, receiptDetailHistory);
114 117 QueryWrapper<ReceiptDetailHistory> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetailHistory, req.getParameterMap());
115 118 Page<ReceiptDetailHistory> page = new Page<ReceiptDetailHistory>(pageNo, pageSize);
116 119 IPage<ReceiptDetailHistory> pageList = receiptDetailHistoryService.page(page, queryWrapper);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @4103de8
... ... @@ -96,6 +96,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
96 96 @GetMapping(value = "/list")
97 97 public Result<IPage<ShipmentHeader>> queryPageList(ShipmentHeader shipmentHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
98 98 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
  99 + HuahengJwtUtil.setWarehouseCode(req, shipmentHeader);
99 100 QueryWrapper<ShipmentHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeader, req.getParameterMap());
100 101 Page<ShipmentHeader> page = new Page<ShipmentHeader>(pageNo, pageSize);
101 102 IPage<ShipmentHeader> pageList = shipmentHeaderService.page(page, queryWrapper);
... ...