仓库管理更新

liweidong
wusiyu 3 months ago
parent 183502d39f
commit b00c1b3c43
  1. 2
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java
  2. 2
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java
  3. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java
  4. 3
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java
  5. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
  6. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
  7. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java
  8. 3
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java
  9. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java
  10. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java
  11. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java
  12. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java
  13. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java
  14. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java
  15. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java
  16. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java
  17. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
  18. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
  19. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java
  20. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
  21. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
  22. 54
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java
  23. 58
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java
  24. 18
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java
  25. 49
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java
  26. 49
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java
  27. 16
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java
  28. 44
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java
  29. 50
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java
  30. 24
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java
  31. 51
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java
  32. 60
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java
  33. 25
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java
  34. 54
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java
  35. 61
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java
  36. 22
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
  37. 56
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java
  38. 9
      blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java
  39. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java
  40. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java
  41. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java
  42. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java
  43. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java
  44. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java
  45. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java
  46. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java
  47. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java
  48. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
  49. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java
  50. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java
  51. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java
  52. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java
  53. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java
  54. 12
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java
  55. 15
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
  56. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
  57. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
  58. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireSubmissionServiceImpl.java
  59. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
  60. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java
  61. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
  62. 21
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java
  63. 17
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java
  64. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java
  65. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java
  66. 33
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java
  67. 33
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java
  68. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java
  69. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java

@ -1,12 +1,10 @@
package org.springblade.wms.feign;
import io.swagger.v3.oas.annotations.Parameter;
import org.springblade.core.tool.api.R;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;

@ -1,6 +1,5 @@
package org.springblade.wms.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@ -11,7 +10,6 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 仓库实时结余远程调用

@ -1,6 +1,5 @@
package org.springblade.wms.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;

@ -1,14 +1,11 @@
package org.springblade.wms.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StLend;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.util.Date;
import java.util.List;
/**

@ -2,7 +2,6 @@ package org.springblade.wms.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.io.Serializable;

@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

@ -6,12 +6,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.data.annotation.Transient;
import java.io.Serial;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @version 1.0

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;

@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

@ -9,7 +9,6 @@ import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.util.Date;
/**
* @version 1.0

@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StClassRequest;
import java.io.Serial;
import java.util.Date;
/**
* @version 1.0

@ -9,7 +9,6 @@ import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/**

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StWarehouseTransferRecord;

@ -15,10 +15,7 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.DictCache;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,7 +26,6 @@ import org.springblade.wms.service.IStAllotRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.ArrayList;
import java.util.Map;

@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.checkerframework.checker.units.qual.A;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;

@ -15,7 +15,6 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -27,7 +26,6 @@ import org.springblade.wms.service.IStClassRequestService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.HashMap;
import java.util.Map;

@ -4,22 +4,16 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
/*import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.vo.DeptVO;*/
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StUserRight;

@ -1,41 +1,38 @@
package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StErpWarehouseTransferExcel;
import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.service.IStMoldBaseService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;
import org.springblade.wms.excel.StErpWarehouseTransferExcel;
import org.springblade.wms.wrapper.StErpWarehouseTransferWrapper;
import org.springblade.wms.service.IStErpWarehouseTransferService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.wms.wrapper.StErpWarehouseTransferWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0

@ -1,41 +1,36 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StExpireRecordExcel;
import org.springblade.wms.pojo.dto.StExpireRecordDTO;
import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import org.springblade.wms.service.IStExpireRecordService;
import org.springblade.wms.service.IStOtherOutRecordService;
import org.springblade.wms.wrapper.StExpireRecordWrapper;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import org.springblade.wms.excel.StExpireRecordExcel;
import org.springblade.wms.wrapper.StExpireRecordWrapper;
import org.springblade.wms.service.IStExpireRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.time.LocalDate;
import java.util.Date;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -60,17 +55,18 @@ public class StExpireRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stExpireRecord")
@Operation(summary = "详情", description = "传入stExpireRecord")
public R<StExpireRecordVO> detail(StExpireRecord stExpireRecord) {
StExpireRecord detail = stExpireRecordService.getOne(Condition.getQueryWrapper(stExpireRecord));
return R.data(StExpireRecordWrapper.build().entityVO(detail));
}
/**
* 到期维护记录表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stExpireRecord")
@Operation(summary = "分页", description = "传入stExpireRecord")
public R<IPage<StExpireRecordVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireRecord, Query query) {
IPage<StExpireRecord> pages = stExpireRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(stExpireRecord, StExpireRecord.class));
return R.data(StExpireRecordWrapper.build().pageVO(pages));
@ -81,7 +77,7 @@ public class StExpireRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stExpireRecord")
@Operation(summary = "分页", description = "传入stExpireRecord")
public R<IPage<StExpireRecordVO>> page(StExpireRecordVO stExpireRecord, Query query) {
IPage<StExpireRecordVO> pages = stExpireRecordService.selectStExpireRecordPage(Condition.getPage(query), stExpireRecord);
return R.data(pages);
@ -92,7 +88,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stExpireRecord")
@Operation(summary = "新增", description = "传入stExpireRecord")
public R save(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.save(stExpireRecord));
}
@ -102,7 +98,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stExpireRecord")
@Operation(summary = "修改", description = "传入stExpireRecord")
public R update(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.updateById(stExpireRecord));
}
@ -112,7 +108,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stExpireRecord")
@Operation(summary = "新增或修改", description = "传入stExpireRecord")
public R submit(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.saveOrUpdate(stExpireRecord));
}
@ -122,7 +118,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stExpireRecordService.deleteLogic(Func.toLongList(ids)));
}
@ -185,7 +181,7 @@ public class StExpireRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stExpireRecord")
@ApiOperationSupport(order = 12)
@Operation(summary = "导出数据", description = "传入stExpireRecord")
@Operation(summary = "导出数据", description = "传入stExpireRecord")
public void exportStExpireRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StExpireRecord> queryWrapper = Condition.getQueryWrapper(stExpireRecord, StExpireRecord.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,44 +1,37 @@
package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.service.IStExpireSubmissionService;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.wrapper.StExpireSubmissionWrapper;
import org.springblade.wms.service.IStExpireSubmissionService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -63,17 +56,18 @@ public class StExpireSubmissionController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stExpireSubmission")
@Operation(summary = "详情", description = "传入stExpireSubmission")
public R<StExpireSubmissionVO> detail(StExpireSubmission stExpireSubmission) {
StExpireSubmission detail = stExpireSubmissionService.getOne(Condition.getQueryWrapper(stExpireSubmission));
return R.data(StExpireSubmissionWrapper.build().entityVO(detail));
}
/**
* 到期送检表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stExpireSubmission")
@Operation(summary = "分页", description = "传入stExpireSubmission")
public R<IPage<StExpireSubmissionVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireSubmission, Query query) {
IPage<StExpireSubmission> pages = stExpireSubmissionService.page(Condition.getPage(query), Condition.getQueryWrapper(stExpireSubmission, StExpireSubmission.class));
return R.data(StExpireSubmissionWrapper.build().pageVO(pages));
@ -81,7 +75,7 @@ public class StExpireSubmissionController extends BladeController {
@GetMapping("/pageExpiry30Days")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stRealtimeStock")
@Operation(summary = "分页", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> pageExpiry30Days(StRealtimeStockVO stRealtimeStock, Query query) {
IPage<StRealtimeStockVO> pages = stRealtimeStockService.selectNearExpiry30DaysPage(Condition.getPage(query), stRealtimeStock);
return R.data(pages);
@ -92,7 +86,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 4)
@Operation(summary = "分页", description = "传入stExpireSubmission")
@Operation(summary = "分页", description = "传入stExpireSubmission")
public R<IPage<StExpireSubmissionVO>> page(StExpireSubmissionVO stExpireSubmission, Query query) {
IPage<StExpireSubmissionVO> pages = stExpireSubmissionService.selectStExpireSubmissionPage(Condition.getPage(query), stExpireSubmission);
return R.data(pages);
@ -103,7 +97,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@Operation(summary = "新增", description = "传入stExpireSubmission")
@Operation(summary = "新增", description = "传入stExpireSubmission")
public R save(@Valid @RequestBody StExpireSubmission stExpireSubmission) {
return R.status(stExpireSubmissionService.save(stExpireSubmission));
}
@ -113,7 +107,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@Operation(summary = "修改", description = "传入stExpireSubmission")
@Operation(summary = "修改", description = "传入stExpireSubmission")
public R update(@Valid @RequestBody StExpireSubmission stExpireSubmission) {
return R.status(stExpireSubmissionService.updateById(stExpireSubmission));
}
@ -137,7 +131,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stExpireSubmissionService.deleteLogic(Func.toLongList(ids)));
}
@ -149,7 +143,7 @@ public class StExpireSubmissionController extends BladeController {
@IsAdmin
@GetMapping("/export-stExpireSubmission")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入stExpireSubmission")
@Operation(summary = "导出数据", description = "传入stExpireSubmission")
public void exportStExpireSubmission(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireSubmission, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StExpireSubmission> queryWrapper = Condition.getQueryWrapper(stExpireSubmission, StExpireSubmission.class);
//if (!AuthUtil.isAdministrator()) {

@ -19,7 +19,6 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
import org.springblade.wms.excel.StGlassCakeOutExcel;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
@ -56,17 +55,18 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stGlassCakeOut")
@Operation(summary = "详情", description = "传入stGlassCakeOut")
public R<StGlassCakeOutVO> detail(StGlassCakeOut stGlassCakeOut) {
StGlassCakeOut detail = stGlassCakeOutService.getOne(Condition.getQueryWrapper(stGlassCakeOut));
return R.data(StGlassCakeOutWrapper.build().entityVO(detail));
}
/**
* 玻璃饼出库 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stGlassCakeOut")
@Operation(summary = "分页", description = "传入stGlassCakeOut")
public R<IPage<StGlassCakeOutVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stGlassCakeOut, Query query) {
IPage<StGlassCakeOut> pages = stGlassCakeOutService.page(Condition.getPage(query), Condition.getQueryWrapper(stGlassCakeOut, StGlassCakeOut.class));
return R.data(StGlassCakeOutWrapper.build().pageVO(pages));
@ -77,7 +77,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stGlassCakeOut")
@Operation(summary = "分页", description = "传入stGlassCakeOut")
public R<IPage<StGlassCakeOutVO>> page(StGlassCakeOutVO stGlassCakeOut, Query query) {
IPage<StGlassCakeOutVO> pages = stGlassCakeOutService.selectStGlassCakeOutPage(Condition.getPage(query), stGlassCakeOut);
return R.data(pages);
@ -88,7 +88,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stGlassCakeOut")
@Operation(summary = "新增", description = "传入stGlassCakeOut")
public R save(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.save(stGlassCakeOut));
}
@ -98,7 +98,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stGlassCakeOut")
@Operation(summary = "修改", description = "传入stGlassCakeOut")
public R update(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.updateById(stGlassCakeOut));
}
@ -108,7 +108,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stGlassCakeOut")
@Operation(summary = "新增或修改", description = "传入stGlassCakeOut")
public R submit(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.saveOrUpdate(stGlassCakeOut));
}
@ -118,7 +118,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGlassCakeOutService.deleteLogic(Func.toLongList(ids)));
}
@ -209,7 +209,7 @@ public class StGlassCakeOutController extends BladeController {
@IsAdmin
@GetMapping("/export-stGlassCakeOut")
@ApiOperationSupport(order = 14)
@Operation(summary = "导出数据", description = "传入stGlassCakeOut")
@Operation(summary = "导出数据", description = "传入stGlassCakeOut")
public void exportStGlassCakeOut(@Parameter(hidden = true) @RequestParam Map<String, Object> stGlassCakeOut, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGlassCakeOut> queryWrapper = Condition.getQueryWrapper(stGlassCakeOut, StGlassCakeOut.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,34 +1,32 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.excel.StGoodsClassExcel;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StGoodsClassVO;
import org.springblade.wms.excel.StGoodsClassExcel;
import org.springblade.wms.wrapper.StGoodsClassWrapper;
import org.springblade.wms.service.IStGoodsClassService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StGoodsClassWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@ -53,11 +51,12 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stGoodsClass")
@Operation(summary = "详情", description = "传入stGoodsClass")
public R<StGoodsClassVO> detail(StGoodsClass stGoodsClass) {
StGoodsClass detail = stGoodsClassService.getOne(Condition.getQueryWrapper(stGoodsClass));
return R.data(StGoodsClassWrapper.build().entityVO(detail));
}
/**
* 物料类别表 分页
*/
@ -76,7 +75,7 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stGoodsClass")
@Operation(summary = "分页", description = "传入stGoodsClass")
public R<IPage<StGoodsClassVO>> page(StGoodsClassVO stGoodsClass, Query query) {
stGoodsClass.setIsDeleted(0);
IPage<StGoodsClassVO> pages = stGoodsClassService.selectStGoodsClassPage(Condition.getPage(query), stGoodsClass);
@ -88,7 +87,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stGoodsClass")
@Operation(summary = "新增", description = "传入stGoodsClass")
public R save(@Valid @RequestBody StGoodsClass stGoodsClass) {
return R.status(stGoodsClassService.save(stGoodsClass));
}
@ -98,7 +97,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stGoodsClass")
@Operation(summary = "修改", description = "传入stGoodsClass")
public R update(@Valid @RequestBody StGoodsClass stGoodsClass) {
return R.status(stGoodsClassService.updateById(stGoodsClass));
}
@ -108,7 +107,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stGoodsClass")
@Operation(summary = "新增或修改", description = "传入stGoodsClass")
public R submit(@Valid @RequestBody StGoodsClass stGoodsClass) {
// 1. 名称重复校验
if (stGoodsClassService.checkName(stGoodsClass.getId(), stGoodsClass.getGcName())) {
@ -127,7 +126,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGoodsClassService.deleteLogic(Func.toLongList(ids)));
}
@ -173,7 +172,7 @@ public class StGoodsClassController extends BladeController {
@IsAdmin
@GetMapping("/export-stGoodsClass")
@ApiOperationSupport(order = 11)
@Operation(summary = "导出数据", description = "传入stGoodsClass")
@Operation(summary = "导出数据", description = "传入stGoodsClass")
public void exportStGoodsClass(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsClass, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoodsClass> queryWrapper = Condition.getQueryWrapper(stGoodsClass, StGoodsClass.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.excel.StGoodsExtExcel;
import org.springblade.wms.pojo.entity.StGoodsExt;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StGoodsExtVO;
import org.springblade.wms.excel.StGoodsExtExcel;
import org.springblade.wms.wrapper.StGoodsExtWrapper;
import org.springblade.wms.service.IStGoodsExtService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StGoodsExtWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
* @program: jonhon-mes-svr
@ -51,7 +50,7 @@ public class StGoodsExtController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stGoodsExt")
@Operation(summary = "详情", description = "传入stGoodsExt")
public R<StGoodsExtVO> detail(StGoodsExt stGoodsExt) {
StGoodsExt detail = stGoodsExtService.getOne(Condition.getQueryWrapper(stGoodsExt));
return R.data(StGoodsExtWrapper.build().entityVO(detail));
@ -62,7 +61,7 @@ public class StGoodsExtController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stGoodsExt")
@Operation(summary = "分页", description = "传入stGoodsExt")
public R<IPage<StGoodsExtVO>> page(StGoodsExtVO stGoodsExt, Query query) {
IPage<StGoodsExtVO> pages = stGoodsExtService.selectStGoodsExtPage(Condition.getPage(query), stGoodsExt);
return R.data(pages);
@ -73,7 +72,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 3)
@Operation(summary = "新增", description = "传入stGoodsExt")
@Operation(summary = "新增", description = "传入stGoodsExt")
public R save(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.save(stGoodsExt));
}
@ -83,7 +82,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 4)
@Operation(summary = "修改", description = "传入stGoodsExt")
@Operation(summary = "修改", description = "传入stGoodsExt")
public R update(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.updateById(stGoodsExt));
}
@ -93,7 +92,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 5)
@Operation(summary = "新增或修改", description = "传入stGoodsExt")
@Operation(summary = "新增或修改", description = "传入stGoodsExt")
public R submit(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.saveOrUpdate(stGoodsExt));
}
@ -103,7 +102,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGoodsExtService.deleteLogic(Func.toLongList(ids)));
}
@ -115,7 +114,7 @@ public class StGoodsExtController extends BladeController {
@IsAdmin
@GetMapping("/export-stGoodsExt")
@ApiOperationSupport(order = 7)
@Operation(summary = "导出数据", description = "传入stGoodsExt")
@Operation(summary = "导出数据", description = "传入stGoodsExt")
public void exportStGoodsExt(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsExt, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoodsExt> queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class);
//if (!AuthUtil.isAdministrator()) {

@ -21,7 +21,6 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.entity.StRealtimeStock;
@ -33,8 +32,6 @@ import org.springblade.wms.wrapper.StLendWrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -64,11 +61,12 @@ public class StLendController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stLend")
@Operation(summary = "详情", description = "传入stLend")
public R<StLendVO> detail(StLend stLend) {
StLend detail = stLendService.getOne(Condition.getQueryWrapper(stLend));
return R.data(StLendWrapper.build().entityVO(detail));
}
/**
* 物料借用 分页
*/
@ -105,7 +103,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stLend")
@Operation(summary = "新增", description = "传入stLend")
public R save(@Valid @RequestBody StLend stLend) {
return R.status(stLendService.save(stLend));
}
@ -115,7 +113,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stLend")
@Operation(summary = "修改", description = "传入stLend")
public R update(@Valid @RequestBody StLend stLend) {
return R.status(stLendService.updateById(stLend));
}
@ -126,7 +124,7 @@ public class StLendController extends BladeController {
@PostMapping("/submitBatch")
@ApiOperationSupport(order = 6)
@Operation(summary = "批量新增或修改", description = "传入List<StLend>批量处理")
public R submitBatch(@Validated @RequestBody List<StLend> stLendList) throws Exception{
public R submitBatch(@Validated @RequestBody List<StLend> stLendList) throws Exception {
return R.status(stLendService.saveOrEditBatch(stLendList, AuthUtil.getUser()));
}
@ -135,7 +133,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stLendService.deleteLogic(Func.toLongList(ids)));
}
@ -207,7 +205,7 @@ public class StLendController extends BladeController {
@IsAdmin
@GetMapping("/export-stLend")
@ApiOperationSupport(order = 11)
@Operation(summary = "导出数据", description = "传入stLend")
@Operation(summary = "导出数据", description = "传入stLend")
public void exportStLend(@Parameter(hidden = true) @RequestParam Map<String, Object> stLend, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StLend> queryWrapper = Condition.getQueryWrapper(stLend, StLend.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,35 +1,34 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StMoldApplyForExcel;
import org.springblade.wms.pojo.dto.StMoldApplyForDTO;
import org.springblade.wms.pojo.entity.StMoldApplyFor;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StMoldApplyForVO;
import org.springblade.wms.excel.StMoldApplyForExcel;
import org.springblade.wms.wrapper.StMoldApplyForWrapper;
import org.springblade.wms.service.IStMoldApplyForService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StMoldApplyForWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -53,11 +52,12 @@ public class StMoldApplyForController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stMoldApplyFor")
@Operation(summary = "详情", description = "传入stMoldApplyFor")
public R<StMoldApplyForVO> detail(StMoldApplyFor stMoldApplyFor) {
StMoldApplyFor detail = stMoldApplyForService.getOne(Condition.getQueryWrapper(stMoldApplyFor));
return R.data(StMoldApplyForWrapper.build().entityVO(detail));
}
/**
* 工装计划申请表 分页
*/
@ -93,7 +93,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stMoldApplyFor")
@Operation(summary = "新增", description = "传入stMoldApplyFor")
public R save(@Valid @RequestBody StMoldApplyFor stMoldApplyFor) {
return R.status(stMoldApplyForService.save(stMoldApplyFor));
}
@ -103,7 +103,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stMoldApplyFor")
@Operation(summary = "修改", description = "传入stMoldApplyFor")
public R update(@Valid @RequestBody StMoldApplyFor stMoldApplyFor) {
return R.status(stMoldApplyForService.updateById(stMoldApplyFor));
}
@ -124,7 +124,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stMoldApplyForService.deleteLogic(Func.toLongList(ids)));
}
@ -136,7 +136,7 @@ public class StMoldApplyForController extends BladeController {
@IsAdmin
@GetMapping("/export-stMoldApplyFor")
@ApiOperationSupport(order = 8)
@Operation(summary = "导出数据", description = "传入stMoldApplyFor")
@Operation(summary = "导出数据", description = "传入stMoldApplyFor")
public void exportStMoldApplyFor(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldApplyFor, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StMoldApplyFor> queryWrapper = Condition.getQueryWrapper(stMoldApplyFor, StMoldApplyFor.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StMoldBaseExcel;
import org.springblade.wms.pojo.dto.StMoldBaseDTO;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.excel.StMoldBaseExcel;
import org.springblade.wms.wrapper.StMoldBaseWrapper;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StMoldBaseWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -52,17 +51,18 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stMoldBase")
@Operation(summary = "详情", description = "传入stMoldBase")
public R<StMoldBaseVO> detail(StMoldBase stMoldBase) {
StMoldBase detail = stMoldBaseService.getOne(Condition.getQueryWrapper(stMoldBase));
return R.data(StMoldBaseWrapper.build().entityVO(detail));
}
/**
* 模具关系表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stMoldBase")
@Operation(summary = "分页", description = "传入stMoldBase")
public R<IPage<StMoldBaseVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldBase, Query query) {
IPage<StMoldBase> pages = stMoldBaseService.page(Condition.getPage(query), Condition.getQueryWrapper(stMoldBase, StMoldBase.class));
return R.data(StMoldBaseWrapper.build().pageVO(pages));
@ -73,7 +73,7 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stMoldBase")
@Operation(summary = "分页", description = "传入stMoldBase")
public R<IPage<StMoldBaseVO>> page(StMoldBaseVO stMoldBase, Query query) {
IPage<StMoldBaseVO> pages = stMoldBaseService.selectStMoldBasePage(Condition.getPage(query), stMoldBase);
return R.data(pages);
@ -84,7 +84,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stMoldBase")
@Operation(summary = "新增", description = "传入stMoldBase")
public R save(@Valid @RequestBody StMoldBase stMoldBase) {
return R.status(stMoldBaseService.save(stMoldBase));
}
@ -94,7 +94,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stMoldBase")
@Operation(summary = "修改", description = "传入stMoldBase")
public R update(@Valid @RequestBody StMoldBase stMoldBase) {
return R.status(stMoldBaseService.updateById(stMoldBase));
}
@ -104,7 +104,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stMoldBase")
@Operation(summary = "新增或修改", description = "传入stMoldBase")
public R submit(@Valid @RequestBody StMoldBaseDTO dto) {
return R.status(stMoldBaseService.addOrEdit(dto.getList(), dto.getDeleteIds()));
}
@ -114,7 +114,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stMoldBaseService.deleteLogic(Func.toLongList(ids)));
}
@ -137,7 +137,7 @@ public class StMoldBaseController extends BladeController {
@IsAdmin
@GetMapping("/export-stMoldBase")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入stMoldBase")
@Operation(summary = "导出数据", description = "传入stMoldBase")
public void exportStMoldBase(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldBase, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StMoldBase> queryWrapper = Condition.getQueryWrapper(stMoldBase, StMoldBase.class);
//if (!AuthUtil.isAdministrator()) {

@ -16,14 +16,16 @@ import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StOtherOutRecordExcel;
import org.springblade.wms.pojo.dto.StOtherOutRecordDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StOtherOutRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StOtherOutRecordVO;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.pojo.vo.StStockInoutRecordVO;
@ -34,7 +36,6 @@ import org.springblade.wms.service.IStStockInoutRecordService;
import org.springblade.wms.wrapper.StOtherOutRecordWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -64,7 +65,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stOtherOutRecord")
@Operation(summary = "详情", description = "传入stOtherOutRecord")
public R<StOtherOutRecordVO> detail(StOtherOutRecordVO stOtherOutRecord) {
// StOtherOutRecord detail = stOtherOutRecordService.getOne(Condition.getQueryWrapper(stOtherOutRecord));
StOtherOutRecordVO detail = stOtherOutRecordService.getDetail(stOtherOutRecord.getId());
@ -74,6 +75,7 @@ public class StOtherOutRecordController extends BladeController {
}
return R.data(detail);
}
/**
* 其他出库表 分页
*/
@ -130,7 +132,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stOtherOutRecord")
@Operation(summary = "新增", description = "传入stOtherOutRecord")
public R save(@Valid @RequestBody StOtherOutRecord stOtherOutRecord) {
return R.status(stOtherOutRecordService.save(stOtherOutRecord));
}
@ -140,7 +142,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stOtherOutRecord")
@Operation(summary = "修改", description = "传入stOtherOutRecord")
public R update(@Valid @RequestBody StOtherOutRecord stOtherOutRecord) {
return R.status(stOtherOutRecordService.updateById(stOtherOutRecord));
}
@ -165,7 +167,7 @@ public class StOtherOutRecordController extends BladeController {
@PostMapping("/scanSubmit")
@ApiOperationSupport(order = 7)
@Operation(summary = "扫码出库", description = "通过物料编码(条形码)生成其他出库数据")
public R scanSubmit( @RequestParam String barCode) {
public R scanSubmit(@RequestParam String barCode) {
StRealtimeStock stock = stRealtimeStockService.getByBarCode(barCode);
if (stock == null) {
stock = stRealtimeStockService.getByGoodsCode(barCode);
@ -183,8 +185,8 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 8)
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) {
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder(@RequestParam Long id, @RequestParam Short approvalResult) {
stOtherOutRecordService.approvalRequest(id, approvalResult, AuthUtil.getUser());
return R.success("审批操作成功");
}
@ -194,7 +196,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 9)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stOtherOutRecordService.deleteLogic(Func.toLongList(ids)));
}
@ -238,7 +240,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/export-stOtherOutRecord")
@ApiOperationSupport(order = 12)
@Operation(summary = "导出数据", description = "传入stOtherOutRecord")
@Operation(summary = "导出数据", description = "传入stOtherOutRecord")
public void exportStOtherOutRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherOutRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherOutRecord> queryWrapper = Condition.getQueryWrapper(stOtherOutRecord, StOtherOutRecord.class);
//if (!AuthUtil.isAdministrator()) {

@ -2,49 +2,44 @@ package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
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.v3.oas.annotations.tags.Tag;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.dto.InitStockDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
import org.springblade.wms.pojo.vo.StStockInoutRecordVO;
import org.springblade.wms.service.*;
//import org.springblade.wms.service.impl.InitStockListener;
import org.springblade.wms.service.impl.InitStockListener;
import org.springblade.wms.wrapper.StOtherReceiptRecordWrapper;
import org.springblade.wms.wrapper.StStockInoutRecordWrapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.wrapper.StOtherReceiptRecordWrapper;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
/**
* @version 1.0
* @program: jonhon-mes-svr
@ -73,7 +68,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stOtherReceiptRecord")
@Operation(summary = "详情", description = "传入stOtherReceiptRecord")
public R<StOtherReceiptRecordVO> detail(StOtherReceiptRecord stOtherReceiptRecord) {
StOtherReceiptRecord detail = stOtherReceiptRecordService.getOne(Condition.getQueryWrapper(stOtherReceiptRecord));
return R.data(StOtherReceiptRecordWrapper.build().entityVO(detail));
@ -137,7 +132,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stOtherReceiptRecord")
@Operation(summary = "新增", description = "传入stOtherReceiptRecord")
public R save(@Valid @RequestBody StOtherReceiptRecord stOtherReceiptRecord) {
return R.status(stOtherReceiptRecordService.save(stOtherReceiptRecord));
}
@ -147,7 +142,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stOtherReceiptRecord")
@Operation(summary = "修改", description = "传入stOtherReceiptRecord")
public R update(@Valid @RequestBody StOtherReceiptRecord stOtherReceiptRecord) {
return R.status(stOtherReceiptRecordService.updateById(stOtherReceiptRecord));
}
@ -160,7 +155,7 @@ public class StOtherReceiptRecordController extends BladeController {
@Operation(summary = "生成单条批次号", description = "生成规则:Q+yyyyMMdd+4位补0自增序号,无入参,直接返回唯一批次号")
public R<String> generateSinglePiNo() {
String datePrefix = cn.hutool.core.date.DateUtil.format(new Date(), "yyyyMMdd");
String maxPiNo = stStockInoutRecordService.getMaxPiNo("Q");
String maxPiNo = stStockInoutRecordService.getMaxPiNo("Q");
int n = Optional.ofNullable(maxPiNo)
.map(p -> Integer.parseInt(p.substring(9)))
.orElse(0);
@ -184,7 +179,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stOtherReceiptRecordService.deleteLogic(Func.toLongList(ids)));
}
@ -242,7 +237,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/downloadExcelTemplate")
@ApiOperationSupport(order = 13)
@Operation(summary = "导出数据模版", description = "传入stOtherReceiptRecord")
@Operation(summary = "导出数据模版", description = "传入stOtherReceiptRecord")
public void downloadExcelTemplate(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);
//if (!AuthUtil.isAdministrator()) {
@ -327,7 +322,7 @@ public class StOtherReceiptRecordController extends BladeController {
return stGoodsService.queryByCode(goodsCode);
} catch (Exception e) {
// 抛友好异常,携带行号和物料编码,方便排查
throw new ServiceException("物料创建失败" );
throw new ServiceException("物料创建失败");
}
});
if (goods == null) {
@ -390,7 +385,7 @@ public class StOtherReceiptRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stOtherReceiptRecord")
@ApiOperationSupport(order = 15)
@Operation(summary = "导出数据", description = "传入stOtherReceiptRecord")
@Operation(summary = "导出数据", description = "传入stOtherReceiptRecord")
public void exportStOtherReceiptRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);
//if (!AuthUtil.isAdministrator()) {

@ -4,41 +4,38 @@ package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.TemplateUtil;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.*;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.excel.StRealtimeStockExcel;
import org.springblade.wms.wrapper.StRealtimeStockWrapper;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.PrintParentWoLabel;
import org.springblade.wms.pojo.vo.PrintStoresList;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.wms.wrapper.StRealtimeStockWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
import static org.springblade.core.excel.util.ExcelUtil.export;
@ -72,17 +69,18 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stRealtimeStock")
@Operation(summary = "详情", description = "传入stRealtimeStock")
public R<StRealtimeStockVO> detail(StRealtimeStock stRealtimeStock) {
StRealtimeStock detail = stRealtimeStockService.getOne(Condition.getQueryWrapper(stRealtimeStock));
return R.data(StRealtimeStockWrapper.build().entityVO(detail));
}
/**
* 仓库实时结余表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stRealtimeStock")
@Operation(summary = "分页", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stRealtimeStock, Query query) {
IPage<StRealtimeStock> pages = stRealtimeStockService.page(Condition.getPage(query), Condition.getQueryWrapper(stRealtimeStock, StRealtimeStock.class));
return R.data(StRealtimeStockWrapper.build().pageVO(pages));
@ -93,7 +91,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stRealtimeStock")
@Operation(summary = "分页", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> page(StRealtimeStockVO stRealtimeStock, Query query) {
IPage<StRealtimeStockVO> pages = stRealtimeStockService.selectStRealtimeStockPage(Condition.getPage(query), stRealtimeStock);
return R.data(pages);
@ -120,7 +118,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@Operation(summary = "新增", description = "传入stRealtimeStock")
@Operation(summary = "新增", description = "传入stRealtimeStock")
public R save(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.save(stRealtimeStock));
}
@ -130,7 +128,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@Operation(summary = "修改", description = "传入stRealtimeStock")
@Operation(summary = "修改", description = "传入stRealtimeStock")
public R update(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.updateById(stRealtimeStock));
}
@ -140,7 +138,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@Operation(summary = "新增或修改", description = "传入stRealtimeStock")
@Operation(summary = "新增或修改", description = "传入stRealtimeStock")
public R submit(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.saveOrUpdate(stRealtimeStock));
}
@ -150,7 +148,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stRealtimeStockService.deleteLogic(Func.toLongList(ids)));
}
@ -207,7 +205,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/printWoLabel")
@ApiOperationSupport(order = 12)
@Operation(summary = "打印标签", description = "传入rlsIdList(主键集合)、quantity(打印数量)、exportType(导出类型)")
@Operation(summary = "打印标签", description = "传入rlsIdList(主键集合)、quantity(打印数量)、exportType(导出类型)")
public void printLabel(
@Parameter(hidden = true) @RequestBody JSONObject data,
@Parameter(hidden = true) HttpServletRequest request,
@ -255,7 +253,7 @@ public class StRealtimeStockController extends BladeController {
// 调用服务层获取打印数据
List<PrintStoresList> list = stRealtimeStockService.printStRealtimeStockList(idArr);
// 执行导出打印
export(response, "流程卡打印","reportId", list, PrintStoresList.class);
export(response, "流程卡打印", "reportId", list, PrintStoresList.class);
}
}
} catch (Exception e) {
@ -297,7 +295,7 @@ public class StRealtimeStockController extends BladeController {
@IsAdmin
@GetMapping("/export-stRealtimeStock")
@ApiOperationSupport(order = 15)
@Operation(summary = "导出数据", description = "传入stRealtimeStock")
@Operation(summary = "导出数据", description = "传入stRealtimeStock")
public void exportStRealtimeStock(@Parameter(hidden = true) @RequestParam Map<String, Object> stRealtimeStock, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StRealtimeStock> queryWrapper = Condition.getQueryWrapper(stRealtimeStock, StRealtimeStock.class);
//if (!AuthUtil.isAdministrator()) {

@ -2,10 +2,6 @@ package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
@ -15,15 +11,14 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StRequisitionExcel;
import org.springblade.wms.pojo.dto.StRequisitionDTO;
import org.springblade.wms.pojo.entity.StRequisition;
import org.springblade.wms.pojo.entity.StStorageLocation;
@ -33,7 +28,6 @@ import org.springblade.wms.service.IStStorageLocationService;
import org.springblade.wms.wrapper.StRequisitionWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -60,17 +54,18 @@ public class StRequisitionController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stRequisition")
@Operation(summary = "详情", description = "传入stRequisition")
public R<StRequisitionVO> detail(StRequisition stRequisition) {
StRequisition detail = stRequisitionService.getOne(Condition.getQueryWrapper(stRequisition));
return R.data(StRequisitionWrapper.build().entityVO(detail));
}
/**
* 领料单打印 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stRequisition")
@Operation(summary = "分页", description = "传入stRequisition")
public R<IPage<StRequisitionVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stRequisition, Query query) {
IPage<StRequisition> pages = stRequisitionService.page(Condition.getPage(query), Condition.getQueryWrapper(stRequisition, StRequisition.class));
return R.data(StRequisitionWrapper.build().pageVO(pages));
@ -120,7 +115,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@Operation(summary = "新增", description = "传入stRequisition")
@Operation(summary = "新增", description = "传入stRequisition")
public R save(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.save(stRequisition));
}
@ -130,7 +125,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@Operation(summary = "修改", description = "传入stRequisition")
@Operation(summary = "修改", description = "传入stRequisition")
public R update(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.updateById(stRequisition));
}
@ -140,7 +135,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@Operation(summary = "新增或修改", description = "传入stRequisition")
@Operation(summary = "新增或修改", description = "传入stRequisition")
public R submit(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.saveOrUpdate(stRequisition));
}
@ -150,7 +145,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stRequisitionService.deleteLogic(Func.toLongList(ids)));
}
@ -210,7 +205,7 @@ public class StRequisitionController extends BladeController {
@ApiOperationSupport(order = 10)
@Operation(summary = "获取表头条形码", description = "传入Id")
public R<Map<String, Object>> getBarCode(@Parameter(description = "ID", required = true)
@RequestParam Long srId) {
@RequestParam Long srId) {
return R.data(stRequisitionService.getBarCode(srId));
}

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StReturnRecordExcel;
import org.springblade.wms.pojo.entity.StReturnRecord;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StReturnRecordVO;
import org.springblade.wms.excel.StReturnRecordExcel;
import org.springblade.wms.wrapper.StReturnRecordWrapper;
import org.springblade.wms.service.IStReturnRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StReturnRecordWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -52,17 +51,18 @@ public class StReturnRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stReturnRecord")
@Operation(summary = "详情", description = "传入stReturnRecord")
public R<StReturnRecordVO> detail(StReturnRecord stReturnRecord) {
StReturnRecord detail = stReturnRecordService.getOne(Condition.getQueryWrapper(stReturnRecord));
return R.data(StReturnRecordWrapper.build().entityVO(detail));
}
/**
* 归还记录 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stReturnRecord")
@Operation(summary = "分页", description = "传入stReturnRecord")
public R<IPage<StReturnRecordVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stReturnRecord, Query query) {
IPage<StReturnRecord> pages = stReturnRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(stReturnRecord, StReturnRecord.class));
return R.data(StReturnRecordWrapper.build().pageVO(pages));
@ -73,7 +73,7 @@ public class StReturnRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stReturnRecord")
@Operation(summary = "分页", description = "传入stReturnRecord")
public R<IPage<StReturnRecordVO>> page(StReturnRecordVO stReturnRecord, Query query) {
IPage<StReturnRecordVO> pages = stReturnRecordService.selectStReturnRecordPage(Condition.getPage(query), stReturnRecord);
return R.data(pages);
@ -84,7 +84,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stReturnRecord")
@Operation(summary = "新增", description = "传入stReturnRecord")
public R save(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.save(stReturnRecord));
}
@ -94,7 +94,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stReturnRecord")
@Operation(summary = "修改", description = "传入stReturnRecord")
public R update(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.updateById(stReturnRecord));
}
@ -104,7 +104,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stReturnRecord")
@Operation(summary = "新增或修改", description = "传入stReturnRecord")
public R submit(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.saveOrUpdate(stReturnRecord));
}
@ -114,8 +114,8 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/sendBackBatch")
@ApiOperationSupport(order = 7)
@Operation(summary = "批量归还", description = "传入stReturnRecord")
public R sendBackBatch(@RequestBody List<StReturnRecord> stReturnRecordList) throws Exception{
@Operation(summary = "批量归还", description = "传入stReturnRecord")
public R sendBackBatch(@RequestBody List<StReturnRecord> stReturnRecordList) throws Exception {
return R.status(stReturnRecordService.sendBackBatch(stReturnRecordList, AuthUtil.getUser()));
}
@ -124,7 +124,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stReturnRecordService.deleteLogic(Func.toLongList(ids)));
}
@ -136,7 +136,7 @@ public class StReturnRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stReturnRecord")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入stReturnRecord")
@Operation(summary = "导出数据", description = "传入stReturnRecord")
public void exportStReturnRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stReturnRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StReturnRecord> queryWrapper = Condition.getQueryWrapper(stReturnRecord, StReturnRecord.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,40 +1,36 @@
package org.springblade.wms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StStorageLocationExcel;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StStorageLocationVO;
import org.springblade.wms.excel.StStorageLocationExcel;
import org.springblade.wms.wrapper.StStorageLocationWrapper;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.wms.service.IStStorageLocationService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StStorageLocationWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
import jakarta.servlet.http.HttpServletResponse;
/**
* @version 1.0
* @program: jonhon-mes-svr
@ -59,11 +55,12 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stStorageLocation")
@Operation(summary = "详情", description = "传入stStorageLocation")
public R<StStorageLocationVO> detail(StStorageLocation stStorageLocation) {
StStorageLocation detail = stStorageLocationService.getOne(Condition.getQueryWrapper(stStorageLocation));
return R.data(StStorageLocationWrapper.build().entityVO(detail));
}
/**
* 库位维护表 分页
*/
@ -109,7 +106,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stStorageLocation")
@Operation(summary = "新增", description = "传入stStorageLocation")
public R save(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.save(stStorageLocation));
}
@ -119,7 +116,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stStorageLocation")
@Operation(summary = "修改", description = "传入stStorageLocation")
public R update(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.updateById(stStorageLocation));
}
@ -129,7 +126,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stStorageLocation")
@Operation(summary = "新增或修改", description = "传入stStorageLocation")
public R submit(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.saveOrUpdate(stStorageLocation));
}
@ -149,18 +146,18 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
List<Long> idList = Func.toLongList(ids);
for (Long keyId : idList) {
if (keyId == null) {
continue;
}
continue;
}
StStorageLocation location = stStorageLocationService.getById(keyId);
if (location == null) {
continue;
}
continue;
}
// 库存校验(与单条接口完全一致)
Double quantity = stRealtimeStockService.getQuantityBySlId(keyId);
@ -195,7 +192,7 @@ public class StStorageLocationController extends BladeController {
}
/**
*根据物料编号查库位号
* 根据物料编号查库位号
*/
@GetMapping("/findByGoodsCode")
@ApiOperationSupport(order = 11)
@ -223,7 +220,7 @@ public class StStorageLocationController extends BladeController {
@IsAdmin
@GetMapping("/export-stStorageLocation")
@ApiOperationSupport(order = 13)
@Operation(summary = "导出数据", description = "传入stStorageLocation")
@Operation(summary = "导出数据", description = "传入stStorageLocation")
public void exportStStorageLocation(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorageLocation, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StStorageLocation> queryWrapper = Condition.getQueryWrapper(stStorageLocation, StStorageLocation.class);
//if (!AuthUtil.isAdministrator()) {

@ -2,13 +2,10 @@ package org.springblade.wms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
@ -25,11 +22,9 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.wms.service.IStStorageLocationService;
@ -37,8 +32,6 @@ import org.springblade.wms.service.IStStorehouseService;
import org.springblade.wms.service.IStUserRightService;
import org.springblade.wms.wrapper.StStorehouseWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.List;
import java.util.Map;
@ -71,17 +64,18 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stStorehouse")
@Operation(summary = "详情", description = "传入stStorehouse")
public R<StStorehouseVO> detail(StStorehouse stStorehouse) {
StStorehouse detail = stStorehouseService.getOne(Condition.getQueryWrapper(stStorehouse));
return R.data(StStorehouseWrapper.build().entityVO(detail));
}
/**
* 库房维护表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stStorehouse")
@Operation(summary = "分页", description = "传入stStorehouse")
public R<IPage<StStorehouseVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorehouse, Query query) {
QueryWrapper<StStorehouse> wrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class);
// 1. 软删除过滤
@ -129,7 +123,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stStorehouse")
@Operation(summary = "新增", description = "传入stStorehouse")
public R save(@Valid @RequestBody StStorehouse stStorehouse) {
return R.status(stStorehouseService.save(stStorehouse));
}
@ -139,7 +133,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stStorehouse")
@Operation(summary = "修改", description = "传入stStorehouse")
public R update(@Valid @RequestBody StStorehouse stStorehouse) {
return R.status(stStorehouseService.updateById(stStorehouse));
}
@ -149,7 +143,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入stStorehouse")
@Operation(summary = "新增或修改", description = "传入stStorehouse")
public R submit(@Valid @RequestBody StStorehouse stStorehouse) {
// 1. 库房名称重复校验
if (stStorehouseService.checkName(stStorehouse.getId(), stStorehouse.getShName())) {
@ -167,7 +161,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
List<Long> idList = Func.toLongList(ids);
for (Long keyId : idList) {
@ -274,7 +268,7 @@ public class StStorehouseController extends BladeController {
@IsAdmin
@GetMapping("/export-stStorehouse")
@ApiOperationSupport(order = 14)
@Operation(summary = "导出数据", description = "传入stStorehouse")
@Operation(summary = "导出数据", description = "传入stStorehouse")
public void exportStStorehouse(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorehouse, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StStorehouse> queryWrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class);
//if (!AuthUtil.isAdministrator()) {

@ -1,37 +1,34 @@
package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springblade.wms.excel.StWmsRequestExcel;
import org.springblade.wms.pojo.entity.StWmsRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StWmsRequestVO;
import org.springblade.wms.excel.StWmsRequestExcel;
import org.springblade.wms.wrapper.StWmsRequestWrapper;
import org.springblade.wms.service.IStWmsRequestService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StWmsRequestWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -55,17 +52,18 @@ public class StWmsRequestController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入stWmsRequest")
@Operation(summary = "详情", description = "传入stWmsRequest")
public R<StWmsRequestVO> detail(StWmsRequest stWmsRequest) {
StWmsRequest detail = stWmsRequestService.getOne(Condition.getQueryWrapper(stWmsRequest));
return R.data(StWmsRequestWrapper.build().entityVO(detail));
}
/**
* 仓库提请记录 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入stWmsRequest")
@Operation(summary = "分页", description = "传入stWmsRequest")
public R<IPage<StWmsRequestVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stWmsRequest, Query query) {
IPage<StWmsRequest> pages = stWmsRequestService.page(Condition.getPage(query), Condition.getQueryWrapper(stWmsRequest, StWmsRequest.class));
return R.data(StWmsRequestWrapper.build().pageVO(pages));
@ -76,9 +74,9 @@ public class StWmsRequestController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入stWmsRequest")
@Operation(summary = "分页", description = "传入stWmsRequest")
public R<IPage<StWmsRequestVO>> page(StWmsRequestVO stWmsRequest, Query query) {
BladeUser user = AuthUtil.getUser();
BladeUser user = AuthUtil.getUser();
String userRoleName = user.getRoleName();
stWmsRequest.setUserRoleName(userRoleName);
if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("保管员")) {
@ -93,7 +91,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入stWmsRequest")
@Operation(summary = "新增", description = "传入stWmsRequest")
public R save(@Valid @RequestBody StWmsRequest stWmsRequest) {
return R.status(stWmsRequestService.save(stWmsRequest));
}
@ -103,7 +101,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入stWmsRequest")
@Operation(summary = "修改", description = "传入stWmsRequest")
public R update(@Valid @RequestBody StWmsRequest stWmsRequest) {
return R.status(stWmsRequestService.updateById(stWmsRequest));
}
@ -138,8 +136,8 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 8)
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) {
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder(@RequestParam Long id, @RequestParam Short approvalResult) {
stWmsRequestService.approvalRequest(id, approvalResult, AuthUtil.getUser());
return R.success("审批操作成功");
}
@ -149,7 +147,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 9)
@Operation(summary = "逻辑删除", description = "传入ids")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stWmsRequestService.deleteLogic(Func.toLongList(ids)));
}
@ -160,7 +158,7 @@ public class StWmsRequestController extends BladeController {
@IsAdmin
@GetMapping("/export-stWmsRequest")
@ApiOperationSupport(order = 10)
@Operation(summary = "导出数据", description = "传入stWmsRequest")
@Operation(summary = "导出数据", description = "传入stWmsRequest")
public void exportStWmsRequest(@Parameter(hidden = true) @RequestParam Map<String, Object> stWmsRequest, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StWmsRequest> queryWrapper = Condition.getQueryWrapper(stWmsRequest, StWmsRequest.class);
//if (!AuthUtil.isAdministrator()) {

@ -3,13 +3,11 @@ package org.springblade.wms.feign;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RMap;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
import org.springblade.wms.service.IStGlassCakeOutService;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -28,12 +26,13 @@ import java.util.Map;
@RestController
@AllArgsConstructor
@Slf4j
public class StGlassCakeOutClientImpl implements StGlassCakeOutClient{
public class StGlassCakeOutClientImpl implements StGlassCakeOutClient {
private final IStGlassCakeOutService stGlassCakeOutService;
/**
* 业务层调用远程接口生成玻璃饼预出库单
*
* @param dto 预出库DTO参数
* @return 预出库单结果
*/
@ -46,6 +45,6 @@ public class StGlassCakeOutClientImpl implements StGlassCakeOutClient{
@Override
public R<Map<String, Object>> batchGeneratePreOutOrder(List<StGlassCakeOutDTO> dtoList) {
Map<String, Object> result = stGlassCakeOutService.batchGeneratePreOutOrder(dtoList);
return R.data(result);
}
return R.data(result);
}
}

@ -2,7 +2,6 @@ package org.springblade.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
/**
* @version 1.0

@ -1,6 +1,5 @@
package org.springblade.wms.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -10,7 +9,6 @@ import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.vo.StBuyOrderVO;
import java.util.List;
import java.util.Map;
/**
* @version 1.0
@ -26,7 +24,7 @@ public interface StBuyOrderMapper extends BaseMapper<StBuyOrder> {
/**
* 自定义分页
*
* @param page 分页参数
* @param page 分页参数
* @param stBuyOrder 查询参数
* @return List<StBuyOrderVO>
*/
@ -52,7 +50,7 @@ public interface StBuyOrderMapper extends BaseMapper<StBuyOrder> {
List<StBuyOrderVO> selectStoreRequestPage(IPage<StBuyOrderVO> page, StBuyOrderVO stBuyOrder);
StBuyOrder getByExtraBill(String extraBill);
StBuyOrder getByExtraBill(String extraBill);
// JSONObject listByRecordDetail(Long boId, String goodsCode);
}

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
@ -26,7 +25,7 @@ public interface StExpireSubmissionMapper extends BaseMapper<StExpireSubmission>
/**
* 自定义分页
*
* @param page 分页参数
* @param page 分页参数
* @param stExpireSubmission 查询参数
* @return List<StExpireSubmissionVO>
*/
@ -44,7 +43,8 @@ public interface StExpireSubmissionMapper extends BaseMapper<StExpireSubmission>
/**
* 发送到期送检信息至ERP调用存储过程
* @param stock 实时库存实体
*
* @param stock 实时库存实体
* @param userName 当前用户ID适配Service层调用参数
* @return ERP返回的送检编码wsCode/esCode
* @throws Exception 通用异常包含BusinessException业务异常

@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;
@ -26,7 +24,7 @@ public interface StStorehouseMapper extends BaseMapper<StStorehouse> {
/**
* 自定义分页
*
* @param page 分页参数
* @param page 分页参数
* @param stStorehouse 查询参数
* @return List<StStorehouseVO>
*/
@ -48,7 +46,7 @@ public interface StStorehouseMapper extends BaseMapper<StStorehouse> {
StStorehouse getUniqueByCode(String shCode);
List<StStorehouse> findStorehouseList(Long userId, String urType, boolean choose);
List<StStorehouse> findStorehouseList(Long userId, String urType, boolean choose);
List<StStorehouseVO> selectStorehousePage(IPage<StStorehouseVO> page, StStorehouseVO stStorehouse, Long userId, String urTypeStorehouse);

@ -1,7 +1,6 @@
package org.springblade.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.core.secure.BladeUser;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.pojo.entity.StUserRight;
@ -17,7 +16,7 @@ import java.util.List;
**/
public interface StUserRightMapper extends BaseMapper<StUserRight> {
List<User> findNoUserRightByTheId(Long theId, String urType);
List<User> findNoUserRightByTheId(Long theId, String urType);
List<StUserRight> findByTheIdAndUrType(Long theId, String urType);

@ -2,7 +2,6 @@ package org.springblade.wms.service;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
/**
* @version 1.0

@ -1,6 +1,5 @@
package org.springblade.wms.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

@ -9,8 +9,6 @@ import org.springblade.wms.pojo.dto.StExpireRecordDTO;
import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.vo.StLendVO;

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StOtherOutRecordExcel;
import org.springblade.wms.pojo.dto.StOtherOutRecordDTO;
import org.springblade.wms.pojo.entity.StOtherOutRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StOtherOutRecordVO;

@ -6,7 +6,6 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.dto.InitStockDTO;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;

@ -3,7 +3,6 @@ package org.springblade.wms.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;

@ -2,10 +2,8 @@ package org.springblade.wms.service;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import java.util.List;
import java.util.Map;
/**
* @version 1.0

@ -1,6 +1,5 @@
package org.springblade.wms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.SyDockingLog;

@ -2,11 +2,8 @@ package org.springblade.wms.service.impl;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.mapper.PvBomRequestMapper;
import org.springblade.wms.mapper.StAllotRecordMapper;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.service.IPvBomRequestService;
import org.springblade.wms.service.IStAllotRecordService;
import org.springframework.stereotype.Service;
/**

@ -3,20 +3,15 @@ package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.excel.StAllotRecordExcel;
import org.springblade.wms.mapper.StAllotRecordMapper;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StRealtimeStockMapper;
import org.springblade.wms.mapper.StStorageLocationMapper;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.vo.StAllotRecordVO;
import org.springblade.wms.service.IStAllotRecordService;
import org.springblade.wms.service.IStRealtimeStockService;
@ -50,6 +45,7 @@ public class StAllotRecordServiceImpl extends BaseServiceImpl<StAllotRecordMappe
public IPage<StAllotRecordVO> selectAllotWithGoods(IPage<StAllotRecord> page, QueryWrapper<StAllotRecord> wrapper) {
return baseMapper.selectAllotWithGoods(page, wrapper);
}
@Override
public IPage<StAllotRecordVO> selectStAllotRecordPage(IPage<StAllotRecordVO> page, StAllotRecordVO stAllotRecord) {
return page.setRecords(baseMapper.selectStAllotRecordPage(page, stAllotRecord));

@ -3,27 +3,20 @@ package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.cache.SysCache;
import org.springblade.system.cache.UserCache;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StBuyOrderExcel;
import org.springblade.wms.mapper.StBuyOrderMapper;
import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
import org.springblade.wms.pojo.dto.StBuyOrderDTO;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.vo.StBuyOrderVO;
@ -33,7 +26,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
/**
@ -186,7 +178,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// 1. 校验审批人权限(仅保管员可审批)
// String app = approver.getRoleName();
// log.info(app);
if(Objects.equals(approver.getRoleName(), "保管员")){
if (Objects.equals(approver.getRoleName(), "保管员")) {
// 2. 查询订单并校验状态
StBuyOrder buyOrder = baseMapper.selectById(orderId);
if (buyOrder == null) {
@ -199,14 +191,13 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// 3. 更新审批状态
buyOrder.setApprovalStatus(approvalResult);
baseMapper.updateById(buyOrder);
}else {
} else {
throw new RuntimeException("仅保管员可执行审批操作!");
}
}
public void sendRbfirtChk(String partCode, String partName) {
String[] excnote = new String[1];
String[] excflag = new String[1];
@ -266,7 +257,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
oldBuyOrder.setBoStatus(StBuyOrder.BOSTATUS_SUBMIT);
}
public StBuyOrder getByExtraBill(String extraBill){
public StBuyOrder getByExtraBill(String extraBill) {
return baseMapper.getByExtraBill(extraBill);
}

@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -78,7 +77,7 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
/* 2. 单条序号(原逻辑)*/
String datePrefix = DateUtil.format(new Date(), "yyyyMMdd");
String maxPiNo = stStockInoutRecordService.getMaxPiNo("T");
String maxPiNo = stStockInoutRecordService.getMaxPiNo("T");
int n = Optional.ofNullable(maxPiNo)
.map(p -> Integer.parseInt(p.substring(9)))
.orElse(0);
@ -89,7 +88,7 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
/* 3. 单条数量/价格(原逻辑)*/
inout.setQuantity(putQuantity); // 本次入库数量
inout.setUnitPrice(transfer.getUnitPrice()); // 单条金额
inout.setSirMoney(putQuantity*transfer.getUnitPrice());
inout.setSirMoney(putQuantity * transfer.getUnitPrice());
inout.setGoodsId(transfer.getGoodsId());
inout.setScrapCycle(transfer.getScrapCycle());
inout.setWarehousingDate(transfer.getWarehousingDate());

@ -21,8 +21,6 @@ import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;

@ -4,14 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.mapper.StExpireSubmissionMapper;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
@ -22,7 +18,6 @@ import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

@ -5,22 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
//import org.springblade.desk.dashboard.service.IDsPartRelationService;
//import org.springblade.desk.dashboard.service.IDsPartService;
//import org.springblade.desk.produce.mapper.WorkOrderMapper;
import org.springblade.desk.produce.pojo.entity.WorkOrder;
//import org.springblade.desk.produce.service.IWorkOrderService;
import org.springblade.wms.excel.StGlassCakeOutExcel;
import org.springblade.wms.mapper.StGlassCakeOutMapper;
import org.springblade.wms.mapper.StRealtimeStockMapper;
import org.springblade.wms.mapper.StStockInoutRecordMapper;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.vo.StGlassCakeOutVO;
@ -30,9 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
* @version 1.0

@ -1,7 +1,6 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;

@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.excel.StGoodsExcel;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StGoodsMapper;
import org.springblade.wms.pojo.dto.StPdmPartDTO;
import org.springblade.wms.pojo.entity.StGoods;

@ -1,36 +1,19 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.alibaba.fastjson.JSONObject;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.annotation.Resource;
import lombok.extern.java.Log;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.springblade.core.log.exception.ServiceException;
import okhttp3.*;
import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
import org.springblade.wms.pojo.dto.StPdmPartDTO;
import org.springblade.wms.pojo.dto.StPdmPartResponseDTO;
import org.springblade.wms.service.IStBuyOrderService;
import org.springblade.wms.service.ISyDockingLogService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import okhttp3.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
@ -58,7 +41,7 @@ public class StHttpRequestService {
@Resource
private ISyDockingLogService syDockingLogService;
// @Resource
// @Resource
// private IStBuyOrderService stBuyOrderService;
// private final ISyDockingLogService syDockingLogService;
//

@ -1,6 +1,5 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -11,8 +10,9 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.mapper.StLendMapper;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStoreBill;
import org.springblade.wms.pojo.vo.StLendVO;
import org.springblade.wms.service.IStLendService;
import org.springblade.wms.service.IStRealtimeStockService;
@ -20,9 +20,10 @@ import org.springblade.wms.service.IStStoreBillService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* @version 1.0
@ -44,7 +45,7 @@ public class StLendServiceImpl extends BaseServiceImpl<StLendMapper, StLend> imp
public IPage<StLendVO> selectStLendPage(IPage<StLendVO> page, StLendVO stLend) {
Short returned = StLend.RETURNED;
Short newBuilt = StLend.NEW_BUILT;
Long userId = AuthUtil.getUserId();
Long userId = AuthUtil.getUserId();
return page.setRecords(baseMapper.selectStLendPage(page, stLend, returned, newBuilt, userId));
}
@ -67,7 +68,7 @@ public class StLendServiceImpl extends BaseServiceImpl<StLendMapper, StLend> imp
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrEditBatch(List<StLend> stLendList, BladeUser user) throws Exception{
public boolean saveOrEditBatch(List<StLend> stLendList, BladeUser user) throws Exception {
if (stLendList == null || stLendList.isEmpty()) {
return false;
}

@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StMoldApplyForExcel;
@ -16,11 +14,8 @@ import org.springblade.wms.service.IStMoldApplyForService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @version 1.0

@ -10,7 +10,6 @@ import org.springblade.wms.mapper.StMoldBaseMapper;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.wms.service.IStStorehouseService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@ -1,13 +1,9 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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 jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.sourceforge.barbecue.Barcode;
@ -17,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StRealtimeStockExcel;
import org.springblade.wms.mapper.*;
@ -32,7 +27,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -284,12 +278,12 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
} else {
//出库逻辑
if (stock == null) {
throw new RuntimeException("第" + (i+1) + "条出入库记录对应的出库物料为空,请选择出库物料!");
throw new RuntimeException("第" + (i + 1) + "条出入库记录对应的出库物料为空,请选择出库物料!");
}
stock = stRealtimeStockMapper.getSynchById(stock.getId());
//当前库位库存小于出库数量
if (stock.getQuantity() < quantity) {
throw new RuntimeException("第" + (i+1) + "条出入库记录当前库位库存不足,出库失败!");
throw new RuntimeException("第" + (i + 1) + "条出入库记录当前库位库存不足,出库失败!");
}
// 获取物料信息
StGoods stGoods = stGoodsService.getById(inout.getGoodsId());
@ -446,8 +440,8 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
}
//
// // 返回批量处理后的rlsId列表
return rlsIdList;
}
return rlsIdList;
}
@Transactional(rollbackFor = Exception.class)
public Long reviseRealTimeStock(StRealtimeStock stock,
@ -511,8 +505,9 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
/**
* 校验物料最低库存预警并给出提示
* @param stGoods 物料基础信息可为nullnull则重新查询
* @param goodsId 物料ID
*
* @param stGoods 物料基础信息可为nullnull则重新查询
* @param goodsId 物料ID
* @param outQuantity 本次出库数量
*/
private String checkAndWarnMinStock(StGoods stGoods, Long goodsId, Double outQuantity) {
@ -757,7 +752,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
}
@Override
public IPage<StRealtimeStockVO> selectByGoodsIdShId(IPage<StRealtimeStockVO> page, Long goodsId, Long shId, Long slId ,String piNo) {
public IPage<StRealtimeStockVO> selectByGoodsIdShId(IPage<StRealtimeStockVO> page, Long goodsId, Long shId, Long slId, String piNo) {
return baseMapper.selectByGoodsIdShId(page, goodsId, shId, slId, piNo);
}
@ -775,7 +770,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
StRealtimeStock rs = null;
for (StStoreBill sb : sbList) {
rs = this.getById(sb.getRlsId());
if(rs == null){
if (rs == null) {
throw new BusinessException("当前物料无可用库存,无法借出!");
}
if (status.equals(StStoreBill.BILLSOURCE_BORROW)) {
@ -819,7 +814,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
@Override
public StRealtimeStock getBySlIdAndGoodsCode(Long slId, String goodsCode) {
return baseMapper.getBySlIdAndGoodsCode(slId,goodsCode);
return baseMapper.getBySlIdAndGoodsCode(slId, goodsCode);
}
/**
@ -900,11 +895,11 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
}
@Override
public List<StRealtimeStockExcel> exportStRealtimeStock (Wrapper < StRealtimeStock > queryWrapper) {
public List<StRealtimeStockExcel> exportStRealtimeStock(Wrapper<StRealtimeStock> queryWrapper) {
List<StRealtimeStockExcel> stRealtimeStockList = baseMapper.exportStRealtimeStock(queryWrapper);
//stRealtimeStockList.forEach(stRealtimeStock -> {
// stRealtimeStock.setTypeName(DictCache.getValue(DictEnum.YES_NO, StRealtimeStock.getType()));
//});
//stRealtimeStockList.forEach(stRealtimeStock -> {
// stRealtimeStock.setTypeName(DictCache.getValue(DictEnum.YES_NO, StRealtimeStock.getType()));
//});
return stRealtimeStockList;
}

@ -1,22 +1,18 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StStorehouseMapper;
import org.springblade.wms.pojo.entity.MesConstant;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStStorehouseService;
@ -37,6 +33,7 @@ import java.util.List;
public class StStorehouseServiceImpl extends BaseServiceImpl<StStorehouseMapper, StStorehouse> implements IStStorehouseService {
@Resource
IUserClient userClient;
@Override
public IPage<StStorehouseVO> selectStStorehousePage(IPage<StStorehouseVO> page, StStorehouseVO stStorehouse) {
return page.setRecords(baseMapper.selectStStorehousePage(page, stStorehouse));
@ -44,19 +41,19 @@ public class StStorehouseServiceImpl extends BaseServiceImpl<StStorehouseMapper,
@Override
public IPage<StStorehouseVO> selectStorehousePage(IPage<StStorehouseVO> page, StStorehouseVO stStorehouse, Long userId, String urTypeStorehouse) {
return page.setRecords(baseMapper.selectStorehousePage(page, stStorehouse,userId,urTypeStorehouse));
return page.setRecords(baseMapper.selectStorehousePage(page, stStorehouse, userId, urTypeStorehouse));
}
@Override
public Boolean checkName(Long id, String shName) {
StStorehouse stStorehouse = baseMapper.checkName(id, shName);
return stStorehouse!=null &&stStorehouse.getId()!=id;
return stStorehouse != null && stStorehouse.getId() != id;
}
@Override
public Boolean checkCode(Long id, String shCode) {
StStorehouse stStorehouse = baseMapper.checkCode(id, shCode);
return stStorehouse!=null &&stStorehouse.getId()!=id;
return stStorehouse != null && stStorehouse.getId() != id;
}
@Override
@ -72,17 +69,17 @@ public class StStorehouseServiceImpl extends BaseServiceImpl<StStorehouseMapper,
return rtnObj;
//指定人员未分配库房
List<StStorehouse> noChooseList = this.findStorehouseList(userId, urType,false);
List<StStorehouse> noChooseList = this.findStorehouseList(userId, urType, false);
JSONArray noChooseArray = new JSONArray();
if(noChooseList != null && noChooseList.size() > 0){
for(StStorehouse stStorehouse : noChooseList){
if (noChooseList != null && noChooseList.size() > 0) {
for (StStorehouse stStorehouse : noChooseList) {
noChooseArray.add(this.stStorehouseToJSON(stStorehouse));
}
}
rtnObj.put(MesConstant.TREE_NO_CHOOSE, noChooseArray);
//指定人员选中库房
List<StStorehouse> chooseList = this.findStorehouseList(userId, urType,true);
List<StStorehouse> chooseList = this.findStorehouseList(userId, urType, true);
JSONArray chooseArray = new JSONArray();
if (chooseList != null && chooseList.size() > 0) {
for (StStorehouse storehouse : chooseList) {
@ -108,10 +105,10 @@ public class StStorehouseServiceImpl extends BaseServiceImpl<StStorehouseMapper,
R<User> ruser = userClient.userInfoById(userId);
User user = ruser.getData();
//查询已选中库房
if(choose){
return baseMapper.findStorehouseList(user.getId(), urType,true);
}else{//查询未选中库房
return baseMapper.findStorehouseList(user.getId(), urType,false);
if (choose) {
return baseMapper.findStorehouseList(user.getId(), urType, true);
} else {//查询未选中库房
return baseMapper.findStorehouseList(user.getId(), urType, false);
}
}

@ -1,28 +1,18 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.wms.mapper.StUserRightMapper;
import org.springblade.wms.pojo.entity.MesConstant;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import org.springblade.wms.service.IStUserRightService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -178,6 +168,7 @@ public class StUserRightServiceImpl extends BaseServiceImpl<StUserRightMapper, S
return o1.getDeptCode().compareTo(o2.getDeptCode());
}
}
private JSONArray assembleDeptUserTreeJSON(List<Dept> deptList, Map<Long, List<Dept>> deptMap, Map<Long, List<User>> userMap) {
JSONArray array = new JSONArray();
if (deptList == null || deptList.isEmpty() || userMap == null || userMap.isEmpty()) {

@ -1,7 +1,5 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.mapper.SyDockingLogMapper;
import org.springblade.wms.pojo.entity.SyDockingLog;

Loading…
Cancel
Save