diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java
index 833d80c..963ed83 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java
@@ -1,203 +1,189 @@
package org.jeecg.modules.wms.audit.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.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.wms.audit.entity.Audit;
-import org.jeecg.modules.wms.audit.entity.AuditFlow;
-import org.jeecg.modules.wms.audit.service.IAuditService;
-
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;
-
-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.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.audit.entity.Audit;
+import org.jeecg.modules.wms.audit.entity.AuditFlow;
+import org.jeecg.modules.wms.audit.service.IAuditService;
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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
* @Description: 审核表
* @Author: jeecg-boot
- * @Date: 2023-07-26
+ * @Date: 2023-07-26
* @Version: V1.0
*/
-@Api(tags="审核表")
+@Api(tags = "审核表")
@RestController
@RequestMapping("/audit/audit")
@Slf4j
public class AuditController extends JeecgController<Audit, IAuditService> {
- @Autowired
- private IAuditService auditService;
-
- /**
- * 分页列表查询
- *
- * @param audit
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "审核表-分页列表查询")
- @ApiOperation(value="审核表-分页列表查询", notes="审核表-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<Audit>> queryPageList(Audit audit,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Audit> queryWrapper = QueryGenerator.initQueryWrapper(audit, req.getParameterMap());
- Page<Audit> page = new Page<Audit>(pageNo, pageSize);
- IPage<Audit> pageList = auditService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 添加
- *
- * @param audit
- * @return
- */
- @AutoLog(value = "审核表-添加")
- @ApiOperation(value="审核表-添加", notes="审核表-添加")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Audit audit) {
- auditService.save(audit);
- return Result.OK("添加成功！");
- }
-
- /**
- * 编辑
- *
- * @param audit
- * @return
- */
- @AutoLog(value = "审核表-编辑")
- @ApiOperation(value="审核表-编辑", notes="审核表-编辑")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Audit audit) {
- auditService.updateById(audit);
- 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) {
- auditService.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.auditService.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<Audit> queryById(@RequestParam(name="id",required=true) String id) {
- Audit audit = auditService.getById(id);
- if(audit==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(audit);
- }
+ @Autowired
+ private IAuditService auditService;
/**
- * 导出excel
- *
- * @param request
- * @param audit
- */
+ * 分页列表查询
+ *
+ * @param audit
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "审核表-分页列表查询")
+ @ApiOperation(value = "审核表-分页列表查询", notes = "审核表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<Audit>> queryPageList(Audit audit,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Audit> queryWrapper = QueryGenerator.initQueryWrapper(audit, req.getParameterMap());
+ Page<Audit> page = new Page<Audit>(pageNo, pageSize);
+ IPage<Audit> pageList = auditService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param audit
+ * @return
+ */
+ @AutoLog(value = "审核表-添加")
+ @ApiOperation(value = "审核表-添加", notes = "审核表-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Audit audit) {
+ auditService.save(audit);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param audit
+ * @return
+ */
+ @AutoLog(value = "审核表-编辑")
+ @ApiOperation(value = "审核表-编辑", notes = "审核表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody Audit audit) {
+ auditService.updateById(audit);
+ 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) {
+ auditService.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.auditService.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<Audit> queryById(@RequestParam(name = "id", required = true) String id) {
+ Audit audit = auditService.getById(id);
+ if (audit == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(audit);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param audit
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Audit audit) {
return super.exportXls(request, audit, Audit.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, Audit.class);
}
- @ApiOperation(value="提交入库单审核", notes="提交入库单审核")
- @GetMapping(value = "/createReceiptAuditFlow")
- public Result<Audit> createReceiptAuditFlow(Audit audit) {
- return auditService.createReceiptAuditFlow(audit);
- }
-
- @ApiOperation(value="入库单审核", notes="入库单审核")
- @GetMapping(value = "/auditReceipt")
- public Result<Audit> auditReceipt(Audit audit) {
- return auditService.auditReceipt(audit);
- }
-
- @ApiOperation(value="查询审核流程进度", notes="查询审核流程进度")
- @GetMapping(value = "/searchAuditFlow")
- public AuditFlow searchAuditFlow(Audit audit) {
- return auditService.searchAuditFlow(audit);
- }
-
- @ApiOperation(value="提交出库单审核", notes="提交出库单审核")
- @GetMapping(value = "/createShipmentAuditFlow")
- public Result<Audit> createShipmentAuditFlow(Audit audit) {
- return auditService.createShipmentAuditFlow(audit);
- }
-
- @ApiOperation(value="出库单审核", notes="出库单审核")
- @GetMapping(value = "/auditShipment")
- public Result<Audit> auditShipment(Audit audit) {
- return auditService.auditShipment(audit);
- }
+ @AutoLog(value = "审核表-提交入库单审核", operateType = 2)
+ @ApiOperation(value = "提交入库单审核", notes = "提交入库单审核")
+ @GetMapping(value = "/createReceiptAuditFlow")
+ public Result<Audit> createReceiptAuditFlow(Audit audit) {
+ return auditService.createReceiptAuditFlow(audit);
+ }
+
+ @AutoLog(value = "审核表-入库单审核", operateType = 3)
+ @ApiOperation(value = "入库单审核", notes = "入库单审核")
+ @GetMapping(value = "/auditReceipt")
+ public Result<Audit> auditReceipt(Audit audit) {
+ return auditService.auditReceipt(audit);
+ }
+
+ @ApiOperation(value = "查询审核流程进度", notes = "查询审核流程进度")
+ @GetMapping(value = "/searchAuditFlow")
+ public AuditFlow searchAuditFlow(Audit audit) {
+ return auditService.searchAuditFlow(audit);
+ }
+ @AutoLog(value = "审核表-提交出库单审核", operateType = 2)
+ @ApiOperation(value = "提交出库单审核", notes = "提交出库单审核")
+ @GetMapping(value = "/createShipmentAuditFlow")
+ public Result<Audit> createShipmentAuditFlow(Audit audit) {
+ return auditService.createShipmentAuditFlow(audit);
+ }
+ @AutoLog(value = "审核表-出库单审核", operateType = 3)
+ @ApiOperation(value = "出库单审核", notes = "出库单审核")
+ @GetMapping(value = "/auditShipment")
+ public Result<Audit> auditShipment(Audit audit) {
+ return auditService.auditShipment(audit);
+ }
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
index cb83c66..7f7b2e5 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
@@ -152,16 +152,8 @@ public class ContainerController extends JeecgController<Container, IContainerSe
return Result.OK("批量删除成功!");
}
- /**
- * 获取打印数据
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "容器管理-获取打印数据")
@ApiOperation(value = "容器管理-获取打印数据", notes = "容器管理-获取打印数据")
@PostMapping(value = "/getPrintContent")
- @ResponseBody
public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
List<String> idlist = Arrays.asList(ids.split(","));
List<Container> containerList = containerService.listByIds(idlist);
@@ -174,10 +166,9 @@ public class ContainerController extends JeecgController<Container, IContainerSe
* @param ids
* @return
*/
- @AutoLog(value = "容器管理-设置打印次数")
+ @AutoLog(value = "容器管理-设置打印次数", operateType = 3)
@ApiOperation(value = "容器管理-设置打印次数", notes = "容器管理-设置打印次数")
@PostMapping(value = "/setPrintTimes")
- @ResponseBody
public Result setPrintTimes(@RequestParam(name = "ids", required = true) String ids) {
List<String> idlist = Arrays.asList(ids.split(","));
List<Container> containerList = containerService.listByIds(idlist);
@@ -233,13 +224,6 @@ public class ContainerController extends JeecgController<Container, IContainerSe
return super.importExcel(request, response, Container.class);
}
- /**
- * 选取空闲的托盘
- *
- * @param container
- * @return
- */
- @AutoLog(value = "选取空闲的托盘")
@ApiOperation(value = "库位管理-选取空闲的托盘", notes = "库位管理-选取空闲的托盘")
@GetMapping(value = "/getEmptyAllContainer")
public Result getEmptyAllContainer(Container container, HttpServletRequest req) {
@@ -254,7 +238,6 @@ public class ContainerController extends JeecgController<Container, IContainerSe
* @param container
* @return
*/
- @AutoLog(value = "选取空闲的托盘")
@ApiOperation(value = "库位管理-选取空闲的托盘", notes = "库位管理-选取空闲的托盘")
@GetMapping(value = "/getCanUseListContainer")
public Result getCanUseListContainer(Container container, HttpServletRequest req) {
@@ -263,7 +246,6 @@ public class ContainerController extends JeecgController<Container, IContainerSe
return Result.OK(containerList);
}
- @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
@PassApiAuthentication
@GetMapping(value = "/listPrintContent")
public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
index 455ce3d..1360b74 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
@@ -166,16 +166,8 @@ public class LocationController extends JeecgController<Location, ILocationServi
return result;
}
- /**
- * 获取打印数据
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "库位管理-获取打印数据")
@ApiOperation(value = "库位管理-获取打印数据", notes = "库位管理-获取打印数据")
@PostMapping(value = "/getPrintContent")
- @ResponseBody
public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
List<String> idlist = Arrays.asList(ids.split(","));
List<Location> locationList = locationService.listByIds(idlist);
@@ -286,13 +278,6 @@ public class LocationController extends JeecgController<Location, ILocationServi
return super.importExcel(request, response, Location.class);
}
- /**
- * WCS库位信息比较
- *
- * @param location
- * @return
- */
- @AutoLog(value = "WCS库位信息比较")
@ApiOperation(value = "库位管理-WCS库位信息比较", notes = "库位管理-WCS库位信息比较")
@GetMapping(value = "/compareWcsLocation")
public Result compareWcsLocation(@Validated QueryCompareLocationDto queryCompareLocationDto, HttpServletRequest request) {
@@ -304,7 +289,6 @@ public class LocationController extends JeecgController<Location, ILocationServi
/**
* WCS库位信息比较
*
- * @param location
* @return
*/
@ApiOperation(value = "库位管理-WCS库位任务信息比较", notes = "库位管理-WCS库位任务信息比较")
@@ -329,7 +313,6 @@ public class LocationController extends JeecgController<Location, ILocationServi
return Result.OK(compareContainerTaskDtoPage);
}
- @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
@PassApiAuthentication
@GetMapping(value = "/listPrintContent")
public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
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 bf0f68e..96a50dc 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
@@ -158,17 +158,10 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
return super.exportXls(request, material, Material.class, "物料管理");
}
- /**
- * 获取打印数据
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "物料管理-获取打印数据")
+
@ApiOperation(value = "物料管理-获取打印数据", notes = "物料管理-获取打印数据")
@RequiresPermissions("material:print")
@PostMapping(value = "/getPrintContent")
- @ResponseBody
public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
List<String> idlist = Arrays.asList(ids.split(","));
List<Material> materialList = materialService.listByIds(idlist);
@@ -258,7 +251,6 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
return Result.OK(searchDomainList);
}
- @ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
@PassApiAuthentication
@GetMapping(value = "/listPrintContent")
public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
index 8ab7e8f..88e96b6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
@@ -168,7 +168,6 @@ public class MaterialSnController extends JeecgController<MaterialSn, IMaterialS
return super.importExcel(request, response, MaterialSn.class);
}
- @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
@PassApiAuthentication
@GetMapping(value = "/listPrintContent")
public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java
index a3cc093..e854068 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java
@@ -1,118 +1,120 @@
package org.jeecg.modules.wms.flow.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
+import org.apache.shiro.SecurityUtils;
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.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.wms.flow.entity.FlowDetail;
import org.jeecg.modules.wms.flow.entity.FlowHeader;
-import org.jeecg.modules.wms.flow.service.IFlowHeaderService;
import org.jeecg.modules.wms.flow.service.IFlowDetailService;
-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.jeecg.modules.wms.flow.service.IFlowHeaderService;
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 org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
- /**
+/**
* @Description: 流程头表
* @Author: jeecg-boot
- * @Date: 2023-07-25
+ * @Date: 2023-07-25
* @Version: V1.0
*/
-@Api(tags="流程头表")
+@Api(tags = "流程头表")
@RestController
@RequestMapping("/flow/flowHeader")
@Slf4j
public class FlowHeaderController extends JeecgController<FlowHeader, IFlowHeaderService> {
- @Autowired
- private IFlowHeaderService flowHeaderService;
+ @Autowired
+ private IFlowHeaderService flowHeaderService;
- @Autowired
- private IFlowDetailService flowDetailService;
+ @Autowired
+ private IFlowDetailService flowDetailService;
- @Resource
- private ISysUserService iSysUserService;
+ @Resource
+ private ISysUserService iSysUserService;
- /*---------------------------------主表处理-begin-------------------------------------*/
+ /*---------------------------------主表处理-begin-------------------------------------*/
- /**
- * 分页列表查询
- * @param flowHeader
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "流程头表-分页列表查询")
- @ApiOperation(value="流程头表-分页列表查询", notes="流程头表-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<FlowHeader>> queryPageList(FlowHeader flowHeader,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<FlowHeader> queryWrapper = QueryGenerator.initQueryWrapper(flowHeader, req.getParameterMap());
- Page<FlowHeader> page = new Page<FlowHeader>(pageNo, pageSize);
- IPage<FlowHeader> pageList = flowHeaderService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ /**
+ * 分页列表查询
+ *
+ * @param flowHeader
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "流程头表-分页列表查询")
+ @ApiOperation(value = "流程头表-分页列表查询", notes = "流程头表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<FlowHeader>> queryPageList(FlowHeader flowHeader,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<FlowHeader> queryWrapper = QueryGenerator.initQueryWrapper(flowHeader, req.getParameterMap());
+ Page<FlowHeader> page = new Page<FlowHeader>(pageNo, pageSize);
+ IPage<FlowHeader> pageList = flowHeaderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 添加
+ /**
+ * 添加
+ *
* @param flowHeader
* @return
*/
@AutoLog(value = "流程头表-添加")
- @ApiOperation(value="流程头表-添加", notes="流程头表-添加")
+ @ApiOperation(value = "流程头表-添加", notes = "流程头表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody FlowHeader flowHeader) {
- if (flowHeaderService.getFlowHead(flowHeader.getFlowType(),flowHeader.getDocumentType())){
- flowHeaderService.save(flowHeader);
- return Result.OK("添加成功！");
- }else {
- return Result.error("不能存在相同的流程!!");
- }
+ if (flowHeaderService.getFlowHead(flowHeader.getFlowType(), flowHeader.getDocumentType())) {
+ flowHeaderService.save(flowHeader);
+ return Result.OK("添加成功！");
+ } else {
+ return Result.error("不能存在相同的流程!!");
+ }
}
/**
- * 编辑
+ * 编辑
+ *
* @param flowHeader
* @return
*/
@AutoLog(value = "流程头表-编辑")
- @ApiOperation(value="流程头表-编辑", notes="流程头表-编辑")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ @ApiOperation(value = "流程头表-编辑", notes = "流程头表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody FlowHeader flowHeader) {
flowHeaderService.updateById(flowHeader);
return Result.OK("编辑成功!");
@@ -120,32 +122,35 @@ public class FlowHeaderController extends JeecgController<FlowHeader, IFlowHeade
/**
* 通过id删除
+ *
* @param id
* @return
*/
@AutoLog(value = "流程头表-通过id删除")
- @ApiOperation(value="流程头表-通过id删除", notes="流程头表-通过id删除")
+ @ApiOperation(value = "流程头表-通过id删除", notes = "流程头表-通过id删除")
@DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
flowHeaderService.delMain(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
+ *
* @param ids
* @return
*/
@AutoLog(value = "流程头表-批量删除")
- @ApiOperation(value="流程头表-批量删除", notes="流程头表-批量删除")
+ @ApiOperation(value = "流程头表-批量删除", notes = "流程头表-批量删除")
@DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.flowHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 导出
+ *
* @return
*/
@RequestMapping(value = "/exportXls")
@@ -155,180 +160,185 @@ public class FlowHeaderController extends JeecgController<FlowHeader, IFlowHeade
/**
* 导入
+ *
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, FlowHeader.class);
}
- /*---------------------------------主表处理-end-------------------------------------*/
+ /*---------------------------------主表处理-end-------------------------------------*/
/*--------------------------------子表处理-流程配置明细-begin----------------------------------------------*/
- /**
- * 通过主表ID查询
- * @return
- */
- //@AutoLog(value = "流程配置明细-通过主表ID查询")
- @ApiOperation(value="流程配置明细-通过主表ID查询", notes="流程配置明细-通过主表ID查询")
- @GetMapping(value = "/listFlowDetailByMainId")
+
+ /**
+ * 通过主表ID查询
+ *
+ * @return
+ */
+ //@AutoLog(value = "流程配置明细-通过主表ID查询")
+ @ApiOperation(value = "流程配置明细-通过主表ID查询", notes = "流程配置明细-通过主表ID查询")
+ @GetMapping(value = "/listFlowDetailByMainId")
public Result<IPage<FlowDetail>> listFlowDetailByMainId(FlowDetail flowDetail,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, req.getParameterMap());
Page<FlowDetail> page = new Page<FlowDetail>(pageNo, pageSize);
IPage<FlowDetail> pageList = flowDetailService.page(page, queryWrapper);
return Result.OK(pageList);
}
- /**
- * 添加
- * @param flowDetail
- * @return
- */
- @AutoLog(value = "流程配置明细-添加")
- @ApiOperation(value="流程配置明细-添加", notes="流程配置明细-添加")
- @PostMapping(value = "/addFlowDetail")
- public Result<String> addFlowDetail(@RequestBody FlowDetail flowDetail) {
- String [] users=flowDetail.getAuditorId().split(",");
- //批量新增的时候,按前台选择用户的顺序,生成审核顺序
- LambdaQueryWrapper<FlowDetail>lambdaQueryWrapper=new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(FlowDetail::getHeadId,flowDetail.getHeadId())
- .orderByDesc(FlowDetail::getSequence).last("limit 1");
- FlowDetail detail=flowDetailService.getOne(lambdaQueryWrapper);
- Integer sequence=0;
- if (detail!=null){
- sequence=detail.getSequence();
- }
- List<FlowDetail>flowDetailList=new ArrayList<>();
- for (int i=0;i<users.length;i++){
- sequence++;
- FlowDetail flowDetail1=new FlowDetail();
- flowDetail1.setHeadId(flowDetail.getHeadId());
- flowDetail1.setSequence(sequence);
- flowDetail1.setRemark(flowDetail.getRemark());
- //查询用户姓名
- SysUser user=iSysUserService.getUserByName(users[i]);
- flowDetail1.setAuditor(user.getRealname());
- flowDetail1.setAuditorId(users[i]);
- flowDetailList.add(flowDetail1);
- }
- flowDetailService.saveBatch(flowDetailList);
- return Result.OK("添加成功！");
- }
+ /**
+ * 添加
+ *
+ * @param flowDetail
+ * @return
+ */
+ @AutoLog(value = "流程配置明细-添加")
+ @ApiOperation(value = "流程配置明细-添加", notes = "流程配置明细-添加")
+ @PostMapping(value = "/addFlowDetail")
+ public Result<String> addFlowDetail(@RequestBody FlowDetail flowDetail) {
+ String[] users = flowDetail.getAuditorId().split(",");
+ //批量新增的时候,按前台选择用户的顺序,生成审核顺序
+ LambdaQueryWrapper<FlowDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(FlowDetail::getHeadId, flowDetail.getHeadId())
+ .orderByDesc(FlowDetail::getSequence).last("limit 1");
+ FlowDetail detail = flowDetailService.getOne(lambdaQueryWrapper);
+ Integer sequence = 0;
+ if (detail != null) {
+ sequence = detail.getSequence();
+ }
+ List<FlowDetail> flowDetailList = new ArrayList<>();
+ for (int i = 0; i < users.length; i++) {
+ sequence++;
+ FlowDetail flowDetail1 = new FlowDetail();
+ flowDetail1.setHeadId(flowDetail.getHeadId());
+ flowDetail1.setSequence(sequence);
+ flowDetail1.setRemark(flowDetail.getRemark());
+ //查询用户姓名
+ SysUser user = iSysUserService.getUserByName(users[i]);
+ flowDetail1.setAuditor(user.getRealname());
+ flowDetail1.setAuditorId(users[i]);
+ flowDetailList.add(flowDetail1);
+ }
+ flowDetailService.saveBatch(flowDetailList);
+ return Result.OK("添加成功！");
+ }
/**
- * 编辑
- * @param flowDetail
- * @return
- */
- @AutoLog(value = "流程配置明细-编辑")
- @ApiOperation(value="流程配置明细-编辑", notes="流程配置明细-编辑")
- @RequestMapping(value = "/editFlowDetail", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> editFlowDetail(@RequestBody FlowDetail flowDetail) {
- flowDetailService.updateById(flowDetail);
- return Result.OK("编辑成功!");
- }
+ * 编辑
+ *
+ * @param flowDetail
+ * @return
+ */
+ @AutoLog(value = "流程配置明细-编辑")
+ @ApiOperation(value = "流程配置明细-编辑", notes = "流程配置明细-编辑")
+ @RequestMapping(value = "/editFlowDetail", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> editFlowDetail(@RequestBody FlowDetail flowDetail) {
+ flowDetailService.updateById(flowDetail);
+ return Result.OK("编辑成功!");
+ }
- /**
- * 通过id删除
- * @param id
- * @return
- */
- @AutoLog(value = "流程配置明细-通过id删除")
- @ApiOperation(value="流程配置明细-通过id删除", notes="流程配置明细-通过id删除")
- @DeleteMapping(value = "/deleteFlowDetail")
- public Result<String> deleteFlowDetail(@RequestParam(name="id",required=true) String id) {
- flowDetailService.removeById(id);
- return Result.OK("删除成功!");
- }
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "流程配置明细-通过id删除")
+ @ApiOperation(value = "流程配置明细-通过id删除", notes = "流程配置明细-通过id删除")
+ @DeleteMapping(value = "/deleteFlowDetail")
+ public Result<String> deleteFlowDetail(@RequestParam(name = "id", required = true) String id) {
+ flowDetailService.removeById(id);
+ return Result.OK("删除成功!");
+ }
- /**
- * 批量删除
- * @param ids
- * @return
- */
- @AutoLog(value = "流程配置明细-批量删除")
- @ApiOperation(value="流程配置明细-批量删除", notes="流程配置明细-批量删除")
- @DeleteMapping(value = "/deleteBatchFlowDetail")
- public Result<String> deleteBatchFlowDetail(@RequestParam(name="ids",required=true) String ids) {
- this.flowDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功!");
- }
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "流程配置明细-批量删除")
+ @ApiOperation(value = "流程配置明细-批量删除", notes = "流程配置明细-批量删除")
+ @DeleteMapping(value = "/deleteBatchFlowDetail")
+ public Result<String> deleteBatchFlowDetail(@RequestParam(name = "ids", required = true) String ids) {
+ this.flowDetailService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
/**
* 导出
+ *
* @return
*/
@RequestMapping(value = "/exportFlowDetail")
public ModelAndView exportFlowDetail(HttpServletRequest request, FlowDetail flowDetail) {
- // Step.1 组装查询条件
- QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, request.getParameterMap());
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- // Step.2 获取导出数据
- List<FlowDetail> pageList = flowDetailService.list(queryWrapper);
- List<FlowDetail> exportList = null;
-
- // 过滤选中数据
- String selections = request.getParameter("selections");
- if (oConvertUtils.isNotEmpty(selections)) {
- List<String> selectionList = Arrays.asList(selections.split(","));
- exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
- } else {
- exportList = pageList;
- }
-
- // Step.3 AutoPoi 导出Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- mv.addObject(NormalExcelConstants.FILE_NAME, "流程配置明细"); //此处设置的filename无效 ,前端会重更新设置一下
- mv.addObject(NormalExcelConstants.CLASS, FlowDetail.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程配置明细报表", "导出人:" + sysUser.getRealname(), "流程配置明细"));
- mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
- return mv;
+ // Step.1 组装查询条件
+ QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, request.getParameterMap());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 获取导出数据
+ List<FlowDetail> pageList = flowDetailService.list(queryWrapper);
+ List<FlowDetail> exportList = null;
+
+ // 过滤选中数据
+ String selections = request.getParameter("selections");
+ if (oConvertUtils.isNotEmpty(selections)) {
+ List<String> selectionList = Arrays.asList(selections.split(","));
+ exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ } else {
+ exportList = pageList;
+ }
+
+ // Step.3 AutoPoi 导出Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.FILE_NAME, "流程配置明细"); //此处设置的filename无效 ,前端会重更新设置一下
+ mv.addObject(NormalExcelConstants.CLASS, FlowDetail.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程配置明细报表", "导出人:" + sysUser.getRealname(), "流程配置明细"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
}
/**
* 导入
+ *
* @return
*/
@RequestMapping(value = "/importFlowDetail/{mainId}")
public Result<?> importFlowDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
- 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<FlowDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), FlowDetail.class, params);
- for (FlowDetail temp : list) {
+ 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<FlowDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), FlowDetail.class, params);
+ for (FlowDetail temp : list) {
temp.setHeadId(mainId);
- }
- long start = System.currentTimeMillis();
- flowDetailService.saveBatch(list);
- log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
- 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.error("文件导入失败！");
+ }
+ long start = System.currentTimeMillis();
+ flowDetailService.saveBatch(list);
+ log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+ 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.error("文件导入失败！");
}
/*--------------------------------子表处理-流程配置明细-end----------------------------------------------*/
-
-
-
-
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/controller/InventoryAgeAlarmController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/controller/InventoryAgeAlarmController.java
index 34de5d3..fdf878a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/controller/InventoryAgeAlarmController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/controller/InventoryAgeAlarmController.java
@@ -11,7 +11,10 @@ import org.jeecg.modules.wms.config.materialWarning.service.IMaterialWarningServ
import org.jeecg.modules.wms.inventory.inventoryAge.entity.InventoryAgeAlarm;
import org.jeecg.modules.wms.inventory.inventoryAge.service.IInventoryAgeAlarmService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -19,70 +22,68 @@ import javax.servlet.http.HttpServletRequest;
/**
* @Description: inventory_level_alarm
* @Author: jeecg-boot
- * @Date: 2023-10-30
+ * @Date: 2023-10-30
* @Version: V1.0
*/
-@Api(tags="inventory_age_alarm")
+@Api(tags = "inventory_age_alarm")
@RestController
@RequestMapping("/inventory/inventoryAge")
@Slf4j
public class InventoryAgeAlarmController extends JeecgController<InventoryAgeAlarm, IInventoryAgeAlarmService> {
- @Autowired
- private IInventoryAgeAlarmService iInventoryAgeAlarmService;
+ @Autowired
+ private IInventoryAgeAlarmService iInventoryAgeAlarmService;
- @Autowired
- private IMaterialWarningService iMaterialWarningService;
+ @Autowired
+ private IMaterialWarningService iMaterialWarningService;
- /**
- * 分页列表查询
- *
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "inventory_level_alarm-分页列表查询")
- @ApiOperation(value="inventory_level_alarm-分页列表查询", notes="inventory_level_alarm-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<InventoryAgeAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
+ /**
+ * 分页列表查询
+ *
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "inventory_level_alarm-分页列表查询")
+ @ApiOperation(value = "inventory_level_alarm-分页列表查询", notes = "inventory_level_alarm-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<InventoryAgeAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
- Page<InventoryAgeAlarm> page = new Page<>(pageNo, pageSize);
- IPage<InventoryAgeAlarm> pageList = iInventoryAgeAlarmService.queryAgeAlarm(page, materialCode, materialName, alarmStatus);
- //对list分页处理
- return Result.OK(pageList);
- }
+ Page<InventoryAgeAlarm> page = new Page<>(pageNo, pageSize);
+ IPage<InventoryAgeAlarm> pageList = iInventoryAgeAlarmService.queryAgeAlarm(page, materialCode, materialName, alarmStatus);
+ //对list分页处理
+ return Result.OK(pageList);
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "inventory_age_alarm-通过id查询")
- @ApiOperation(value="inventory_age_alarm-通过id查询", notes="inventory_age_alarm-通过id查询")
- @GetMapping(value = "/queryById")
- public Result<InventoryAgeAlarm> queryById(@RequestParam(name="id",required=true) String id) {
- InventoryAgeAlarm inventoryageAlarm = iInventoryAgeAlarmService.getById(id);
- if(inventoryageAlarm ==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(inventoryageAlarm);
- }
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "inventory_age_alarm-通过id查询")
+ @ApiOperation(value = "inventory_age_alarm-通过id查询", notes = "inventory_age_alarm-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<InventoryAgeAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
+ InventoryAgeAlarm inventoryageAlarm = iInventoryAgeAlarmService.getById(id);
+ if (inventoryageAlarm == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(inventoryageAlarm);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param inventoryAgeAlarm
- */
+ * 导出excel
+ *
+ * @param request
+ * @param inventoryAgeAlarm
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, InventoryAgeAlarm inventoryAgeAlarm) {
return super.exportXls(request, inventoryAgeAlarm, InventoryAgeAlarm.class, "inventory_level_alarm");
}
-
-
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
index a97f1ea..cc09fb3 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -385,7 +385,7 @@ public class InventoryDetailController extends JeecgController<InventoryDetail,
* @param inventoryDetail
* @return
*/
- @AutoLog(value = "库存详情-新增库存数量")
+ @AutoLog(value = "库存详情-新增库存数量", operateType = 3)
@ApiOperation(value = "库存详情-新增库存数量", notes = "库存详情-新增库存数量")
@RequestMapping(value = "/increaseInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
public Result increaseInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
@@ -400,7 +400,7 @@ public class InventoryDetailController extends JeecgController<InventoryDetail,
* @param inventoryDetail
* @return
*/
- @AutoLog(value = "库存详情-扣减库存数量")
+ @AutoLog(value = "库存详情-扣减库存数量", operateType = 3)
@ApiOperation(value = "库存详情-扣减库存数量", notes = "库存详情-扣减库存数量")
@RequestMapping(value = "/reduceInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
public Result reduceInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
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 4194733..83ab271 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
@@ -376,10 +376,9 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
/*--------------------------------子表处理-库存详情-end----------------------------------------------*/
- @AutoLog("库存详情-释放受控")
+ @AutoLog(value = "库存详情-释放受控", operateType = 3)
@ApiOperation(value = "释放受控", notes = "释放受控")
@PostMapping(value = "/releaseController")
- @ResponseBody
public Result releaseController(@RequestBody List<Integer> ids, HttpServletRequest req) {
if (StringUtils.isEmpty(ids)) {
throw new JeecgBootException("库存明细id为空");
@@ -387,10 +386,9 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
return inventoryDetailService.releaseController(ids);
}
- @AutoLog("库存详情-批量受控")
+ @AutoLog(value = "库存详情-批量受控", operateType = 3)
@ApiOperation(value = "批量受控", notes = "批量受控")
@PostMapping("/controller")
- @ResponseBody
public Result controller(@RequestBody List<Integer> ids) {
if (StringUtils.isEmpty(ids)) {
return Result.error("库存明细id为空");
@@ -398,11 +396,10 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
return inventoryDetailService.controller(ids);
}
- @AutoLog("库存头-批量出整托库存")
+ @AutoLog(value = "库存头-批量出整托库存", operateType = 4)
@ApiOperation(value = "批量出整托库存", notes = "批量出整托库存")
@ApiLogger(apiName = "批量出整托库存")
@PostMapping("/shipmentInventoryHeader")
- @ResponseBody
public Result shipmentInventoryHeader(@RequestBody List<InventoryHeader> inventoryHeaderList, HttpServletRequest req) {
if (StringUtils.isEmpty(inventoryHeaderList)) {
return Result.error("库存头为空");
@@ -411,11 +408,10 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
return inventoryHeaderService.shipmentInventoryHeader(inventoryHeaderList, warehouseCode);
}
- @AutoLog("库存头-批量出库存详情")
+ @AutoLog(value = "库存头-批量出库存详情", operateType = 4)
@ApiOperation(value = "批量出库存详情", notes = "批量出库存详情")
@ApiLogger(apiName = "批量出库存详情")
@PostMapping("/shipmentInventoryDetail")
- @ResponseBody
public Result shipmentInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
if (StringUtils.isEmpty(inventoryDetailList)) {
return Result.error("库存明细为空");
@@ -424,10 +420,9 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
return inventoryHeaderService.shipmentInventoryDetail(inventoryDetailList, warehouseCode);
}
- @AutoLog("批量出库存详情")
+ @AutoLog(value = "批量出库存详情", operateType = 4)
@ApiOperation(value = "批量出库存详情", notes = "批量出库存详情")
@PostMapping("/decuceInventoryDetail")
- @ResponseBody
public Result decuceInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
if (StringUtils.isEmpty(inventoryDetailList)) {
return Result.error("库存明细为空");
@@ -436,10 +431,9 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader,
return inventoryHeaderService.decuceInventoryDetail(inventoryDetailList, warehouseCode);
}
- @AutoLog("按照库存详情质检")
+ @AutoLog(value = "按照库存详情质检", operateType = 3)
@ApiOperation(value = "按照库存详情质检", notes = "按照库存详情质检")
@PostMapping("/qualityInventoryDetail")
- @ResponseBody
public Result qualityInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
if (StringUtils.isEmpty(inventoryDetailList)) {
return Result.error("库存明细为空");
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/controller/InventoryLevelAlarmController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/controller/InventoryLevelAlarmController.java
index f0c5fb5..de2fec0 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/controller/InventoryLevelAlarmController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/controller/InventoryLevelAlarmController.java
@@ -1,7 +1,5 @@
package org.jeecg.modules.wms.inventory.inventoryLevel.controller;
-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;
@@ -9,89 +7,78 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.modules.oss.entity.OSSFile;
-import org.jeecg.modules.wms.config.materialWarning.entity.MaterialWarning;
-import org.jeecg.modules.wms.config.materialWarning.service.IMaterialWarningService;
import org.jeecg.modules.wms.inventory.inventoryLevel.entity.InventoryLevelAlarm;
import org.jeecg.modules.wms.inventory.inventoryLevel.service.IInventoryLevelAlarmService;
-import org.jeecg.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.stream.Collectors;
/**
* @Description: inventory_level_alarm
* @Author: jeecg-boot
- * @Date: 2023-10-30
+ * @Date: 2023-10-30
* @Version: V1.0
*/
-@Api(tags="inventory_level_alarm")
+@Api(tags = "inventory_level_alarm")
@RestController
@RequestMapping("/inventory/inventoryLevel")
@Slf4j
public class InventoryLevelAlarmController extends JeecgController<InventoryLevelAlarm, IInventoryLevelAlarmService> {
- @Autowired
- private IInventoryLevelAlarmService iInventoryLevelAlarmService;
- @Autowired
- private IMaterialWarningService iMaterialWarningService;
-
- /**
- * 分页列表查询
- *
- * @param inventoryLevelAlarm
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "inventory_level_alarm-分页列表查询")
- @ApiOperation(value="inventory_level_alarm-分页列表查询", notes="inventory_level_alarm-分页列表查询")
- @GetMapping(value = "/list")
- public Result<IPage<InventoryLevelAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
-
- Page<InventoryLevelAlarm> page = new Page<>(pageNo, pageSize);
- IPage<InventoryLevelAlarm> pageList = iInventoryLevelAlarmService.queryLevelAlarm(page, materialCode, materialName, alarmStatus);
- //对list分页处理
- return Result.OK(pageList);
- }
+ @Autowired
+ private IInventoryLevelAlarmService iInventoryLevelAlarmService;
+ /**
+ * 分页列表查询
+ *
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "inventory_level_alarm-分页列表查询")
+ @ApiOperation(value = "inventory_level_alarm-分页列表查询", notes = "inventory_level_alarm-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<InventoryLevelAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<InventoryLevelAlarm> page = new Page<>(pageNo, pageSize);
+ IPage<InventoryLevelAlarm> pageList = iInventoryLevelAlarmService.queryLevelAlarm(page, materialCode, materialName, alarmStatus);
+ //对list分页处理
+ return Result.OK(pageList);
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "inventory_level_alarm-通过id查询")
- @ApiOperation(value="inventory_level_alarm-通过id查询", notes="inventory_level_alarm-通过id查询")
- @GetMapping(value = "/queryById")
- public Result<InventoryLevelAlarm> queryById(@RequestParam(name="id",required=true) String id) {
- InventoryLevelAlarm inventoryLevelAlarm = iInventoryLevelAlarmService.getById(id);
- if(inventoryLevelAlarm ==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(inventoryLevelAlarm);
- }
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "inventory_level_alarm-通过id查询")
+ @ApiOperation(value = "inventory_level_alarm-通过id查询", notes = "inventory_level_alarm-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<InventoryLevelAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
+ InventoryLevelAlarm inventoryLevelAlarm = iInventoryLevelAlarmService.getById(id);
+ if (inventoryLevelAlarm == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(inventoryLevelAlarm);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param inventoryLevelAlarm
- */
+ * 导出excel
+ *
+ * @param request
+ * @param inventoryLevelAlarm
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, InventoryLevelAlarm inventoryLevelAlarm) {
return super.exportXls(request, inventoryLevelAlarm, InventoryLevelAlarm.class, "inventory_level_alarm");
}
-
-
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/qualityHeader/controller/QualityHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/qualityHeader/controller/QualityHeaderController.java
index 4aaedff..5ebac04 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/qualityHeader/controller/QualityHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/qualityHeader/controller/QualityHeaderController.java
@@ -310,7 +310,7 @@ public class QualityHeaderController extends JeecgController<QualityHeader, IQua
* @param qualityDetail
* @return
*/
- @AutoLog(value = "质检单详情-质检")
+ @AutoLog(value = "质检单详情-质检", operateType = 3)
@ApiOperation(value = "质检单详情-质检", notes = "质检单详情-质检")
@RequestMapping(value = "/qualityTesting", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> qualityTesting(@RequestBody QualityDetail qualityDetail) {
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 b13bd1f..f6fa7cd 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
@@ -342,9 +342,9 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
* 创建任务
* @return
*/
+ @AutoLog(value = "入库组盘-创建任务", operateType = 2)
@ApiOperation(value = "入库组盘-创建任务", notes = "入库组盘-创建任务")
@PostMapping("/createReceiptTask")
- @ResponseBody
public Result createReceiptTask(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
Result result = huahengMultiHandlerService.createReceiptTask(receiptContainerHeader, warehouseCode);
@@ -355,9 +355,9 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
* 创建任务
* @return
*/
+ @AutoLog(value = "入库组盘-创建任务", operateType = 2)
@ApiOperation(value = "入库组盘-创建任务", notes = "入库组盘-创建任务")
@PostMapping("/createReceiptBatchTask")
- @ResponseBody
public Result createReceiptBatchTask(@RequestBody List<ReceiptContainerHeader> receiptContainerHeaderList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
if (CollectionUtils.isEmpty(receiptContainerHeaderList)) {
@@ -402,7 +402,6 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
*/
@ApiOperation(value = "出库配盘-选择分拣口", notes = "出库配盘-选择分拣口")
@PostMapping("/selectSupplePort")
- @ResponseBody
public Result selectSupplePort(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String fromLocationCode = receiptContainerHeader.getFromLocationCode();
@@ -439,7 +438,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
* 指定库位
* @return
*/
- @AutoLog(value = "入库组盘-指定库位")
+ @AutoLog(value = "入库组盘-指定库位", operateType = 3)
@ApiOperation(value = "入库组盘-指定库位", notes = "入库组盘-指定库位")
@RequestMapping(value = "/allocation", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> allocation(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
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 5ca132e..ee5b13b 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
@@ -406,7 +406,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
* @param receiptHeader
* @return
*/
- @AutoLog(value = "回传入库单")
+ @AutoLog(value = "回传入库单", operateType = 3)
@ApiOperation(value = "回传入库单", notes = "回传入库单")
@RequiresPermissions("receiptHeader:back")
@RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT, RequestMethod.POST})
@@ -414,10 +414,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
return huahengMultiHandlerService.backReceipt(receiptHeader);
}
- @AutoLog(value = "PDA入库-快速入库")
+ @AutoLog(value = "PDA入库-快速入库", operateType = 2)
@ApiOperation(value = "PDA入库-快速入库", notes = "快速入库")
@PostMapping("/quickReceipt")
- @ResponseBody
@ApiLogger(apiName = "PDA入库-快速入库", from = "PDA")
public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -426,10 +425,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
return result;
}
- @AutoLog(value = "PDA入库-呼叫料盒")
+ @AutoLog(value = "PDA入库-呼叫料盒", operateType = 2)
@ApiOperation(value = "PDA入库-呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
@PostMapping("/callbox")
- @ResponseBody
@ApiLogger(apiName = "PDA入库-呼叫料盒", from = "PDA")
public Result<?> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -439,10 +437,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
return result;
}
- @AutoLog(value = "PDA入库-批量呼叫料盒")
+ @AutoLog(value = "PDA入库-批量呼叫料盒", operateType = 2)
@ApiOperation(value = "PDA入库-批量呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
@PostMapping("/batchCallBox")
- @ResponseBody
@ApiLogger(apiName = "PDA入库-批量呼叫料盒", from = "PDA")
public Result<?> batchCallBox(@RequestBody List<CallBoxBean> callBoxBeanList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -455,10 +452,9 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
return result;
}
- @AutoLog(value = "越库")
+ @AutoLog(value = "越库", operateType = 3)
@ApiOperation(value = "越库", notes = "越库")
@PostMapping("/crossDocking")
- @ResponseBody
@ApiLogger(apiName = "越库", from = "WMS")
public Result<?> crossDocking(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
return receiptHeaderService.crossDocking(id);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
index 802b987..6dcfec0 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
@@ -335,7 +335,6 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
*/
@ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
@PostMapping("/listReceiveByReceiveId")
- @ResponseBody
public Result listReceiveByReceiveId(@RequestBody ReceiveDetail receiveDetailDomain) {
List<Receive> receiveList = new ArrayList<>();
QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetailDomain, null);
@@ -366,13 +365,11 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
*
* @return
*/
- @AutoLog("收货单-收货")
+ @AutoLog(value = "收货单-收货", operateType = 2)
@ApiOperation(value = "收货单-收货", notes = "收货单-收货")
@PostMapping("/receive")
- @ResponseBody
public Result receive(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- String lockKey = warehouseCode;
Result result = receiveDetailService.receive(receiveList, warehouseCode);
return result;
}
@@ -382,13 +379,11 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
*
* @return
*/
- @AutoLog("收货单-全部收货")
+ @AutoLog(value = "收货单-全部收货", operateType = 2)
@ApiOperation(value = "收货单-全部收货", notes = "收货单-全部收货")
@PostMapping("/receiveHeader")
- @ResponseBody
public Result receiveHeader(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- String lockKey = warehouseCode;
Result result = receiveDetailService.receiveHeader(id, warehouseCode);
return result;
}
@@ -398,13 +393,11 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
*
* @return
*/
- @AutoLog("收货单-收货详情质检")
+ @AutoLog(value = "收货单-收货详情质检", operateType = 3)
@ApiOperation(value = "收货单-收货详情质检", notes = "收货单-收货详情质检")
@PostMapping("/receiveDetailToQuality")
- @ResponseBody
public Result receiveDetailToQuality(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- String lockKey = warehouseCode;
Result result = receiveDetailService.receiveToQuality(id, warehouseCode);
return result;
}
@@ -414,10 +407,9 @@ public class ReceiveHeaderController extends JeecgController<ReceiveHeader, IRec
*
* @return
*/
- @AutoLog("收货单-全部质检")
+ @AutoLog(value = "收货单-全部质检", operateType = 3)
@ApiOperation(value = "收货单-全部质检", notes = "收货单-全部质检")
@PostMapping("/receiveHeaderToQuality")
- @ResponseBody
public Result receiveHeaderToQuality(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
Result result = receiveHeaderService.receiveHeaderToQuality(id, warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
index 9f2335a..02ce337 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
@@ -45,10 +45,6 @@ public class ReceiveController extends HuahengBaseController {
@Resource
private IContainerService containerService;
@Resource
- private ILocationService locationService;
- @Resource
- private IInventoryHeaderService inventoryHeaderService;
- @Resource
private IHuahengMultiHandlerService huahengMultiHandlerService;
/**
@@ -58,7 +54,6 @@ public class ReceiveController extends HuahengBaseController {
*/
@ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
@PostMapping("/listReceiveByReceiptId")
- @ResponseBody
public Result listReceiveByReceiptId(@RequestBody ReceiptDetail receiptDetailDomain) {
List<Receive> receiveList = new ArrayList<>();
QueryWrapper<ReceiptDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetailDomain, null);
@@ -89,10 +84,9 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-组盘")
+ @AutoLog(value = "入库单-组盘", operateType = 2)
@ApiOperation(value = "入库单-组盘", notes = "入库单-组盘")
@PostMapping("/receiving")
- @ResponseBody
public Result receiving(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -111,10 +105,9 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-生成任务")
+ @AutoLog(value = "入库单-生成任务", operateType = 2)
@ApiOperation(value = "入库单-生成任务", notes = "入库单-生成任务")
@PostMapping("/receivingAndCreateTask")
- @ResponseBody
public Result receivingAndCreateTask(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -133,15 +126,12 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-平库组盘")
+ @AutoLog(value = "入库单-平库组盘", operateType = 2)
@ApiOperation(value = "入库单-平库组盘", notes = "入库单-平库组盘")
@PostMapping("/flatReceive")
- @ResponseBody
public Result flatReceive(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
- Receive receive = receiveList.get(0);
- String containerCode = receive.getContainerCode();
Result result = handleMultiProcess("flatReceive", lockKey, new MultiProcessListener() {
@Override
public Result<?> doProcess() {
@@ -157,10 +147,9 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-平库上架")
+ @AutoLog(value = "入库单-平库上架", operateType = 2)
@ApiOperation(value = "入库单-平库上架", notes = "入库单-平库上架")
@PostMapping("/flatOnShell")
- @ResponseBody
public Result flatOnShell(@RequestBody OnShell onShell, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -185,10 +174,9 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-平库入库")
+ @AutoLog(value = "入库单-平库入库", operateType = 2)
@ApiOperation(value = "入库单-平库入库", notes = "入库单-平库入库")
@PostMapping("/flatReceipt")
- @ResponseBody
public Result flatReceipt(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -221,10 +209,9 @@ public class ReceiveController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("入库单-AGV入库")
+ @AutoLog(value = "入库单-AGV入库", operateType = 2)
@ApiOperation(value = "入库单-AGV入库", notes = "入库单-AGV入库")
@PostMapping("/agvReceipt")
- @ResponseBody
public Result agvReceipt(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -238,7 +225,7 @@ public class ReceiveController extends HuahengBaseController {
return result;
}
- @AutoLog(value = "平库快速入库", operateType = 1)
+ @AutoLog(value = "平库快速入库", operateType = 2)
@ApiOperation(value = "平库快速入库", notes = "平库快速入库")
@PostMapping("/flatQuickReceipt")
public Result<?> flatQuickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
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 227477b..51db295 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
@@ -76,7 +76,6 @@ public class ShipmentCombinationController extends HuahengBaseController {
* @return
*/
@GetMapping("/getShipmentDetailListByShipmentCode")
- @ResponseBody
public Result getShipmentDetailListByShipmentCode(String shipmentCode, HttpServletRequest req) {
if (StringUtils.isEmpty(shipmentCode)) {
return Result.error("没有找到出库单号");
@@ -93,10 +92,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("出库单-自动配盘")
+ @AutoLog(value = "出库单-自动配盘", operateType = 4)
@ApiOperation(value = "出库单-自动配盘", notes = "出库单-自动配盘")
@PostMapping("/autoCombination")
- @ResponseBody
public Result autoCombination(@RequestBody ShipmentHeader shipmentHeader) {
String shipmentCode = shipmentHeader.getCode();
String warehouseCode = shipmentHeader.getWarehouseCode();
@@ -108,10 +106,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @AutoLog("出库单-配盘")
+ @AutoLog(value = "出库单-配盘", operateType = 4)
@ApiOperation(value = "出库单-配盘", notes = "出库单-配盘")
@PostMapping("/combination")
- @ResponseBody
public Result combination(@RequestBody CombinationParam combinationParam) {
return huahengMultiHandlerService.combination(combinationParam);
}
@@ -121,9 +118,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "出库组盘-创建出库任务", operateType = 2)
@ApiOperation(value = "出库组盘-创建出库任务", notes = "出库组盘-创建出库任务")
@PostMapping("/createShipmentTask")
- @ResponseBody
public Result createShipmentTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
Result result = huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, 0, 0, 0);
@@ -135,9 +132,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "出库组盘-批量创建出库任务", operateType = 2)
@ApiOperation(value = "出库组盘-批量创建出库任务", notes = "出库组盘-批量创建出库任务")
@PostMapping("/createShipmentBatchTask")
- @ResponseBody
public Result createShipmentBatchTask(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
if (CollectionUtils.isEmpty(shipmentContainerHeaderList)) {
@@ -188,7 +185,6 @@ public class ShipmentCombinationController extends HuahengBaseController {
*/
@ApiOperation(value = "出库组盘-选择分拣口", notes = "出库组盘-选择分拣口")
@PostMapping("/selectSortingPort")
- @ResponseBody
public Result selectSortingPort(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String fromLocationCode = shipmentContainerHeader.getFromLocationCode();
@@ -214,18 +210,13 @@ public class ShipmentCombinationController extends HuahengBaseController {
type = QuantityConstant.PORT_TYPE_OUT;
}
List<Port> portList = portService.getPortListByType(type, roadWay, zoneCode, warehouseCode);
- if (portList.size() == 0) {
+ if (portList.isEmpty()) {
return Result.error("选择分拣口时, 没有找到合适的分拣口");
}
return Result.OK(portList);
}
- /**
- * 匹配库存
- *
- * @return
- */
- @AutoLog(value = "出库组盘-选取库存")
+
@ApiOperation(value = "出库组盘-选取库存", notes = "出库组盘-选取库存")
@GetMapping("/getInventoryFromShipmentDetail")
public Result getInventoryFromShipmentDetail(ShipmentDetail shipmentDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -234,15 +225,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
return shipmentCombinationService.getInventoryFromShipmentDetail(id);
}
- /**
- * 通过详情ID查询
- *
- * @return
- */
- @AutoLog("出库单详情-通过详情ID查询")
+
@ApiOperation(value = "出库单详情-通过详情ID查询", notes = "出库单详情-通过详情ID查询")
@PostMapping("/listShipmentByShipmentDetailId")
- @ResponseBody
public Result listShipmentByShipmentDetailId(@RequestBody ShipmentDetail shipmentDetail) {
shipmentDetail = shipmentDetailService.getById(shipmentDetail.getId());
Shipment shipment = new Shipment();
@@ -266,8 +251,8 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @AutoLog(value = "平库出库,通过托盘")
- @ApiOperation(value = "平库出库,通过托盘", notes = "平库出库,通过托盘")
+ @AutoLog(value = "平库出库，通过托盘", operateType = 4)
+ @ApiOperation(value = "平库出库，通过托盘", notes = "平库出库，通过托盘")
@PostMapping("/flatShipmentByContainerCode")
public Result flatShipmentByContainerCode(@RequestBody List<FlatShipment> flatShipmentList, HttpServletRequest req) {
FlatShipment flatShipment = flatShipmentList.get(0);
@@ -281,7 +266,7 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @AutoLog(value = "平库出库，通过库位")
+ @AutoLog(value = "平库出库，通过库位", operateType = 4)
@ApiOperation(value = "平库出库，通过库位", notes = "平库出库，通过库位")
@PostMapping("/flatShipmentByLocationCode")
public Result flatShipmentByLocationCode(@RequestBody List<FlatShipment> flatShipmentList, HttpServletRequest req) {
@@ -296,9 +281,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "平库出库", operateType = 4)
@ApiOperation(value = "平库出库", notes = "平库出库")
@PostMapping("/completeFlatShipment")
- @ResponseBody
public Result completeFlatShipment(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -318,9 +303,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @ApiOperation(value = "创建出库任务, 出库任务完成以后，AGV去接", notes = "创建出库任务, 出库任务完成以后，AGV去接")
+ @AutoLog(value = "创建出库任务，出库任务完成以后，AGV去接", operateType = 2)
+ @ApiOperation(value = "创建出库任务，出库任务完成以后，AGV去接", notes = "创建出库任务，出库任务完成以后，AGV去接")
@PostMapping("/createShipmentTaskByAgv")
- @ResponseBody
public Result createShipmentTaskByAgv(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
Result result = shipmentCombinationService.createShipmentTaskByAgv(shipmentContainerHeader, warehouseCode);
@@ -333,9 +318,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
- @ApiOperation(value = "创建出库任务, 出库任务完成以后，AGV去接", notes = "创建出库任务, 出库任务完成以后，AGV去接")
+ @AutoLog(value = "创建出库任务，出库任务完成以后，AGV去接", operateType = 2)
+ @ApiOperation(value = "创建出库任务，出库任务完成以后，AGV去接", notes = "创建出库任务，出库任务完成以后，AGV去接")
@PostMapping("/createBatchShipmentTaskByAgv")
- @ResponseBody
public Result createBatchShipmentTaskByAgv(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
@@ -353,9 +338,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "同时创建出库任务和AGV任务", operateType = 2)
@ApiOperation(value = "同时创建出库任务和AGV任务", notes = "同时创建出库任务和AGV任务")
@PostMapping("/createShipmentTaskAndAgvTask")
- @ResponseBody
public Result createShipmentTaskAndAgvTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -375,9 +360,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "根据序列号扣减预配盘的库存", operateType = 4)
@ApiOperation(value = "根据序列号扣减预配盘的库存", notes = "根据序列号扣减预配盘的库存")
@PostMapping("/reduceInventoryDetailBySn")
- @ResponseBody
public Result reduceInventoryDetailBySn(@RequestParam(name = "snList", required = true) String snList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
@@ -396,9 +381,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
*
* @return
*/
+ @AutoLog(value = "出库复核", operateType = 3)
@ApiOperation(value = "出库复核", notes = "出库复核")
@PostMapping("/shipmentCheck")
- @ResponseBody
public Result shipmentCheck(@RequestBody List<ShipmentContainerAdvice> shipmentContainerAdviceList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String lockKey = warehouseCode;
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 13e06d2..212468b 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
@@ -115,7 +115,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return shipmentHeaderService.saveShipmentHeader(shipmentHeader);
}
- @AutoLog(value = "出库单-单据合并")
+ @AutoLog(value = "出库单-单据合并", operateType = 3)
@ApiOperation(value = "出库单-单据合并", notes = "出库单-单据合并")
@PostMapping(value = "/mergeShipment")
@RequiresPermissions("shipmentHeader:mergeShipment")
@@ -411,7 +411,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
* @param shipmentHeader
* @return
*/
- @AutoLog(value = "回传出库单")
+ @AutoLog(value = "回传出库单", operateType = 3)
@ApiOperation(value = "回传出库单", notes = "回传出库单")
@RequiresPermissions("shipmentHeader:back")
@RequestMapping(value = "/backErpShipment", method = {RequestMethod.PUT, RequestMethod.POST})
@@ -419,10 +419,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return huahengMultiHandlerService.backShipment(shipmentHeader);
}
- @AutoLog(value = "PDA出库-呼叫料盒")
+ @AutoLog(value = "PDA出库-呼叫料盒", operateType = 4)
@ApiOperation(value = "PDA出库-呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
@PostMapping("/callbox")
- @ResponseBody
@ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -432,10 +431,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return result;
}
- @AutoLog(value = "PDA出库-批量呼叫料盒")
+ @AutoLog(value = "PDA出库-批量呼叫料盒",operateType = 4)
@ApiOperation(value = "PDA出库-批量呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
@PostMapping("/batchCallBox")
- @ResponseBody
@ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
public Result<TaskHeader> batchCallBox(@RequestBody List<CallBoxBean> callBoxBeanList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -448,10 +446,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return result;
}
- @AutoLog(value = "快速出库")
+ @AutoLog(value = "快速出库",operateType = 4)
@ApiOperation(value = "快速出库", notes = "快速出库")
@PostMapping("/autoShipment")
- @ResponseBody
public Result<TaskHeader> autoShipment(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String shipmentCode = shipmentHeader.getCode();
@@ -459,10 +456,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return result;
}
- @AutoLog(value = "自动预配盘出库")
+ @AutoLog(value = "自动预配盘出库",operateType = 4)
@ApiOperation(value = "自动预配盘出库", notes = "自动预配盘出库")
@PostMapping("/autoShipmentAdvice")
- @ResponseBody
public Result<TaskHeader> autoShipmentAdvice(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String shipmentCode = shipmentHeader.getCode();
@@ -470,10 +466,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return result;
}
- @AutoLog(value = "平库路径指引")
+ @AutoLog(value = "平库路径指引", operateType = 4)
@ApiOperation(value = "平库路径指引", notes = "平库路径指引")
@PostMapping("/autoFlatShipmentAdvice")
- @ResponseBody
public Result<TaskHeader> autoFlatShipmentAdvice(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String shipmentCode = shipmentHeader.getCode();
@@ -481,10 +476,9 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
return result;
}
- @AutoLog(value = "备货")
+ @AutoLog(value = "备货",operateType = 4)
@ApiOperation(value = "备货", notes = "备货")
@PostMapping("/stockUp")
- @ResponseBody
public Result stockUp(@RequestBody List<ShipmentHeader> shipmentHeaderList, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
Result result = huahengMultiHandlerService.stockUp(shipmentHeaderList, warehouseCode);
@@ -498,7 +492,6 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
*/
@ApiOperation(value = "获取出库单物料库存信息", notes = "获取出库单物料库存信息")
@PostMapping(value = "/getInventoryByShipmentDetail")
- @ResponseBody
public Result<?> getInventoryByShipmentDetail(@RequestBody ShipmentInventory shipmentInventory, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentInventory.getShipmentId());
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 77155d1..ab2c3e4 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
@@ -189,7 +189,7 @@ public class CycleCountDetailController extends HuahengBaseController {
/**
* 生成单条盘点任务
*/
- @AutoLog(value = "生成单条盘点任务")
+ @AutoLog(value = "生成单条盘点任务", operateType = 2)
@ApiOperation(value = "生成单条盘点任务", notes = "生成单条盘点任务")
@PostMapping(value = "/createCycleCoutTaskByDetailId")
public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId, @RequestParam(name = "toPort") String toPort,
@@ -207,7 +207,6 @@ public class CycleCountDetailController extends HuahengBaseController {
*/
@ApiOperation(value = "盘点-选择分拣口", notes = "盘点-选择分拣口")
@PostMapping("/inventoryPort")
- @ResponseBody
public Result inventoryPort(@RequestBody CycleCountDetail cycleCountDetail, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String fromLocationCode = cycleCountDetail.getLocationCode();
@@ -238,7 +237,7 @@ public class CycleCountDetailController extends HuahengBaseController {
/**
* 添加盘点
*/
- @AutoLog(value = "盘点明细新增")
+ @AutoLog(value = "盘点明细新增", operateType = 2)
@ApiOperation(value = "盘点明细新增-根据选取的库存新增", notes = "盘点明细新增-根据选取的库存新增")
@PostMapping(value = "/createCycleCountDetailByInventory")
public Result<?> createCycleCountDetailByInventory(@RequestBody CycleCountDetailByInventoryDto cycleCountDetailByInventoryDto) {
@@ -268,8 +267,9 @@ public class CycleCountDetailController extends HuahengBaseController {
* 实盘登记
* @return
*/
+ @AutoLog(value = "实盘登记", operateType = 3)
+ @ApiOperation(value = "实盘登记", notes = "盘点明细新增-实盘登记")
@PostMapping("/confirmGapQty")
- @ResponseBody
public Result confirmGapQty(@RequestBody Map<String, String> map) {
String id = map.get("id");
String countedQty = map.get("countedQty");
@@ -281,8 +281,9 @@ public class CycleCountDetailController extends HuahengBaseController {
* 实盘登记
* @return
*/
+ @AutoLog(value = "实盘登记", operateType = 3)
+ @ApiOperation(value = "实盘登记", notes = "盘点明细新增-实盘登记")
@PostMapping("/batchConfirmGapQty")
- @ResponseBody
public Result batchConfirmGapQty(@RequestBody List<CycleCountDetailChild> cycleCountDetailChildList) {
if (CollectionUtils.isEmpty(cycleCountDetailChildList)) {
return Result.error("批量实盘登记失败参数为空");
@@ -327,7 +328,6 @@ public class CycleCountDetailController extends HuahengBaseController {
}
@PostMapping("/listCycleDetailChildByDetailId")
- @ResponseBody
public Result listCycleDetailChildByDetailId(@RequestBody CycleCountDetail cycleCountDetail) {
LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, cycleCountDetail.getId());
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 e89fced..0a632f0 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
@@ -153,7 +153,7 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService>
/**
* 执行任务
*/
- @AutoLog(value = "AGV任务-执行任务")
+ @AutoLog(value = "AGV任务-执行任务", operateType = 3)
@ApiOperation(value = "AGV任务-执行任务", notes = "AGV任务-执行任务")
@PostMapping("/execute")
@RequiresPermissions("agvTask:executeTask")
@@ -165,7 +165,7 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService>
/**
* 完成任务
*/
- @AutoLog(value = "AGV任务-完成任务")
+ @AutoLog(value = "AGV任务-完成任务", operateType = 3)
@ApiOperation(value = "AGV任务-完成任务", notes = "AGV任务-完成任务")
@PostMapping("/complete")
@RequiresPermissions("agvTask:completeTask")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
index d7df604..2a4cc3a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -355,7 +355,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 完成任务
*/
- @AutoLog(value = "任务表-完成任务")
+ @AutoLog(value = "任务表-完成任务", operateType = 3)
@ApiOperation(value = "任务表-完成任务", notes = "任务表-完成任务")
@PostMapping("/completeTaskByWMS")
@RequiresPermissions("taskHeader:completeTask")
@@ -376,10 +376,9 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 取消任务
*/
- @AutoLog(value = "任务表-取消任务")
+ @AutoLog(value = "任务表-取消任务", operateType = 1)
@ApiOperation(value = "任务表-取消任务", notes = "任务表-取消任务")
@PostMapping("/cancelTask")
- @ResponseBody
@RequiresPermissions("taskHeader:cancelTask")
public Result cancelTask(@RequestParam(name = "ids", required = true) String ids) {
if (StringUtils.isEmpty(ids)) {
@@ -408,10 +407,9 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 任务切换
*/
- @AutoLog(value = "任务表-任务切换")
+ @AutoLog(value = "任务表-任务切换", operateType = 3)
@ApiOperation(value = "任务表-任务切换", notes = "任务表-任务切换")
@PostMapping("/switchTask")
- @ResponseBody
@RequiresPermissions("taskHeader:switchTask")
public Result switchTask(@RequestParam(name = "ids", required = true) String ids) {
if (StringUtils.isEmpty(ids)) {
@@ -433,7 +431,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 执行任务
*/
- @AutoLog(value = "任务表-执行任务")
+ @AutoLog(value = "任务表-执行任务", operateType = 3)
@ApiOperation(value = "任务表-执行任务", notes = "任务表-执行任务")
@PostMapping("/execute")
@RequiresPermissions("taskHeader:executeTask")
@@ -448,7 +446,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建空托入库任务
*/
- @AutoLog(value = "任务表-创建空托入库任务")
+ @AutoLog(value = "任务表-创建空托入库任务", operateType = 2)
@ApiOperation(value = "任务表-创建空托入库任务", notes = "任务表-创建空托入库任务")
@PostMapping("/createEmptyIn")
@RequiresPermissions("taskHeader:emptyIn")
@@ -470,7 +468,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建空托出库任务
*/
- @AutoLog(value = "任务表-创建空托出库任务")
+ @AutoLog(value = "任务表-创建空托出库任务", operateType = 2)
@ApiOperation(value = "任务表-创建空托出库任务", notes = "任务表-创建空托出库任务")
@RequiresPermissions("taskHeader:emptyOut")
@PostMapping("/createEmptyOut")
@@ -491,7 +489,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建空托出库任务
*/
- @AutoLog(value = "任务表-创建空托出库任务")
+ @AutoLog(value = "任务表-创建空托出库任务", operateType = 1)
@ApiOperation(value = "任务表-创建空托出库任务", notes = "任务表-创建空托出库任务")
@RequiresPermissions("taskHeader:emptyOut")
@PostMapping("/batchCreateEmptyOut")
@@ -513,7 +511,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建移库任务
*/
- @AutoLog(value = "任务表-创建移库任务")
+ @AutoLog(value = "任务表-创建移库任务",operateType = 2)
@ApiOperation(value = "任务表-创建移库任务", notes = "任务表-创建移库任务")
@RequiresPermissions("taskHeader:transfer")
@PostMapping("/createTransferTask")
@@ -534,7 +532,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建出库查看任务
*/
- @AutoLog(value = "任务表-创建出库查看任务")
+ @AutoLog(value = "任务表-创建出库查看任务", operateType = 2)
@ApiOperation(value = "任务表-创建出库查看任务", notes = "任务表-创建出库查看任务")
@PostMapping("/batchCreateCheckOut")
@RequiresPermissions("taskHeader:checkOut")
@@ -558,7 +556,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建出库查看任务
*/
- @AutoLog(value = "任务表-创建出库查看任务")
+ @AutoLog(value = "任务表-创建出库查看任务", operateType = 1)
@ApiOperation(value = "任务表-创建出库查看任务", notes = "任务表-创建出库查看任务")
@PostMapping("/createCheckOutTask")
@RequiresPermissions("taskHeader:checkOut")
@@ -579,7 +577,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建跨站任务
*/
- @AutoLog(value = "任务表-创建跨站任务")
+ @AutoLog(value = "任务表-创建跨站任务", operateType = 1)
@ApiOperation(value = "任务表-创建跨站任务", notes = "任务表-创建跨站任务")
@RequiresPermissions("taskHeader:overStation")
@PostMapping("/createOverStationTask")
@@ -601,7 +599,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建空托盘组入库
*/
- @AutoLog(value = "任务表-创建空托盘组入库")
+ @AutoLog(value = "任务表-创建空托盘组入库", operateType = 1)
@ApiOperation(value = "任务表-创建空托盘组入库", notes = "任务表-创建空托盘组入库")
@PostMapping("/createManyEmptyIn")
@RequiresPermissions("taskHeader:manyEmptyIn")
@@ -622,7 +620,7 @@ public class TaskHeaderController extends HuahengBaseController {
/**
* 创建空托盘组出库
*/
- @AutoLog(value = "任务表-创建空托盘组出库")
+ @AutoLog(value = "任务表-创建空托盘组出库", operateType = 1)
@ApiOperation(value = "任务表-创建空托盘组出库", notes = "任务表-创建空托盘组出库")
@RequiresPermissions("taskHeader:manyEmptyOut")
@PostMapping("/createManyEmptyOut")
@@ -646,7 +644,6 @@ public class TaskHeaderController extends HuahengBaseController {
*/
@ApiOperation(value = "任务表-选择整出口", notes = "任务表-选择整出口")
@PostMapping("/selectOutPort")
- @ResponseBody
public Result selectOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String containerCode = taskHeader.getContainerCode();
@@ -688,7 +685,6 @@ public class TaskHeaderController extends HuahengBaseController {
*/
@ApiOperation(value = "任务表-选择整出口", notes = "任务表-选择整出口")
@PostMapping("/selectEmptyOutPort")
- @ResponseBody
public Result selectEmptyOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
String zoneCode = taskHeader.getZoneCode();
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
@@ -713,7 +709,6 @@ public class TaskHeaderController extends HuahengBaseController {
*/
@ApiOperation(value = "任务表-选择空托盘组出库整出口", notes = "任务表-选择空托盘组出库整出口")
@PostMapping("/selectManyEmptyOutPort")
- @ResponseBody
public Result selectManyEmptyOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String containerCode = taskHeader.getContainerCode();
@@ -755,7 +750,6 @@ public class TaskHeaderController extends HuahengBaseController {
*/
@ApiOperation(value = "任务表-选择分拣口", notes = "任务表-选择分拣口")
@PostMapping("/selectPickPort")
- @ResponseBody
public Result selectPickPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String containerCode = taskHeader.getContainerCode();
@@ -797,7 +791,6 @@ public class TaskHeaderController extends HuahengBaseController {
*/
@ApiOperation(value = "任务表-选择站台", notes = "任务表-选择站台")
@PostMapping("/selectPort")
- @ResponseBody
public Result selectPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
String containerCode = taskHeader.getContainerCode();
@@ -821,10 +814,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 修复空出的数据
* @return
*/
- @AutoLog(value = "修复空出的数据")
+ @AutoLog(value = "修复空出的数据", operateType = 3)
@PostMapping("/handleEmptyOut")
@ApiOperation("修复空出的数据")
- @ResponseBody
@ApiLogger(apiName = "修复空出的数据", from = "WMS")
public Result handleEmptyOut(@RequestParam(name = "id", required = true) String id) {
Result result = handleMultiProcess("handleEmptyOut", new MultiProcessListener() {
@@ -841,10 +833,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 修复重入的数据
* @return
*/
- @AutoLog(value = "修复重入的数据")
+ @AutoLog(value = "修复重入的数据", operateType = 3)
@PostMapping("/handleDoubleIn")
@ApiOperation("修复重入的数据")
- @ResponseBody
@ApiLogger(apiName = "修复重入的数据", from = "WMS")
public Result handleDoubleIn(@RequestParam(name = "id", required = true) String id) {
Result result = handleMultiProcess("handleDoubleIn", new MultiProcessListener() {
@@ -861,10 +852,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 修复取货错的数据
* @return
*/
- @AutoLog(value = "修复取货错的数据")
+ @AutoLog(value = "修复取货错的数据", operateType = 3)
@PostMapping("handlePickupError")
@ApiOperation("修复取货错的数据")
- @ResponseBody
@ApiLogger(apiName = "修复取货错的数据", from = "WMS")
public Result handlePickupError(@RequestParam(name = "id", required = true) String id) {
Result result = handleMultiProcess("handlePickupError", new MultiProcessListener() {
@@ -881,10 +871,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 快速入库
* @return
*/
- @AutoLog(value = "快速入库")
+ @AutoLog(value = "快速入库", operateType = 2)
@PostMapping("quickReceipt")
@ApiOperation("快速入库")
- @ResponseBody
public Result quickReceipt(@RequestBody QucikReceiptEntity qucikReceiptEntity, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
qucikReceiptEntity.setWarehouseCode(warehouseCode);
@@ -902,10 +891,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 快速出库
* @return
*/
- @AutoLog(value = "快速出库")
+ @AutoLog(value = "快速出库", operateType = 3)
@PostMapping("quickShipment")
@ApiOperation("快速出库")
- @ResponseBody
public Result quickShipment(@RequestBody QucikReceiptEntity qucikReceiptEntity, HttpServletRequest req) {
String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
qucikReceiptEntity.setWarehouseCode(warehouseCode);
@@ -923,10 +911,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 质检登记
* @return
*/
- @AutoLog(value = "质检登记")
+ @AutoLog(value = "质检登记", operateType = 3)
@PostMapping("qualityRegister")
@ApiOperation("质检登记")
- @ResponseBody
public Result qualityRegister(@RequestBody TaskDetail taskDetail, HttpServletRequest req) {
int id = taskDetail.getId();
BigDecimal qualityfiedQty = taskDetail.getQualityfiedQty();
@@ -946,10 +933,9 @@ public class TaskHeaderController extends HuahengBaseController {
* 修改优先级
* @return
*/
- @AutoLog(value = "修改优先级")
+ @AutoLog(value = "修改优先级", operateType = 3)
@PostMapping("updatePriority")
@ApiOperation("修改优先级")
- @ResponseBody
public Result updatePriority(@RequestBody @RequestParam(name = "id") String id, @RequestParam(name = "priority") String priority, HttpServletRequest req) {
Result result = handleMultiProcess("updatePriority", new MultiProcessListener() {
@Override