wangh
/
bgs-no-power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：点击查询维修子表查询

Browse Source
master
wanghao 2 weeks ago
parent c8a97c88cc
commit 58dd4ecc7f
13 changed files with 123 additions and 16 deletions
Show Stats Download Patch File Download Diff File

3
ruoyi-admin/src/main/resources/application-druid.yml
Unescape Escape View File

@ -9,6 +9,9 @@ spring:
url: jdbc:mysql://1.13.177.47:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Haiwei123456
# url: jdbc:mysql://localhost:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: haiwei@123
# 从库数据源
slave:
# 从数据源开关/默认关闭

6
ruoyi-admin/src/main/resources/templates/system/role/role.html
Unescape Escape View File

@ -143,7 +143,11 @@
actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
return actions.join('');
} else {
return "";
var actions = [];
var more = [];
more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
return actions.join('');
}
}
}]

1
ruoyi-manager/src/main/java/com/ruoyi/manager/controller/BaseBasketInfoController.java
Unescape Escape View File

@ -78,7 +78,6 @@ public class BaseBasketInfoController extends BaseController {
mmap.put("manufacturerList", manufacturerList);
return prefix + "/add";
}
/**
* 新增保存资产信息
*/

4
ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketRepairController.java
Unescape Escape View File

@ -63,8 +63,8 @@ public class RecordBasketRepairController extends BaseController
startPage();
// RecordBasketRepair recordBasketRepair=new RecordBasketRepair();
// recordBasketRepair.setBasketEpc(epc);
System.out.println(recordBasketRepair.toString());
List<RecordBasketRepair> list = recordBasketRepairService.selectRecordBasketRepairList(recordBasketRepair);
// System.out.println(recordBasketRepair.toString());
List<RecordBasketRepair> list = recordBasketRepairService.selectRecordBasketRepairChildList(recordBasketRepair);
return getDataTable(list);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/domain/BaseBasketInfo.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class BaseBasketInfo extends BaseEntity {
@Excel(name = "资产RFID副", cellType = Excel.ColumnType.STRING)
private String basketEpc2;
@Excel(name = "资产类型", dictType = "basket_type",prompt="货筐，大散斗，大托盘，超大托盘")
@Excel(name = "资产类型", dictType = "basket_type",prompt="货筐，大散斗，大拖盘，超大拖盘")
private Long basketType;
@Excel(name = "资产状态", dictType = "basket_status")
private Long basketStatus;

20
ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketRepair.java
Unescape Escape View File

@ -26,6 +26,26 @@ public class RecordBasketRepair extends BaseEntity
@Excel(name = "维修情况")
private String repairInfo;
private Long baseBasketId;
private BaseBasketInfo baseBasketInfo;
public BaseBasketInfo getBaseBasketInfo() {
return baseBasketInfo;
}
public void setBaseBasketInfo(BaseBasketInfo baseBasketInfo) {
this.baseBasketInfo = baseBasketInfo;
}
public Long getBaseBasketId() {
return baseBasketId;
}
public void setBaseBasketId(Long baseBasketId) {
this.baseBasketId = baseBasketId;
}
public void setObjId(Long objId)
{
this.objId = objId;

2
ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketRepairMapper.java
Unescape Escape View File

@ -59,4 +59,6 @@ public interface RecordBasketRepairMapper
* @return 结果
*/
public int deleteRecordBasketRepairByObjIds(String[] objIds);
List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
}

2
ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketRepairService.java
Unescape Escape View File

@ -59,4 +59,6 @@ public interface IRecordBasketRepairService
* @return 结果
*/
public int deleteRecordBasketRepairByObjId(Long objId);
List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair);
}

11
ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketRepairServiceImpl.java
Unescape Escape View File

@ -94,4 +94,15 @@ public class RecordBasketRepairServiceImpl implements IRecordBasketRepairService
{
return recordBasketRepairMapper.deleteRecordBasketRepairByObjId(objId);
}
/**
* 查询维修记录子列表
*
* @param recordBasketRepair 维修记录
* @return 维修记录集合
*/
@Override
public List<RecordBasketRepair> selectRecordBasketRepairChildList(RecordBasketRepair recordBasketRepair)
{
return recordBasketRepairMapper.selectRecordBasketRepairChildList(recordBasketRepair);
}
}

4
ruoyi-manager/src/main/resources/mapper/BaseBasketInfoMapper.xml
Unescape Escape View File

@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="basketEpc != null and basketEpc != ''"> and basket_epc = #{basketEpc}</if>
<if test="basketType != null "> and basket_type = #{basketType}</if>
<if test="basketStatus != null "> and basket_status = #{basketStatus}</if>
<if test="steelGrade != null and steelGrade != ''"> and steel_grade like concat('%', #{steelGrade}, '%')</if>
<if test="selfCode != null and selfCode != ''"> and self_code like concat('%', #{selfCode}, '%')</if>
</where>
</select>
@ -151,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBaseBasketInfoByEpc" parameterType="String" resultMap="BaseBasketInfoResult">
<include refid="selectBaseBasketInfoVo"/>
where basket_epc = #{epc} limit 1
where basket_epc = #{epc} or basket_epc2 = #{epc} limit 1
</select>
<select id="selectBaseBasketInfoByCode" parameterType="String" resultMap="BaseBasketInfoResult">

32
ruoyi-manager/src/main/resources/mapper/RecordBasketRepairMapper.xml
Unescape Escape View File

@ -10,16 +10,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="repairInfo" column="repair_info" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="baseBasketId" column="base_basket_id" />
<association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult">
</association>
</resultMap>
<sql id="selectRecordBasketRepairVo">
select obj_id, basket_epc, repair_info, create_by, create_time from record_basket_repair
select obj_id, basket_epc, repair_info, create_by, create_time,base_basket_id from record_basket_repair
</sql>
<sql id="selectRecordBasketRepairList">
select rbr.obj_id,
rbr.basket_epc,
repair_info,
create_by,
create_time,
base_basket_id,
basket_code,
basket_spe,
bbi.created_time,
basket_type,
steel_grade,
self_code,
manufacturer_name
from record_basket_repair rbr
left join base_basket_info bbi on rbr.base_basket_id = bbi.obj_id
</sql>
<select id="selectRecordBasketRepairList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairVo"/>
<include refid="selectRecordBasketRepairList"/>
<where>
<if test="basketEpc != null and basketEpc != ''"> and basket_epc = #{basketEpc}</if>
<if test="basketEpc != null and basketEpc != ''"> and rbr.basket_epc = #{basketEpc}</if>
</where>
</select>
@ -66,4 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectRecordBasketRepairChildList" parameterType="com.ruoyi.manager.domain.RecordBasketRepair" resultMap="RecordBasketRepairResult">
<include refid="selectRecordBasketRepairVo"/>
where base_basket_id = #{baseBasketId}
</select>
</mapper>

12
ruoyi-manager/src/main/resources/templates/base/basketInfo/basketInfo.html
Unescape Escape View File

@ -14,10 +14,20 @@
<label>资产编号：</label>
<input name="basketCode" type="text"/>
</li>
<li>
<!-- <li>
<label>资产条码：</label>
<input name="basketEpc" type="text"/>
</li> -->
<li>
<label>钢号：</label>
<input name="steelGrade" type="text"/>
</li>
<li>
<label>自编号：</label>
<input name="selfCode" type="text"/>
</li>
<li>
<label>资产类型：</label>
<select name="basketType" th:with="type=${@dict.getType('basket_type')}">

38
ruoyi-manager/src/main/resources/templates/system/repair/repair.html
Unescape Escape View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<html lang="zh" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('维修记录列表')"/>
</head>
@ -12,7 +12,7 @@
<ul>
<li>
资产RFID：
<input type="text" name="basketEpc"/>
<input name="basketEpc" type="text"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@ -52,7 +52,7 @@
var editFlag = [[${@permission.hasPermi('system:repair:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:repair:remove')}]];
var prefix = ctx + "system/repair";
var basketTypeDatas = [[${ @dict.getType('basket_type') }]];
$(function () {
var options = {
url: prefix + "/list",
@ -71,11 +71,39 @@
},
{
field: 'basketEpc',
title: '资产RFID'
title: '资产RFID',
visible: false
},
{
field: 'baseBasketInfo.basketCode',
title: '资产编号'
},
{
field: 'baseBasketInfo.basketType',
title: '资产类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(basketTypeDatas, value);
}
},
{
field: 'baseBasketInfo.createdTime',
title: '采购日期'
},
{
field: 'baseBasketInfo.steelGrade',
title: '钢号'
},
{
field: 'baseBasketInfo.selfCode',
title: '自编号'
},
{
field: 'baseBasketInfo.manufacturerName',
title: '生产商'
},
{
field: 'repairInfo',
title: '维修情况'
title: '维修说明'
},
{
field: 'createBy',

Write Preview
Loading…
Cancel
Save