From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 0dd7b3a..d093980 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -6,19 +6,70 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.*,
+ select dr.id,
+ dr.device_ledger_id,
+ dr.repair_time,
+ dr.repair_name,
+ dr.remark,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.status,
+ dr.create_time,
+ dr.update_time,
+ dr.create_user,
+ dr.update_user,
+ dr.tenant_id,
dl.device_name,
dl.device_model
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
+ 1 = 1
<if test="deviceRepairDto.deviceName != null">
and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
</if>
<if test="deviceRepairDto.deviceModel != null">
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</if>
+ <if test="deviceRepairDto.status != null">
+ and dr.status = #{deviceRepairDto.status}
+ </if>
+ <if test="deviceRepairDto.remark != null">
+ and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
+ </if>
+ <if test="deviceRepairDto.maintenanceName != null">
+ and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
+ </if>
+
+ <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
+ and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
+ </if>
+ <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
+ and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
+ </if>
</where>
</select>
+ <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
+ select dr.id,
+ dr.device_ledger_id,
+ dr.repair_time,
+ dr.repair_name,
+ dr.remark,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.status,
+ dr.create_time,
+ dr.update_time,
+ dr.create_user,
+ dr.update_user,
+ dr.tenant_id,
+ dl.device_name,
+ dl.device_model
+ from device_repair dr
+ left join device_ledger dl on dr.device_ledger_id = dl.id
+ where dr.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3