From 5b9418461ce3a92053e99ab097e31a60571d8ebd Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Wed, 8 Mar 2023 11:43:38 +0800
Subject: [PATCH] 增加多仓判断
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java | 36 ++++++++++++------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java | 7 ++++++-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java | 44 ++++++++++++++------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java | 9 +++++----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java | 2 ++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java | 61 ++++++++++++++++++++++++++++++++++---------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java | 35 ++++++++++++-----------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java | 33 ++++++++++-----------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java | 8 +++++++-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java | 7 ++++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java | 33 ++++++++++++++-------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java | 18 ++++++++++++++++--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java | 32 +++++++++++++++++++-------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java | 610 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java | 2 ++
17 files changed, 633 insertions(+), 718 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
index 8f732f9..2d1896c 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
@@ -1,44 +1,30 @@
package org.jeecg.modules.wms.config.address.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
import org.jeecg.modules.wms.config.address.entity.Address;
import org.jeecg.modules.wms.config.address.service.IAddressService;
+import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 接口地址
@@ -67,6 +53,8 @@ public class AddressController extends JeecgController<Address, IAddressService>
@GetMapping(value = "/list")
public Result<IPage<Address>> queryPageList(Address address, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ address.setWarehouseCode(warehouseCode);
QueryWrapper<Address> queryWrapper = QueryGenerator.initQueryWrapper(address, req.getParameterMap());
Page<Address> page = new Page<Address>(pageNo, pageSize);
IPage<Address> pageList = addressService.page(page, queryWrapper);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java
index 65a49d7..8b9c551 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java
@@ -12,6 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.wms.config.agvPort.entity.AgvPort;
import org.jeecg.modules.wms.config.agvPort.service.IAgvPortService;
+import org.jeecg.utils.HuahengJwtUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -51,6 +52,8 @@ public class AgvPortController extends JeecgController<AgvPort, IAgvPortService>
@GetMapping(value = "/list")
public Result<IPage<AgvPort>> queryPageList(AgvPort agvPort, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ agvPort.setWarehouseCode(warehouseCode);
QueryWrapper<AgvPort> queryWrapper = QueryGenerator.initQueryWrapper(agvPort, req.getParameterMap());
Page<AgvPort> page = new Page<AgvPort>(pageNo, pageSize);
IPage<AgvPort> pageList = agvPortService.page(page, queryWrapper);
@@ -66,7 +69,9 @@ public class AgvPortController extends JeecgController<AgvPort, IAgvPortService>
@ApiOperation(value = "AGV点位-添加", notes = "AGV点位-添加")
@PostMapping(value = "/add")
@RequiresPermissions("agvPort:add")
- public Result<String> add(@RequestBody AgvPort agvPort) {
+ public Result<String> add(@RequestBody AgvPort agvPort, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ agvPort.setWarehouseCode(warehouseCode);
agvPortService.save(agvPort);
return Result.OK("添加成功！");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java
index 4fdcfe1..8b515dd 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java
@@ -2,46 +2,32 @@ package org.jeecg.modules.wms.config.cycleCountPreference.controller;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.wms.config.company.entity.Company;
-import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
import org.jeecg.modules.wms.config.cycleCountPreference.entity.CycleCountPreference;
import org.jeecg.modules.wms.config.cycleCountPreference.service.ICycleCountPreferenceService;
+import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 盘点首选项
@@ -71,6 +57,8 @@ public class CycleCountPreferenceController extends JeecgController<CycleCountPr
public Result<IPage<CycleCountPreference>> queryPageList(CycleCountPreference cycleCountPreference,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ cycleCountPreference.setWarehouseCode(warehouseCode);
QueryWrapper<CycleCountPreference> queryWrapper = QueryGenerator.initQueryWrapper(cycleCountPreference, req.getParameterMap());
Page<CycleCountPreference> page = new Page<CycleCountPreference>(pageNo, pageSize);
IPage<CycleCountPreference> pageList = cycleCountPreferenceService.page(page, queryWrapper);
@@ -137,8 +125,6 @@ public class CycleCountPreferenceController extends JeecgController<CycleCountPr
return Result.OK("批量删除成功!");
}
-
-
/**
* 获得盘点类型信息
* @param req
@@ -152,8 +138,6 @@ public class CycleCountPreferenceController extends JeecgController<CycleCountPr
return Result.OK(cycleCountPreferenceList);
}
-
-
/**
* 通过id查询
* @param id
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
index 5ae7711..19ab28f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
@@ -51,18 +51,19 @@ public class LocationMonitorController {
*/
@GetMapping("/getStatus")
@ResponseBody
- public Result getStatus(String zoneCode) {
+ public Result getStatus(String zoneCode, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
HashMap<String, Integer> map = new HashMap<>();
LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(Location::getStatus, Location::getContainerCode).eq(Location::getZoneCode, zoneCode);
+ queryWrapper.select(Location::getStatus, Location::getContainerCode).eq(Location::getZoneCode, zoneCode).eq(Location::getWarehouseCode, warehouseCode);
List<Location> locationList = locationService.list(queryWrapper);
map.put("location", locationList.size());
// 换stream进行数据拣选速度更快
List<Location> emptyLocationList = locationList.stream().filter(t -> StringUtils.isEmpty(t.getContainerCode())).collect(Collectors.toList());
map.put("emptyLocation", emptyLocationList.size());
LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
- containerLambdaQueryWrapper.select(Container::getCode, Container::getStatus);
- List<Container> containerList = containerService.list();
+ containerLambdaQueryWrapper.select(Container::getCode, Container::getStatus).eq(Container::getWarehouseCode, warehouseCode);
+ List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
List<String> containerCodeList =
containerList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)).map(Container::getCode).collect(Collectors.toList());
List<Location> haveEmptyContainLocation = locationList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
index 0261c37..f603706 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
@@ -56,6 +56,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
@GetMapping(value = "/list")
public Result<IPage<Material>> queryPageList(Material material, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ material.setWarehouseCode(warehouseCode);
QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
Page<Material> page = new Page<Material>(pageNo, pageSize);
IPage<Material> pageList = materialService.page(page, queryWrapper);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
index c788dd2..01109db 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
@@ -1,135 +1,110 @@
package org.jeecg.modules.wms.inventory.InventoryMaterialSummary.controller;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.wms.inventory.InventoryMaterialSummary.service.IInventoryMaterialSummaryService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.impl.InventoryDetailServiceImpl;
+import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
- /**
+/**
* @Description: 物料汇总主表
- * @Author: jeecg-boot
- * @Date: 2023-02-22
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-02-22
+ * @Version: V1.0
*/
-@Api(tags="物料汇总主表")
+@Api(tags = "物料汇总主表")
@RestController
@RequestMapping("/InventoryMaterialSummary/inventoryMaterialSummary")
@Slf4j
public class InventoryMaterialSummaryController extends JeecgController<InventoryDetail, IInventoryMaterialSummaryService> {
- @Resource
- private InventoryDetailServiceImpl inventoryDetailServiceImpl;
- @Resource
- private IInventoryMaterialSummaryService inventoryMaterialSummaryService;
-
-
- /**
- * 分页列表查询
- *
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="物料汇总主表-分页列表查询", notes="物料汇总主表-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<InventoryDetail>> queryPageList(InventoryDetail inventoryDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
- Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
- IPage<InventoryDetail> pageList = inventoryDetailServiceImpl.page(page, queryWrapper);
- //筛选库存汇总数据的专用方法
- List<InventoryDetail> details = inventoryMaterialSummaryService.duplicateRemoval(pageList.getRecords());
- pageList.setRecords(null);
- pageList.setRecords(details);
- return Result.OK(pageList);
- }
-
+ @Resource
+ private InventoryDetailServiceImpl inventoryDetailServiceImpl;
+ @Resource
+ private IInventoryMaterialSummaryService inventoryMaterialSummaryService;
+ /**
+ * 分页列表查询
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "物料汇总主表-分页列表查询", notes = "物料汇总主表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<InventoryDetail>> queryPageList(InventoryDetail inventoryDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ inventoryDetail.setWarehouseCode(warehouseCode);
+ QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
+ Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
+ IPage<InventoryDetail> pageList = inventoryDetailServiceImpl.page(page, queryWrapper);
+ // 筛选库存汇总数据的专用方法
+ List<InventoryDetail> details = inventoryMaterialSummaryService.duplicateRemoval(pageList.getRecords());
+ pageList.setRecords(null);
+ pageList.setRecords(details);
+ return Result.OK(pageList);
+ }
- /**
- * 分页列表明细情况
- *
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="物料汇总主表-库存汇总明细子单", notes="物料汇总主表-库存汇总明细子单")
- @GetMapping(value = "/inventoryMaterialSummaryChild")
- public Result<IPage<InventoryDetail>> inventoryMaterialSummaryChild(InventoryDetail inventoryDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- inventoryDetail=inventoryDetailServiceImpl.getById(inventoryDetail.getId());
- LambdaQueryWrapper<InventoryDetail> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())
- .eq(InventoryDetail::getMaterialName,inventoryDetail.getMaterialName())
- .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()),InventoryDetail::getMaterialSpec,inventoryDetail.getMaterialSpec())
- .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialUnit()),InventoryDetail::getMaterialUnit,inventoryDetail.getMaterialUnit());
+ /**
+ * 分页列表明细情况
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "物料汇总主表-库存汇总明细子单", notes = "物料汇总主表-库存汇总明细子单")
+ @GetMapping(value = "/inventoryMaterialSummaryChild")
+ public Result<IPage<InventoryDetail>> inventoryMaterialSummaryChild(InventoryDetail inventoryDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ inventoryDetail = inventoryDetailServiceImpl.getById(inventoryDetail.getId());
+ LambdaQueryWrapper<InventoryDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InventoryDetail::getMaterialCode, inventoryDetail.getMaterialCode()).eq(InventoryDetail::getMaterialName, inventoryDetail.getMaterialName())
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()), InventoryDetail::getMaterialSpec, inventoryDetail.getMaterialSpec())
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialUnit()), InventoryDetail::getMaterialUnit, inventoryDetail.getMaterialUnit());
- Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
- IPage<InventoryDetail> pageList = inventoryDetailServiceImpl.page(page, queryWrapper);
+ Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
+ IPage<InventoryDetail> pageList = inventoryDetailServiceImpl.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ return Result.OK(pageList);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param inventoryMaterialSummary
- */
+ * 导出excel
+ * @param request
+ * @param inventoryMaterialSummary
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, InventoryDetail inventoryMaterialSummary) {
return super.exportXls(request, inventoryMaterialSummary, InventoryDetail.class, "物料汇总主表");
}
/**
- * 通过excel导入数据
- *
- * @param request
- * @param response
- * @return
- */
+ * 通过excel导入数据
+ * @param request
+ * @param response
+ * @return
+ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, InventoryDetail.class);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
index 9313a9a..c6b18af 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -1,41 +1,46 @@
package org.jeecg.modules.wms.inventory.inventoryHeader.controller;
-import org.jeecg.common.system.query.QueryGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
+import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-import java.util.Arrays;
-import org.jeecg.common.util.oConvertUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 库存表
@@ -70,6 +75,8 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
@GetMapping(value = "/list")
public Result<IPage<InventoryHeader>> queryPageList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ inventoryHeader.setWarehouseCode(warehouseCode);
QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
IPage<InventoryHeader> pageList = inventoryHeaderService.page(page, queryWrapper);
@@ -86,7 +93,9 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
@PostMapping(value = "/add")
public Result<String> add(@RequestBody InventoryHeader inventoryHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- inventoryHeader.setWarehouseCode(warehouseCode);
+ if (StringUtils.isNotEmpty(warehouseCode)) {
+ inventoryHeader.setWarehouseCode(warehouseCode);
+ }
inventoryHeaderService.save(inventoryHeader);
return Result.OK("添加成功！");
}
@@ -264,9 +273,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
@ApiOperation(value = "库存表-有货非锁定列表查询", notes = "库存表-有货非锁定列表查询")
@GetMapping(value = "/freeList")
public Result<IPage<InventoryHeader>> freeList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-
-
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
queryWrapper.eq("container_status", QuantityConstant.STATUS_CONTAINER_SOME);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java
index 8369dd8..76f1fef 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java
@@ -1,41 +1,28 @@
package org.jeecg.modules.wms.inventory.inventoryTransaction.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.service.IInventoryTransactionService;
import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.common.util.oConvertUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
-import org.jeecg.modules.wms.inventory.inventoryTransaction.service.IInventoryTransactionService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 库存交易记录
@@ -65,6 +52,8 @@ public class InventoryTransactionController extends JeecgController<InventoryTra
public Result<IPage<InventoryTransaction>> queryPageList(InventoryTransaction inventoryTransaction,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ inventoryTransaction.setWarehouseCode(warehouseCode);
QueryWrapper<InventoryTransaction> queryWrapper = QueryGenerator.initQueryWrapper(inventoryTransaction, req.getParameterMap());
Page<InventoryTransaction> page = new Page<InventoryTransaction>(pageNo, pageSize);
IPage<InventoryTransaction> pageList = inventoryTransactionService.page(page, queryWrapper);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java
index cb87007..abfe6fb 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java
@@ -1,40 +1,27 @@
package org.jeecg.modules.wms.monitor.apiLog.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
import org.jeecg.modules.wms.monitor.apiLog.entity.ApiLog;
import org.jeecg.modules.wms.monitor.apiLog.service.IApiLogService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 接口日志
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
index 8138b2b..1c7df01 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
@@ -91,6 +91,8 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
public Result<IPage<ReceiptContainerHeader>> queryPageList(ReceiptContainerHeader receiptContainerHeader,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ receiptContainerHeader.setWarehouseCode(warehouseCode);
QueryWrapper<ReceiptContainerHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiptContainerHeader, req.getParameterMap());
Page<ReceiptContainerHeader> page = new Page<ReceiptContainerHeader>(pageNo, pageSize);
IPage<ReceiptContainerHeader> pageList = receiptContainerHeaderService.page(page, queryWrapper);
@@ -106,7 +108,11 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
@ApiOperation(value = "入库组盘-添加", notes = "入库组盘-添加")
@RequiresPermissions("receiptContainerHeader:add")
@PostMapping(value = "/add")
- public Result<String> add(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
+ public Result<String> add(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ if (StringUtils.isNotEmpty(warehouseCode)) {
+ receiptContainerHeader.setWarehouseCode(warehouseCode);
+ }
receiptContainerHeaderService.save(receiptContainerHeader);
return Result.OK("添加成功！");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
index 20f6108..5e7442c 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -96,6 +96,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@GetMapping(value = "/list")
public Result<IPage<ReceiptHeader>> queryPageList(ReceiptHeader receiptHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ receiptHeader.setWarehouseCode(warehouseCode);
QueryWrapper<ReceiptHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiptHeader, req.getParameterMap());
Page<ReceiptHeader> page = new Page<ReceiptHeader>(pageNo, pageSize);
IPage<ReceiptHeader> pageList = receiptHeaderService.page(page, queryWrapper);
@@ -210,9 +212,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<ReceiptDetail> query = Wrappers.lambdaQuery();
query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code)
- .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode)
- .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED)
- .last(" and qty-task_qty>0");
+ .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode)
+ .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).last(" and qty-task_qty>0");
Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize);
IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query);
return Result.ok(pageList);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
index bbd58da..ca9423b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
@@ -1,16 +1,13 @@
package org.jeecg.modules.wms.shipment.shipmentCombination.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.modules.wms.config.location.entity.Location;
import org.jeecg.modules.wms.config.location.service.ILocationService;
import org.jeecg.modules.wms.config.port.entity.Port;
@@ -19,10 +16,6 @@ import org.jeecg.modules.wms.config.zone.entity.Zone;
import org.jeecg.modules.wms.config.zone.service.IZoneService;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
-import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
-import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
-import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
-import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
import org.jeecg.modules.wms.shipment.shipmentCombination.entity.Shipment;
import org.jeecg.modules.wms.shipment.shipmentCombination.service.IShipmentCombinationService;
@@ -31,15 +24,17 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
+import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
/**
* @author 游杰
@@ -72,7 +67,7 @@ public class ShipmentCombinationController {
@ResponseBody
public Result getShipmentDetailListByShipmentCode(String shipmentCode, HttpServletRequest req) {
if (StringUtils.isEmpty(shipmentCode)) {
- return null;
+ return Result.error("没有找到出库单号");
}
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
index a4d333d..3e7eb3a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
@@ -21,6 +21,8 @@ import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentCon
import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerDetailService;
import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerHeaderService;
+import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.utils.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -74,6 +76,8 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC
public Result<IPage<ShipmentContainerHeader>> queryPageList(ShipmentContainerHeader shipmentContainerHeader,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ shipmentContainerHeader.setWarehouseCode(warehouseCode);
QueryWrapper<ShipmentContainerHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerHeader, req.getParameterMap());
Page<ShipmentContainerHeader> page = new Page<ShipmentContainerHeader>(pageNo, pageSize);
IPage<ShipmentContainerHeader> pageList = shipmentContainerHeaderService.page(page, queryWrapper);
@@ -89,7 +93,11 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC
@ApiOperation(value = "出库组盘-添加", notes = "出库组盘-添加")
@PostMapping(value = "/add")
@RequiresPermissions("shipmentContainerHeader:add")
- public Result<String> add(@RequestBody ShipmentContainerHeader shipmentContainerHeader) {
+ public Result<String> add(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ if (StringUtils.isNotEmpty(warehouseCode)) {
+ shipmentContainerHeader.setWarehouseCode(warehouseCode);
+ }
shipmentContainerHeaderService.save(shipmentContainerHeader);
return Result.OK("添加成功！");
}
@@ -166,6 +174,8 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC
public Result<IPage<ShipmentContainerDetail>> listShipmentContainerDetailByMainId(ShipmentContainerDetail shipmentContainerDetail,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ shipmentContainerDetail.setWarehouseCode(warehouseCode);
QueryWrapper<ShipmentContainerDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerDetail, req.getParameterMap());
Page<ShipmentContainerDetail> page = new Page<ShipmentContainerDetail>(pageNo, pageSize);
IPage<ShipmentContainerDetail> pageList = shipmentContainerDetailService.page(page, queryWrapper);
@@ -181,7 +191,11 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC
@ApiOperation(value = "出库组盘详情-添加", notes = "出库组盘详情-添加")
@RequiresPermissions("shipmentContainerDetail:add")
@PostMapping(value = "/addShipmentContainerDetail")
- public Result<String> addShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail) {
+ public Result<String> addShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ if (StringUtils.isEmpty(warehouseCode)) {
+ shipmentContainerDetail.setWarehouseCode(warehouseCode);
+ }
shipmentContainerDetailService.save(shipmentContainerDetail);
return Result.OK("添加成功！");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
index 71ad2a6..03e20f4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
@@ -1,24 +1,28 @@
package org.jeecg.modules.wms.shipment.shipmentHeaderHistory.controller;
-import org.jeecg.common.system.query.QueryGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.api.vo.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
-import org.jeecg.common.util.oConvertUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.wms.shipment.shipmentHeaderHistory.entity.ShipmentDetailHistory;
import org.jeecg.modules.wms.shipment.shipmentHeaderHistory.entity.ShipmentHeaderHistory;
-import org.jeecg.modules.wms.shipment.shipmentHeaderHistory.service.IShipmentHeaderHistoryService;
import org.jeecg.modules.wms.shipment.shipmentHeaderHistory.service.IShipmentDetailHistoryService;
+import org.jeecg.modules.wms.shipment.shipmentHeaderHistory.service.IShipmentHeaderHistoryService;
+import org.jeecg.utils.HuahengJwtUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
/**
* @Description: 历史出库单
@@ -54,6 +58,8 @@ public class ShipmentHeaderHistoryController extends JeecgController<ShipmentHea
public Result<IPage<ShipmentHeaderHistory>> queryPageList(ShipmentHeaderHistory shipmentHeaderHistory,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ shipmentHeaderHistory.setWarehouseCode(warehouseCode);
QueryWrapper<ShipmentHeaderHistory> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeaderHistory, req.getParameterMap());
Page<ShipmentHeaderHistory> page = new Page<>(pageNo, pageSize);
IPage<ShipmentHeaderHistory> pageList = shipmentHeaderHistoryService.page(page, queryWrapper);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
index 3a7a7a4..c188598 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.wms.stocktaking.cycleCountDetail.controller;
-import java.io.UnsupportedEncodingException;
import java.io.IOException;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -12,9 +9,14 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecg.modules.system.entity.SysAnnouncementSend;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.wms.config.location.entity.Location;
import org.jeecg.modules.wms.config.location.service.impl.LocationServiceImpl;
import org.jeecg.modules.wms.config.port.entity.Port;
@@ -22,15 +24,12 @@ import org.jeecg.modules.wms.config.port.service.impl.PortServiceImpl;
import org.jeecg.modules.wms.config.zone.entity.Zone;
import org.jeecg.modules.wms.config.zone.service.impl.ZoneServiceImpl;
import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
-import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
-import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
+import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
+import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetailChild;
+import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailChildService;
+import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailService;
+import org.jeecg.modules.wms.stocktaking.cycleCountDetail.vo.CycleCountDetailPage;
import org.jeecg.utils.ConvertUtils;
import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
@@ -40,349 +39,324 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.vo.LoginUser;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetailChild;
-import org.jeecg.modules.wms.stocktaking.cycleCountDetail.entity.CycleCountDetail;
-import org.jeecg.modules.wms.stocktaking.cycleCountDetail.vo.CycleCountDetailPage;
-import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailService;
-import org.jeecg.modules.wms.stocktaking.cycleCountDetail.service.ICycleCountDetailChildService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import com.alibaba.fastjson.JSON;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
- /**
+/**
* @Description: 盘点明细表
- * @Author: jeecg-boot
- * @Date: 2023-01-30
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-01-30
+ * @Version: V1.0
*/
-@Api(tags="盘点明细表")
+@Api(tags = "盘点明细表")
@RestController
@RequestMapping("/cycleCountDetail/cycleCountDetail")
@Slf4j
-public class CycleCountDetailController extends HuahengBaseController {
- @Autowired
- private ICycleCountDetailService cycleCountDetailService;
- @Autowired
- private ICycleCountDetailChildService cycleCountDetailChildService;
- @Autowired
- private IInventoryDetailService inventoryDetailService;
- @Resource
- private LocationServiceImpl locationService;
- @Resource
- private ZoneServiceImpl zoneService;
- @Resource
- private PortServiceImpl portService;
-
- /**
- * 分页列表查询
- *
- * @param cycleCountDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "盘点明细表-分页列表查询")
- @ApiOperation(value="盘点明细表-分页列表查询", notes="盘点明细表-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<CycleCountDetail>> queryPageList(CycleCountDetail cycleCountDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
-
-
- LambdaQueryWrapper<CycleCountDetail> queryWrapper = new LambdaQueryWrapper<CycleCountDetail>();
- queryWrapper.eq(CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId());
- Page<CycleCountDetail> page = new Page<CycleCountDetail>(pageNo, pageSize);
- IPage<CycleCountDetail> pageList = cycleCountDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 添加
- *
- * @param cycleCountDetailPage
- * @return
- */
- @AutoLog(value = "盘点明细表-添加")
- @ApiOperation(value="盘点明细表-添加", notes="盘点明细表-添加")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody CycleCountDetailPage cycleCountDetailPage) {
- CycleCountDetail cycleCountDetail = new CycleCountDetail();
- BeanUtils.copyProperties(cycleCountDetailPage, cycleCountDetail);
- cycleCountDetailService.saveMain(cycleCountDetail, cycleCountDetailPage.getCycleCountDetailChildList());
- return Result.OK("添加成功！");
- }
-
- /**
- * 盘盈增加明细
- *
- * @param
- * @return
- */
- @AutoLog(value = "盘点盘盈-增加明细")
- @ApiOperation(value="盘点盘盈-增加明细", notes="盘点盘盈-增加明细")
- @RequestMapping(value = "/increaseInInventoryGain", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> increaseInInventoryGain(@RequestBody CycleCountDetailChild cycleCountDetailChild) {
- return cycleCountDetailService.increaseInInventoryGain(cycleCountDetailChild);
- }
-
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @AutoLog(value = "盘点明细表-通过id删除")
- @ApiOperation(value="盘点明细表-通过id删除", notes="盘点明细表-通过id删除")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cycleCountDetailService.delMain(id);
- return Result.OK("删除成功!");
- }
-
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "盘点明细表-批量删除")
- @ApiOperation(value="盘点明细表-批量删除", notes="盘点明细表-批量删除")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cycleCountDetailService.delBatchMain(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功！");
- }
+public class CycleCountDetailController extends HuahengBaseController {
+ @Autowired
+ private ICycleCountDetailService cycleCountDetailService;
+ @Autowired
+ private ICycleCountDetailChildService cycleCountDetailChildService;
+ @Autowired
+ private IInventoryDetailService inventoryDetailService;
+ @Resource
+ private LocationServiceImpl locationService;
+ @Resource
+ private ZoneServiceImpl zoneService;
+ @Resource
+ private PortServiceImpl portService;
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "盘点明细表-通过id查询")
- @ApiOperation(value="盘点明细表-通过id查询", notes="盘点明细表-通过id查询")
- @GetMapping(value = "/queryById")
- public Result<CycleCountDetail> queryById(@RequestParam(name="id",required=true) String id) {
- CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(id);
- if(cycleCountDetail==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(cycleCountDetail);
+ /**
+ * 分页列表查询
+ * @param cycleCountDetail
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ // @AutoLog(value = "盘点明细表-分页列表查询")
+ @ApiOperation(value = "盘点明细表-分页列表查询", notes = "盘点明细表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<CycleCountDetail>> queryPageList(CycleCountDetail cycleCountDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ LambdaQueryWrapper<CycleCountDetail> queryWrapper = new LambdaQueryWrapper<CycleCountDetail>();
+ queryWrapper.eq(CycleCountDetail::getCycleCountHeadId, cycleCountDetail.getCycleCountHeadId());
+ Page<CycleCountDetail> page = new Page<CycleCountDetail>(pageNo, pageSize);
+ IPage<CycleCountDetail> pageList = cycleCountDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- }
+ /**
+ * 添加
+ * @param cycleCountDetailPage
+ * @return
+ */
+ @AutoLog(value = "盘点明细表-添加")
+ @ApiOperation(value = "盘点明细表-添加", notes = "盘点明细表-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody CycleCountDetailPage cycleCountDetailPage) {
+ CycleCountDetail cycleCountDetail = new CycleCountDetail();
+ BeanUtils.copyProperties(cycleCountDetailPage, cycleCountDetail);
+ cycleCountDetailService.saveMain(cycleCountDetail, cycleCountDetailPage.getCycleCountDetailChildList());
+ return Result.OK("添加成功！");
+ }
+ /**
+ * 盘盈增加明细
+ * @param
+ * @return
+ */
+ @AutoLog(value = "盘点盘盈-增加明细")
+ @ApiOperation(value = "盘点盘盈-增加明细", notes = "盘点盘盈-增加明细")
+ @RequestMapping(value = "/increaseInInventoryGain", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> increaseInInventoryGain(@RequestBody CycleCountDetailChild cycleCountDetailChild) {
+ return cycleCountDetailService.increaseInInventoryGain(cycleCountDetailChild);
+ }
- /**
- * 生成单条盘点任务
- *
- */
- @AutoLog(value = "生成单条盘点任务")
- @ApiOperation(value="生成单条盘点任务", notes="生成单条盘点任务")
- @PostMapping(value = "/createCycleCoutTaskByDetailId")
- public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId,@RequestParam(name = "toPort") String toPort, HttpServletRequest req){
- if(cycleId ==null){
- return Result.error("生成盘点任务时盘点明细ID不能为空！");
- }
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return cycleCountDetailService.createCycleCoutTaskByDetailId(cycleId,toPort,warehouseCode);
- }
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "盘点明细表-通过id删除")
+ @ApiOperation(value = "盘点明细表-通过id删除", notes = "盘点明细表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cycleCountDetailService.delMain(id);
+ return Result.OK("删除成功!");
+ }
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "盘点明细表-批量删除")
+ @ApiOperation(value = "盘点明细表-批量删除", notes = "盘点明细表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cycleCountDetailService.delBatchMain(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功！");
+ }
- /**
- * 选择分拣口
- * @return
- */
- @ApiOperation(value = "盘点-选择分拣口", notes = "盘点-选择分拣口")
- @PostMapping("/inventoryPort")
- @ResponseBody
- public Result inventoryPort(@RequestBody CycleCountDetail cycleCountDetail, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- String fromLocationCode = cycleCountDetail.getLocationCode();
- if (StringUtils.isEmpty(fromLocationCode)) {
- return Result.error("选择分拣口时, 起始库位号为空");
- }
- Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
- if (fromLocation == null) {
- return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
- }
- String zoneCode = fromLocation.getZoneCode();
- if (StringUtils.isEmpty(zoneCode)) {
- return Result.error("选择分拣口时, 库区编码为空");
- }
- Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
- if (zone == null) {
- return Result.error("选择分拣口时, 库区为空");
- }
- int type = QuantityConstant.PORT_TYPE_PICK;
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ // @AutoLog(value = "盘点明细表-通过id查询")
+ @ApiOperation(value = "盘点明细表-通过id查询", notes = "盘点明细表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<CycleCountDetail> queryById(@RequestParam(name = "id", required = true) String id) {
+ CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(id);
+ if (cycleCountDetail == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(cycleCountDetail);
- List<Port> portList = portService.getPortListByType(type, zoneCode, warehouseCode);
- if (portList.size() == 0) {
- return Result.error("选择分拣口时, 没有找到合适的分拣口");
- }
- return Result.OK(portList);
- }
+ }
+ /**
+ * 生成单条盘点任务
+ */
+ @AutoLog(value = "生成单条盘点任务")
+ @ApiOperation(value = "生成单条盘点任务", notes = "生成单条盘点任务")
+ @PostMapping(value = "/createCycleCoutTaskByDetailId")
+ public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId, @RequestParam(name = "toPort") String toPort,
+ HttpServletRequest req) {
+ if (cycleId == null) {
+ return Result.error("生成盘点任务时盘点明细ID不能为空！");
+ }
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ return cycleCountDetailService.createCycleCoutTaskByDetailId(cycleId, toPort, warehouseCode);
+ }
- /**
- * 添加盘点
- *
- */
- @AutoLog(value = "盘点添加")
- @ApiOperation(value="盘点添加", notes="盘点添加")
- @PostMapping(value = "/stockTakeTask")
- public Result<String> stockTakeTask(@RequestParam(name = "ids") String ids,@RequestParam(name = "headerId") int headerId,@RequestParam(name = "code") String code) {
- if (StringUtils.isEmpty(ids)) {
- return Result.error("taskId不能为空");
- }
- Result result = null;
- Integer[] idList = ConvertUtils.toIntArray(ids);
- for (int taskId : idList) {
- result = handleMultiProcess("cancelTask", new HuahengBaseController.MultiProcessListener() {
- @Override
- public Result doProcess() {
- Result result = cycleCountDetailService.stockDetailAdd(taskId,headerId,code);
- return result;
- }
- });
- }
- result.setResult(headerId);
- return result;
+ /**
+ * 选择分拣口
+ * @return
+ */
+ @ApiOperation(value = "盘点-选择分拣口", notes = "盘点-选择分拣口")
+ @PostMapping("/inventoryPort")
+ @ResponseBody
+ public Result inventoryPort(@RequestBody CycleCountDetail cycleCountDetail, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ String fromLocationCode = cycleCountDetail.getLocationCode();
+ if (StringUtils.isEmpty(fromLocationCode)) {
+ return Result.error("选择分拣口时, 起始库位号为空");
+ }
+ Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
+ if (fromLocation == null) {
+ return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
+ }
+ String zoneCode = fromLocation.getZoneCode();
+ if (StringUtils.isEmpty(zoneCode)) {
+ return Result.error("选择分拣口时, 库区编码为空");
+ }
+ Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+ if (zone == null) {
+ return Result.error("选择分拣口时, 库区为空");
+ }
+ int type = QuantityConstant.PORT_TYPE_PICK;
+
+ List<Port> portList = portService.getPortListByType(type, zoneCode, warehouseCode);
+ if (portList.size() == 0) {
+ return Result.error("选择分拣口时, 没有找到合适的分拣口");
+ }
+ return Result.OK(portList);
+ }
- }
+ /**
+ * 添加盘点
+ */
+ @AutoLog(value = "盘点添加")
+ @ApiOperation(value = "盘点添加", notes = "盘点添加")
+ @PostMapping(value = "/stockTakeTask")
+ public Result<String> stockTakeTask(@RequestParam(name = "ids") String ids, @RequestParam(name = "headerId") int headerId,
+ @RequestParam(name = "code") String code) {
+ if (StringUtils.isEmpty(ids)) {
+ return Result.error("taskId不能为空");
+ }
+ Result result = null;
+ Integer[] idList = ConvertUtils.toIntArray(ids);
+ for (int taskId : idList) {
+ result = handleMultiProcess("cancelTask", new HuahengBaseController.MultiProcessListener() {
+ @Override
+ public Result doProcess() {
+ Result result = cycleCountDetailService.stockDetailAdd(taskId, headerId, code);
+ return result;
+ }
+ });
+ }
+ result.setResult(headerId);
+ return result;
+ }
- /**
- *实盘登记
- * @return
- */
- @PostMapping("/confirmGapQty")
- @ResponseBody
- public Result confirmGapQty(@RequestBody Map<String,String> map){
- String id = map.get("id");
- String countedQty = map.get("countedQty");
- String state = map.get("state");
- return cycleCountDetailChildService.confirmGapQty(id,countedQty,state);
- }
+ /**
+ * 实盘登记
+ * @return
+ */
+ @PostMapping("/confirmGapQty")
+ @ResponseBody
+ public Result confirmGapQty(@RequestBody Map<String, String> map) {
+ String id = map.get("id");
+ String countedQty = map.get("countedQty");
+ String state = map.get("state");
+ return cycleCountDetailChildService.confirmGapQty(id, countedQty, state);
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "盘点容器明细表-通过主表ID查询")
- @ApiOperation(value="盘点容器明细表-通过主表ID查询", notes="盘点容器明细表-通过主表ID查询")
- @GetMapping(value = "/queryCycleCountDetailChildByMainId")
- public Result<IPage<CycleCountDetailChild>> queryCycleCountDetailChildListByMainId(@RequestParam(name="id",required=true) int id) {
- LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
- cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, id);
- List<CycleCountDetailChild> cycleCountDetailChildList = cycleCountDetailChildService.list(cycleCountDetailChildLambdaQueryWrapper);
- IPage <CycleCountDetailChild> page = new Page<>();
- page.setRecords(cycleCountDetailChildList);
- page.setTotal(cycleCountDetailChildList.size());
- return Result.OK(page);
- }
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ // @AutoLog(value = "盘点容器明细表-通过主表ID查询")
+ @ApiOperation(value = "盘点容器明细表-通过主表ID查询", notes = "盘点容器明细表-通过主表ID查询")
+ @GetMapping(value = "/queryCycleCountDetailChildByMainId")
+ public Result<IPage<CycleCountDetailChild>> queryCycleCountDetailChildListByMainId(@RequestParam(name = "id", required = true) int id) {
+ LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
+ cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, id);
+ List<CycleCountDetailChild> cycleCountDetailChildList = cycleCountDetailChildService.list(cycleCountDetailChildLambdaQueryWrapper);
+ IPage<CycleCountDetailChild> page = new Page<>();
+ page.setRecords(cycleCountDetailChildList);
+ page.setTotal(cycleCountDetailChildList.size());
+ return Result.OK(page);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param cycleCountDetail
- */
+ * 导出excel
+ * @param request
+ * @param cycleCountDetail
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CycleCountDetail cycleCountDetail) {
- // Step.1 组装查询条件查询数据
- QueryWrapper<CycleCountDetail> queryWrapper = QueryGenerator.initQueryWrapper(cycleCountDetail, request.getParameterMap());
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- //Step.2 获取导出数据
- List<CycleCountDetail> queryList = cycleCountDetailService.list(queryWrapper);
- // 过滤选中数据
- String selections = request.getParameter("selections");
- List<CycleCountDetail> cycleCountDetailList = new ArrayList<CycleCountDetail>();
- if(oConvertUtils.isEmpty(selections)) {
- cycleCountDetailList = queryList;
- }else {
- List<String> selectionList = Arrays.asList(selections.split(","));
- cycleCountDetailList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
- }
-
- // Step.3 组装pageList
- List<CycleCountDetailPage> pageList = new ArrayList<CycleCountDetailPage>();
- for (CycleCountDetail main : cycleCountDetailList) {
- CycleCountDetailPage vo = new CycleCountDetailPage();
- BeanUtils.copyProperties(main, vo);
- LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
- cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, main.getId());
- List<CycleCountDetailChild> cycleCountDetailChildList = cycleCountDetailChildService.list(cycleCountDetailChildLambdaQueryWrapper);
- vo.setCycleCountDetailChildList(cycleCountDetailChildList);
- pageList.add(vo);
- }
-
- // Step.4 AutoPoi 导出Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- mv.addObject(NormalExcelConstants.FILE_NAME, "盘点明细表列表");
- mv.addObject(NormalExcelConstants.CLASS, CycleCountDetailPage.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("盘点明细表数据", "导出人:"+sysUser.getRealname(), "盘点明细表"));
- mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
- return mv;
+ // Step.1 组装查询条件查询数据
+ QueryWrapper<CycleCountDetail> queryWrapper = QueryGenerator.initQueryWrapper(cycleCountDetail, request.getParameterMap());
+ LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 获取导出数据
+ List<CycleCountDetail> queryList = cycleCountDetailService.list(queryWrapper);
+ // 过滤选中数据
+ String selections = request.getParameter("selections");
+ List<CycleCountDetail> cycleCountDetailList = new ArrayList<CycleCountDetail>();
+ if (oConvertUtils.isEmpty(selections)) {
+ cycleCountDetailList = queryList;
+ } else {
+ List<String> selectionList = Arrays.asList(selections.split(","));
+ cycleCountDetailList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ }
+
+ // Step.3 组装pageList
+ List<CycleCountDetailPage> pageList = new ArrayList<CycleCountDetailPage>();
+ for (CycleCountDetail main : cycleCountDetailList) {
+ CycleCountDetailPage vo = new CycleCountDetailPage();
+ BeanUtils.copyProperties(main, vo);
+ LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
+ cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, main.getId());
+ List<CycleCountDetailChild> cycleCountDetailChildList = cycleCountDetailChildService.list(cycleCountDetailChildLambdaQueryWrapper);
+ vo.setCycleCountDetailChildList(cycleCountDetailChildList);
+ pageList.add(vo);
+ }
+
+ // Step.4 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.FILE_NAME, "盘点明细表列表");
+ mv.addObject(NormalExcelConstants.CLASS, CycleCountDetailPage.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("盘点明细表数据", "导出人:" + sysUser.getRealname(), "盘点明细表"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+ return mv;
}
/**
- * 通过excel导入数据
- *
- * @param request
- * @param response
- * @return
- */
+ * 通过excel导入数据
+ * @param request
+ * @param response
+ * @return
+ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- MultipartFile file = entity.getValue();// 获取上传文件对象
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<CycleCountDetailPage> list = ExcelImportUtil.importExcel(file.getInputStream(), CycleCountDetailPage.class, params);
- for (CycleCountDetailPage page : list) {
- CycleCountDetail po = new CycleCountDetail();
- BeanUtils.copyProperties(page, po);
- cycleCountDetailService.saveMain(po, page.getCycleCountDetailChildList());
- }
- return Result.OK("文件导入成功！数据行数:" + list.size());
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- return Result.error("文件导入失败:"+e.getMessage());
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.OK("文件导入失败！");
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();// 获取上传文件对象
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List<CycleCountDetailPage> list = ExcelImportUtil.importExcel(file.getInputStream(), CycleCountDetailPage.class, params);
+ for (CycleCountDetailPage page : list) {
+ CycleCountDetail po = new CycleCountDetail();
+ BeanUtils.copyProperties(page, po);
+ cycleCountDetailService.saveMain(po, page.getCycleCountDetailChildList());
+ }
+ return Result.OK("文件导入成功！数据行数:" + list.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return Result.error("文件导入失败:" + e.getMessage());
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.OK("文件导入失败！");
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java
index 64e4d11..a857ed9 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java
@@ -1,174 +1,153 @@
package org.jeecg.modules.wms.stocktaking.cycleCountHeader.controller;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.wms.stocktaking.cycleCountHeader.entity.CycleCountHeader;
import org.jeecg.modules.wms.stocktaking.cycleCountHeader.service.ICycleCountHeaderService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
- /**
+/**
* @Description: 盘点主表
- * @Author: jeecg-boot
- * @Date: 2023-01-30
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-01-30
+ * @Version: V1.0
*/
-@Api(tags="盘点主表")
+@Api(tags = "盘点主表")
@RestController
@RequestMapping("/cycleCountHeader/cycleCountHeader")
@Slf4j
public class CycleCountHeaderController extends JeecgController<CycleCountHeader, ICycleCountHeaderService> {
- @Autowired
- private ICycleCountHeaderService cycleCountHeaderService;
+ @Autowired
+ private ICycleCountHeaderService cycleCountHeaderService;
- /**
- * 分页列表查询
- *
- * @param cycleCountHeader
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "盘点主表-分页列表查询")
- @ApiOperation(value="盘点主表-分页列表查询", notes="盘点主表-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<CycleCountHeader>> queryPageList(CycleCountHeader cycleCountHeader,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CycleCountHeader> queryWrapper = QueryGenerator.initQueryWrapper(cycleCountHeader, req.getParameterMap());
- Page<CycleCountHeader> page = new Page<CycleCountHeader>(pageNo, pageSize);
- IPage<CycleCountHeader> pageList = cycleCountHeaderService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ /**
+ * 分页列表查询
+ * @param cycleCountHeader
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ // @AutoLog(value = "盘点主表-分页列表查询")
+ @ApiOperation(value = "盘点主表-分页列表查询", notes = "盘点主表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<CycleCountHeader>> queryPageList(CycleCountHeader cycleCountHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ cycleCountHeader.setWarehouseCode(warehouseCode);
+ QueryWrapper<CycleCountHeader> queryWrapper = QueryGenerator.initQueryWrapper(cycleCountHeader, req.getParameterMap());
+ Page<CycleCountHeader> page = new Page<CycleCountHeader>(pageNo, pageSize);
+ IPage<CycleCountHeader> pageList = cycleCountHeaderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 添加
- *
- * @param cycleCountHeader
- * @return
- */
- @AutoLog(value = "盘点主表-添加")
- @ApiOperation(value="盘点主表-添加", notes="盘点主表-添加")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody CycleCountHeader cycleCountHeader, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- if (StringUtils.isNotEmpty(warehouseCode)) {
- cycleCountHeader.setWarehouseCode(warehouseCode);
- }
- Result result = cycleCountHeaderService.saveCycleCountHeader(cycleCountHeader);
- return result;
- }
+ /**
+ * 添加
+ * @param cycleCountHeader
+ * @return
+ */
+ @AutoLog(value = "盘点主表-添加")
+ @ApiOperation(value = "盘点主表-添加", notes = "盘点主表-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody CycleCountHeader cycleCountHeader, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ if (StringUtils.isNotEmpty(warehouseCode)) {
+ cycleCountHeader.setWarehouseCode(warehouseCode);
+ }
+ Result result = cycleCountHeaderService.saveCycleCountHeader(cycleCountHeader);
+ return result;
+ }
- /**
- * 编辑
- *
- * @param cycleCountHeader
- * @return
- */
- @AutoLog(value = "盘点主表-编辑")
- @ApiOperation(value="盘点主表-编辑", notes="盘点主表-编辑")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CycleCountHeader cycleCountHeader) {
- cycleCountHeaderService.updateById(cycleCountHeader);
- return Result.OK("编辑成功!");
- }
+ /**
+ * 编辑
+ * @param cycleCountHeader
+ * @return
+ */
+ @AutoLog(value = "盘点主表-编辑")
+ @ApiOperation(value = "盘点主表-编辑", notes = "盘点主表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CycleCountHeader cycleCountHeader) {
+ cycleCountHeaderService.updateById(cycleCountHeader);
+ return Result.OK("编辑成功!");
+ }
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @AutoLog(value = "盘点主表-通过id删除")
- @ApiOperation(value="盘点主表-通过id删除", notes="盘点主表-通过id删除")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cycleCountHeaderService.removeById(id);
- return Result.OK("删除成功!");
- }
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "盘点主表-通过id删除")
+ @ApiOperation(value = "盘点主表-通过id删除", notes = "盘点主表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cycleCountHeaderService.removeById(id);
+ return Result.OK("删除成功!");
+ }
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "盘点主表-批量删除")
- @ApiOperation(value="盘点主表-批量删除", notes="盘点主表-批量删除")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cycleCountHeaderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功!");
- }
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "盘点主表-批量删除")
+ @ApiOperation(value = "盘点主表-批量删除", notes = "盘点主表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cycleCountHeaderService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "盘点主表-通过id查询")
- @ApiOperation(value="盘点主表-通过id查询", notes="盘点主表-通过id查询")
- @GetMapping(value = "/queryById")
- public Result<CycleCountHeader> queryById(@RequestParam(name="id",required=true) String id) {
- CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(id);
- if(cycleCountHeader==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(cycleCountHeader);
- }
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ // @AutoLog(value = "盘点主表-通过id查询")
+ @ApiOperation(value = "盘点主表-通过id查询", notes = "盘点主表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<CycleCountHeader> queryById(@RequestParam(name = "id", required = true) String id) {
+ CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(id);
+ if (cycleCountHeader == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(cycleCountHeader);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param cycleCountHeader
- */
+ * 导出excel
+ * @param request
+ * @param cycleCountHeader
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CycleCountHeader cycleCountHeader) {
return super.exportXls(request, cycleCountHeader, CycleCountHeader.class, "盘点主表");
}
/**
- * 通过excel导入数据
- *
- * @param request
- * @param response
- * @return
- */
+ * 通过excel导入数据
+ * @param request
+ * @param response
+ * @return
+ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CycleCountHeader.class);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java
index 358d2c3..9e76966 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java
@@ -50,6 +50,8 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService>
@GetMapping(value = "/list")
public Result<IPage<AgvTask>> queryPageList(AgvTask agvTask, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ agvTask.setWarehouseCode(warehouseCode);
QueryWrapper<AgvTask> queryWrapper = QueryGenerator.initQueryWrapper(agvTask, req.getParameterMap());
Page<AgvTask> page = new Page<AgvTask>(pageNo, pageSize);
IPage<AgvTask> pageList = agvTaskService.page(page, queryWrapper);
--
libgit2 0.22.2