From e3f4eea0dd33006396e8719e0120b430374cf994 Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 27 Mar 2024 09:59:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E5=92=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/spare/controller/SpWarehouseOutController.java | 6 +++--- .../java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java | 7 ++++--- .../hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java | 5 ----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java index 54e8b2f..cbfa7ba 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java @@ -11,7 +11,6 @@ import com.hnac.hzims.spare.entity.SpWarehouseOutEntity; import com.hnac.hzims.spare.service.ISpWarehouseOutService; import com.hnac.hzims.spare.vo.SpWarehouseExportVO; import com.hnac.hzims.spare.vo.SpWarehouseOutVO; -import com.hnac.hzims.vo.VoteChartVo; import com.hnac.hzinfo.log.annotation.Business; import com.hnac.hzinfo.log.annotation.Operate; import io.swagger.annotations.Api; @@ -39,7 +38,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; - /** * 控制器 * @@ -81,6 +79,7 @@ public class SpWarehouseOutController extends BladeController { IPage pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO); return R.data(pages); } + /** * 分页 代码自定义代号 */ @@ -120,6 +119,7 @@ public class SpWarehouseOutController extends BladeController { e.printStackTrace(); } } + /** * 工单预警 */ @@ -165,7 +165,6 @@ public class SpWarehouseOutController extends BladeController { return R.status(sp_warehouse_outService.saveOrUpdate(sp_warehouse_out)); } - /** * 删除 代码自定义代号 */ @@ -176,6 +175,7 @@ public class SpWarehouseOutController extends BladeController { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(sp_warehouse_outService.deleteLogic(Func.toLongList(ids))); } + /** * 完成流程 修改状态 */ diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java index 78bb951..5927778 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java @@ -1,10 +1,8 @@ package com.hnac.hzims.spare.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.spare.entity.SpWarehouseOutEntity; import com.hnac.hzims.spare.vo.SpWarehouseOutVO; -import feign.Param; import org.springblade.core.datascope.annotation.UserDataAuth; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; @@ -19,6 +17,7 @@ import java.util.Map; public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper { String selectMaxCode(Map params); + /** * 分页列表 * @param page @@ -27,8 +26,10 @@ public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper selectPageList(IPage page, Map params); -// @UserDataAuth + + @UserDataAuth List selectListByCondition( Map params); + /** * 根据工单ID查询出库单编码 * @param ticketId diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java index df050df..9e5e594 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java @@ -17,15 +17,12 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springblade.core.launch.constant.FlowConstant; 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.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.support.Kv; -import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.ISysClient; @@ -34,13 +31,11 @@ import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.stream.Collectors; /** * 服务实现类