diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java index a66667c..c1c04b2 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java @@ -14,6 +14,7 @@ import java.util.Arrays; import org.jeecg.modules.wms.receipt.receiptHeaderHistory.entity.ReceiptDetailHistory; import org.jeecg.modules.wms.receipt.receiptHeaderHistory.entity.ReceiptHeaderHistory; import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptHeaderHistoryService; +import org.jeecg.utils.HuahengJwtUtil; import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptDetailHistoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -53,6 +54,7 @@ public class ReceiptHeaderHistoryController extends JeecgController<ReceiptHeade public Result<IPage<ReceiptHeaderHistory>> queryPageList(ReceiptHeaderHistory receiptHeaderHistory, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + HuahengJwtUtil.setWarehouseCode(req, receiptHeaderHistory); QueryWrapper<ReceiptHeaderHistory> queryWrapper = QueryGenerator.initQueryWrapper(receiptHeaderHistory, req.getParameterMap()); Page<ReceiptHeaderHistory> page = new Page<ReceiptHeaderHistory>(pageNo, pageSize); IPage<ReceiptHeaderHistory> pageList = receiptHeaderHistoryService.page(page, queryWrapper); @@ -111,6 +113,7 @@ public class ReceiptHeaderHistoryController extends JeecgController<ReceiptHeade public Result<IPage<ReceiptDetailHistory>> listReceiptDetailHistoryByMainId(ReceiptDetailHistory receiptDetailHistory, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + HuahengJwtUtil.setWarehouseCode(req, receiptDetailHistory); QueryWrapper<ReceiptDetailHistory> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetailHistory, req.getParameterMap()); Page<ReceiptDetailHistory> page = new Page<ReceiptDetailHistory>(pageNo, pageSize); IPage<ReceiptDetailHistory> pageList = receiptDetailHistoryService.page(page, queryWrapper); diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java index c719bb8..19db219 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java @@ -96,6 +96,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS @GetMapping(value = "/list") public Result<IPage<ShipmentHeader>> queryPageList(ShipmentHeader shipmentHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + HuahengJwtUtil.setWarehouseCode(req, shipmentHeader); QueryWrapper<ShipmentHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeader, req.getParameterMap()); Page<ShipmentHeader> page = new Page<ShipmentHeader>(pageNo, pageSize); IPage<ShipmentHeader> pageList = shipmentHeaderService.page(page, queryWrapper);