From 3d2e154d70d3976a5f33c9fcef7422992297c19b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 16 八月 2025 10:23:21 +0800
Subject: [PATCH] 库位明细查询接口优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 14 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java | 52 ++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 5 +-
rsf-server/src/main/resources/mapper/manager/LocMapper.xml | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java | 2 -
7 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
index 13816d9..901c901 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
@@ -138,6 +138,4 @@
return receiveMsgService.syncLocsDetl(pageParam, wrapper);
}
-
-
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 527b49d..61376e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -3,6 +3,7 @@
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 com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -11,6 +12,7 @@
import com.vincent.rsf.server.api.controller.params.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.*;
@@ -212,8 +214,7 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
-
-
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page);
return null;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
new file mode 100644
index 0000000..81d6fed
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
@@ -0,0 +1,52 @@
+package com.vincent.rsf.server.manager.controller.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "LocStockDto", description = "搴撳瓨鏄庣粏")
+public class LocStockDto implements Serializable {
+
+ @ApiModelProperty("璇嗕綅")
+ private String locCode;
+
+ @ApiModelProperty("搴撲綅ID")
+ private String locId;
+
+ @ApiModelProperty("鎵樼洏鐮�")
+ private String barcode;
+
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnr;
+
+ @ApiModelProperty("瑙勬牸灞炴��")
+ private String specs;
+
+ @ApiModelProperty("鎵规")
+ private String batch;
+
+ @ApiModelProperty("鏁伴噺 ")
+ private Double anfme;
+
+ @ApiModelProperty("渚涘簲鍟�")
+ private String supplier;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
index 5418115..c2a01e1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
@@ -1,5 +1,8 @@
package com.vincent.rsf.server.manager.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.controller.dto.LocUsageDto;
import com.vincent.rsf.server.manager.entity.Loc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,4 +20,6 @@
boolean deleteAll();
List<LocUsageDto> getLocPies();
+
+ IPage<LocStockDto> getLocDetls(Page<Object> page);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
index c1eee8c..f3bf999 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
@@ -1,7 +1,10 @@
package com.vincent.rsf.server.manager.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
@@ -19,4 +22,6 @@
R batchBindLocs(LocModifyParams locs);
R getLocPies();
+
+ IPage<LocStockDto> getLocDetls(Page<Object> page);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 179a894..0e59c09 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.controller.dto.LocUsageDto;
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
@@ -230,4 +233,15 @@
List<LocUsageDto> locPies = this.baseMapper.getLocPies();
return R.ok().add(locPies);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/8/16
+ * @description: 鑾峰彇搴撲綅鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public IPage<LocStockDto> getLocDetls(Page<Object> page) {
+ return this.baseMapper.getLocDetls(page);
+ }
}
diff --git a/rsf-server/src/main/resources/mapper/manager/LocMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
index 059ec5e..330516c 100644
--- a/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/LocMapper.xml
@@ -13,4 +13,7 @@
GROUP BY
use_status
</select>
+ <select id="getLocDetls" resultType="com.vincent.rsf.server.manager.controller.dto.LocStockDto">
+
+ </select>
</mapper>
--
Gitblit v1.9.1