From a6dd30e8bfffa5057e929cf355fbfdb860e70d2c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 20 五月 2025 13:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml | 17 ++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java | 19 +++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java | 22 ++++++++---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java | 5 +-
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java | 6 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java | 5 ++
6 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
index 4e4a785..8e3f04f 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
@@ -66,9 +66,10 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<ToolLedgerDetail> queryWrapper = QueryGenerator.initQueryWrapper(toolLedgerDetail, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<ToolLedgerDetail> queryWrapper = QueryGenerator.initQueryWrapper(toolLedgerDetail, parameterMap);
Page<ToolLedgerDetail> page = new Page<ToolLedgerDetail>(pageNo, pageSize);
- IPage<ToolLedgerDetail> pageList = toolLedgerDetailService.page(page, queryWrapper);
+ IPage<ToolLedgerDetail> pageList = toolLedgerDetailService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
index 5947093..836371a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,14 +34,22 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭id")
private String id;
- /**宸ュ叿缂栫爜*/
+ /**宸ュ叿缂栫爜(鍏宠仈瀛楁)*/
@Excel(name = "宸ュ叿缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ叿缂栫爜")
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(鍏宠仈瀛楁,瀛榯ms_base_tools琛ㄤ富閿甶d)")
private String toolCode;
+ /**宸ュ叿缂栫爜*/
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(tms_base_tools琛╰ool_code瀛楁)")
+ @TableField(exist = false)
+ private String toolNum;
/**宸ュ叿缂栧彿*/
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
+ /**宸ュ叿涓枃鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ叿涓枃鍚嶇О")
+ private String toolName;
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
@@ -56,6 +62,10 @@
@Excel(name = "搴撳尯/搴撳彿", width = 15)
@ApiModelProperty(value = "搴撳尯/搴撳彿")
private String warehouseId;
+ /**浠撳簱鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
/**搴撲綅鍙�*/
@Excel(name = "搴撲綅鍙�", width = 15)
@ApiModelProperty(value = "搴撲綅鍙�")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java
index 8611dfb..bed2922 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolLedgerDetailMapper.java
@@ -2,6 +2,10 @@
import java.util.List;
+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 org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ToolLedgerDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +18,6 @@
*/
public interface ToolLedgerDetailMapper extends BaseMapper<ToolLedgerDetail> {
+ IPage<ToolLedgerDetail> queryPageList(Page<ToolLedgerDetail> page,
+ @Param(Constants.WRAPPER) QueryWrapper<Object> queryWrapper);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml
index 6cc0837..c025550 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml
@@ -2,4 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.ToolLedgerDetailMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.ToolLedgerDetail">
+ SELECT
+ t.id,
+ t.tool_code toolCode,
+ p.tool_code toolNum,
+ t.tool_id toolId,
+ p.chinese_name toolName,
+ p.tool_model toolModel,
+ t.quantity,
+ t.warehouse_id warehouseId,
+ ISNULL(q.warehouse_id, '') + '/' + ISNULL(q.warehouse_name, '') warehouseName,
+ t.position_code positionCode
+ FROM tms_tool_ledger_detail t
+ LEFT JOIN tms_base_tools p on t.tool_code = p.id
+ LEFT JOIN tms_warehouse q on t.warehouse_id = q.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java
index bdc4eaf..c54329d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolLedgerDetailService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.tms.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.ToolLedgerDetail;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
/**
* @Description: tms_tool_ledger_detail
@@ -11,4 +15,5 @@
*/
public interface IToolLedgerDetailService extends IService<ToolLedgerDetail> {
+ IPage<ToolLedgerDetail> queryPageList(Page<ToolLedgerDetail> page, Map<String, String[]> parameterMap);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
index 90b2856..47d6b53 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
@@ -1,11 +1,17 @@
package org.jeecg.modules.tms.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.ToolLedgerDetail;
import org.jeecg.modules.tms.mapper.ToolLedgerDetailMapper;
import org.jeecg.modules.tms.service.IToolLedgerDetailService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.Map;
/**
* @Description: tms_tool_ledger_detail
@@ -16,4 +22,17 @@
@Service
public class ToolLedgerDetailServiceImpl extends ServiceImpl<ToolLedgerDetailMapper, ToolLedgerDetail> implements IToolLedgerDetailService {
+ @Override
+ public IPage<ToolLedgerDetail> queryPageList(Page<ToolLedgerDetail> page, Map<String, String[]> parameterMap) {
+ QueryWrapper<Object> queryWrapper = Wrappers.query();
+ String[] toolCodes = parameterMap.get("toolCode");
+ if (toolCodes != null && toolCodes.length > 0) {
+ queryWrapper.like("p.tool_code", toolCodes[0]);
+ }
+ String[] statuses = parameterMap.get("status");
+ if (statuses != null && statuses.length > 0) {
+ queryWrapper.eq("t.status", statuses[0]);
+ }
+ return this.baseMapper.queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3