diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java index 3be177522..94306d801 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java index 55c67c969..4c8b6e2eb 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java @@ -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; /** * 仓库实时结余远程调用 diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java index 428916402..9edfa5da4 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java index d67820fd5..039cd133e 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java @@ -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; /** diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java index cd3f14e18..ec984e7d3 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java index 7a03a203d..f5e837889 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java index 3c67f192f..a12f95280 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java index 765baf637..eba04d7c2 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java @@ -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 diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java index a49dfa319..a86c8d26a 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java index ba61eada2..107aad5d7 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java index ae7905b76..90aca0864 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java index 59edf4c38..cca15ae3a 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java @@ -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; diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java index c0e69545e..e8ff208fa 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java @@ -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 diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java index f4bb3434e..c3ec4ce6c 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java @@ -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 diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java index b3c0a5243..3f24f897f 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java @@ -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; /** diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java index 9c317892a..ffb35b24d 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java index af54dbabf..2b6ab6c3b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java index 983184da3..bc07413ad 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java index 9accd6787..48167197e 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java index 0f650ac9b..eb971332f 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java index 67d49ef0a..42e0e3e40 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java @@ -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 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java index 24bd693b9..7d56f79e5 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stExpireRecord, Query query) { IPage 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> page(StExpireRecordVO stExpireRecord, Query query) { IPage 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 stExpireRecord, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stExpireRecord, StExpireRecord.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java index edd259351..ac5dbf707 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stExpireSubmission, Query query) { IPage 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> pageExpiry30Days(StRealtimeStockVO stRealtimeStock, Query query) { IPage 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> page(StExpireSubmissionVO stExpireSubmission, Query query) { IPage 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 stExpireSubmission, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stExpireSubmission, StExpireSubmission.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java index 845181198..5ca899389 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stGlassCakeOut, Query query) { IPage 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> page(StGlassCakeOutVO stGlassCakeOut, Query query) { IPage 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 stGlassCakeOut, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stGlassCakeOut, StGlassCakeOut.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java index 0187857c6..833a85a4c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java @@ -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 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> page(StGoodsClassVO stGoodsClass, Query query) { stGoodsClass.setIsDeleted(0); IPage 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 stGoodsClass, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stGoodsClass, StGoodsClass.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java index de0742f3e..3ce223f5a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java @@ -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 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> page(StGoodsExtVO stGoodsExt, Query query) { IPage 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 stGoodsExt, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java index 239e9f63b..95964ae3f 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java @@ -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 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批量处理") - public R submitBatch(@Validated @RequestBody List stLendList) throws Exception{ + public R submitBatch(@Validated @RequestBody List 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 stLend, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stLend, StLend.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java index d934a1658..550dc66ef 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java @@ -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 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 stMoldApplyFor, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stMoldApplyFor, StMoldApplyFor.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java index 146aea3b9..09b46347a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stMoldBase, Query query) { IPage 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> page(StMoldBaseVO stMoldBase, Query query) { IPage 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 stMoldBase, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stMoldBase, StMoldBase.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java index 3480becc7..2f05f863a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java @@ -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 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 approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) { + @Operation(summary = "审批", description = "传入ids") + public R 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 stOtherOutRecord, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stOtherOutRecord, StOtherOutRecord.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java index f3b97ce6d..7f60ee9ce 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java @@ -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 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 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 stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper 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 stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java index 03e21919f..de997c164 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stRealtimeStock, Query query) { IPage 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> page(StRealtimeStockVO stRealtimeStock, Query query) { IPage 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 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 stRealtimeStock, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stRealtimeStock, StRealtimeStock.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java index 7635316a6..cbc8f8ba1 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stRequisition, Query query) { IPage 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> getBarCode(@Parameter(description = "ID", required = true) - @RequestParam Long srId) { + @RequestParam Long srId) { return R.data(stRequisitionService.getBarCode(srId)); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java index d304f6f4b..85582c649 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stReturnRecord, Query query) { IPage 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> page(StReturnRecordVO stReturnRecord, Query query) { IPage 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 stReturnRecordList) throws Exception{ + @Operation(summary = "批量归还", description = "传入stReturnRecord") + public R sendBackBatch(@RequestBody List 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 stReturnRecord, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stReturnRecord, StReturnRecord.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java index 48c59c419..97b7a22d5 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java @@ -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 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 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 stStorageLocation, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stStorageLocation, StStorageLocation.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java index 1ae4436d3..f753044e8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stStorehouse, Query query) { QueryWrapper 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 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 stStorehouse, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java index a273c7aa9..e1050a346 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java @@ -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 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> list(@Parameter(hidden = true) @RequestParam Map stWmsRequest, Query query) { IPage 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> 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 approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) { + @Operation(summary = "审批", description = "传入ids") + public R 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 stWmsRequest, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(stWmsRequest, StWmsRequest.class); //if (!AuthUtil.isAdministrator()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java index 153cafa39..7ed0d1065 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java @@ -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> batchGeneratePreOutOrder(List dtoList) { Map result = stGlassCakeOutService.batchGeneratePreOutOrder(dtoList); - return R.data(result); - } + return R.data(result); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java index 3154c3737..44ace21ba 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java @@ -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 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java index b99c6dbcc..7779e27fa 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java @@ -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 { /** * 自定义分页 * - * @param page 分页参数 + * @param page 分页参数 * @param stBuyOrder 查询参数 * @return List */ @@ -52,7 +50,7 @@ public interface StBuyOrderMapper extends BaseMapper { List selectStoreRequestPage(IPage page, StBuyOrderVO stBuyOrder); - StBuyOrder getByExtraBill(String extraBill); + StBuyOrder getByExtraBill(String extraBill); // JSONObject listByRecordDetail(Long boId, String goodsCode); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java index 1989d5657..48c39d5d9 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java @@ -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 /** * 自定义分页 * - * @param page 分页参数 + * @param page 分页参数 * @param stExpireSubmission 查询参数 * @return List */ @@ -44,7 +43,8 @@ public interface StExpireSubmissionMapper extends BaseMapper /** * 发送到期送检信息至ERP（调用存储过程） - * @param stock 实时库存实体 + * + * @param stock 实时库存实体 * @param userName 当前用户ID（适配Service层调用参数） * @return ERP返回的送检编码（wsCode/esCode） * @throws Exception 通用异常（包含BusinessException业务异常） diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java index bb2da3824..bc9bca386 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java @@ -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 { /** * 自定义分页 * - * @param page 分页参数 + * @param page 分页参数 * @param stStorehouse 查询参数 * @return List */ @@ -48,7 +46,7 @@ public interface StStorehouseMapper extends BaseMapper { StStorehouse getUniqueByCode(String shCode); - List findStorehouseList(Long userId, String urType, boolean choose); + List findStorehouseList(Long userId, String urType, boolean choose); List selectStorehousePage(IPage page, StStorehouseVO stStorehouse, Long userId, String urTypeStorehouse); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java index d4667ff76..e92725d2b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java @@ -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 { - List findNoUserRightByTheId(Long theId, String urType); + List findNoUserRightByTheId(Long theId, String urType); List findByTheIdAndUrType(Long theId, String urType); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java index 309fda3f7..a11bf324b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java @@ -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 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java index 89648c133..18c760579 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java index 91acb4d3e..12e04dd4d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java @@ -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; /** diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java index d754f35e5..9af05c68d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java index 0ae8cfd05..8fe1086b0 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java index 3d873b9fc..5ffd7e6c8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java index 5b5571e3b..3de860088 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java index fe4b4e132..65d3cd902 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java @@ -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 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java index cd7679635..afae9750b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java index 494fd6dfb..ae69c4300 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java @@ -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; /** diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java index 8ab168472..feea40aa1 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java @@ -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 selectAllotWithGoods(IPage page, QueryWrapper wrapper) { return baseMapper.selectAllotWithGoods(page, wrapper); } + @Override public IPage selectStAllotRecordPage(IPage page, StAllotRecordVO stAllotRecord) { return page.setRecords(baseMapper.selectStAllotRecordPage(page, stAllotRecord)); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index 8b0f979e9..b93533838 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -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 Integer.parseInt(p.substring(9))) .orElse(0); @@ -89,7 +88,7 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl imp public IPage selectStLendPage(IPage 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 imp @Override @Transactional(rollbackFor = Exception.class) - public boolean saveOrEditBatch(List stLendList, BladeUser user) throws Exception{ + public boolean saveOrEditBatch(List stLendList, BladeUser user) throws Exception { if (stLendList == null || stLendList.isEmpty()) { return false; } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java index f960ebdf1..08ee1871c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java @@ -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 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java index 44e5e579d..51ed3a340 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java @@ -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; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java index 3dfc4e73a..ec0dc72c7 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java @@ -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 selectByGoodsIdShId(IPage page, Long goodsId, Long shId, Long slId ,String piNo) { + public IPage selectByGoodsIdShId(IPage 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 exportStRealtimeStock (Wrapper < StRealtimeStock > queryWrapper) { + public List exportStRealtimeStock(Wrapper queryWrapper) { List 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; } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java index d31a1d53d..4f1c40588 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java @@ -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 implements IStStorehouseService { @Resource IUserClient userClient; + @Override public IPage selectStStorehousePage(IPage page, StStorehouseVO stStorehouse) { return page.setRecords(baseMapper.selectStStorehousePage(page, stStorehouse)); @@ -44,19 +41,19 @@ public class StStorehouseServiceImpl extends BaseServiceImpl selectStorehousePage(IPage 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 noChooseList = this.findStorehouseList(userId, urType,false); + List 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 chooseList = this.findStorehouseList(userId, urType,true); + List 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 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); } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java index 744cf6d03..a8d1e7e54 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java @@ -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 deptList, Map> deptMap, Map> userMap) { JSONArray array = new JSONArray(); if (deptList == null || deptList.isEmpty() || userMap == null || userMap.isEmpty()) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java index 1fb04f648..dc5c8e6e3 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java @@ -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;