root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

委外加工 委外工序
修改委外工序详情页面显示样式；
修改委外工序列表页面搜索栏定义，修改委外工序mapper列表查询方法；
修改委外工序service列表查询方法；
dev
王晓迪 2 months ago
parent
42cbdf7606
commit
d23f61250d
4 changed files with 59 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
  2. 4
      ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
  3. 39
      ruoyi-admin/src/main/resources/templates/system/outsource_process/detail.html
  4. 69
      ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html

14
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
View File

@ -5,17 +5,22 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import com.github.pagehelper.Page;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.OutsourceProcess;
import com.ruoyi.system.domain.SysCustomerVo;
import com.ruoyi.system.mapper.OutsourceProcessMapper;
import com.ruoyi.system.service.IOutsourceProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.text.Convert;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
/**
* 委外工序Service业务层处理
@ -59,7 +64,14 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
@Override
public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess)
{
return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
Page<OutsourceProcess> processList = (Page<OutsourceProcess>)outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
processList.setTotal(CollectionUtils.isEmpty(processList) ? 0 : processList.getTotal());
processList.setPageNum(pageNum);
processList.setPageSize(pageSize);
return processList;
}

4
ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
View File

@ -24,8 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectOutsourceProcessVo"/>
<where>
<if test="outsourceProcessId != null and outsourceProcessId != ''"> and outsource_process_id = #{outsourceProcessId}</if>
<if test="outsourceProcessNo != null and outsourceProcessNo != ''"> and outsource_process_no = #{outsourceProcessNo}</if>
<if test="outsourceProcessNo != null and outsourceProcessNo != ''"> and outsource_process_no like concat('%', #{outsourceProcessNo}, '%')</if>
<if test="outsourceProcessCode != null and outsourceProcessCode != ''"> and outsource_process_code like concat('%', #{outsourceProcessCode}, '%')</if>
<if test="outsourceProcessName != null and outsourceProcessName != ''"> and outsource_process_name like concat('%', #{outsourceProcessName}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>

39
ruoyi-admin/src/main/resources/templates/system/outsource_process/detail.html
View File

@ -5,51 +5,34 @@
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-user-edit">
<div class="form-group">
<form class="form-horizontal m" id="form-process-detail" th:object="${outsourceProcess}">
<div class="form-group" >
<label class="col-sm-3 control-label">委外工序编号：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.outsourceProcessNo}"></div>
<div class="col-sm-6">
<input type="text" class="form-control" name="outsourceProcessNo" id="outsourceProcessNo" th:field="*{outsourceProcessNo}" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">委外工序名称：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.outsourceProcessName}"></div>
<div class="col-sm-6">
<input type="text" class="form-control" name="outsourceProcessName" id="outsourceProcessName" th:field="*{outsourceProcessName}" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.remark}"></div>
<div class="col-sm-6">
<input type="text" class="form-control" name="remark" id="remark" th:field="*{remark}" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">录入人：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.createBy}"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">录入时间：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.createTime}"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新人：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.updateBy}"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新时间：</label>
<div class="col-sm-8">
<div class="form-control-static" th:text="${outsourceProcess.updateTime}"></div>
<div class="col-sm-6">
<input type="text" class="form-control" name="createBy" id="createBy" th:field="*{createBy}" readonly>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
var prefix = ctx + "system/outsource_process";

69
ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
View File

@ -4,38 +4,38 @@
<th:block th:include="include :: header('委外工序列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label class="in">委外工序ID：</label>
<input type="text" name="outsourceProcessCode"/>
</li>
<li>
<label class="in">委外工序编号：</label>
<input type="text" name="outsourceProcessNo"/>
</li>
<li>
<label class="in">委外工序名称：</label>
<input type="text" name="outsourceProcessName"/>
</li>
<li class="select-time">
<label>录入时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label class="in">委外工序ID：</label>
<input type="text" name="outsourceProcessCode"/>
</li>
<li>
<label class="in">委外工序编号：</label>
<input type="text" name="outsourceProcessNo"/>
</li>
<li>
<label class="in">委外工序名称：</label>
<input type="text" name="outsourceProcessName"/>
</li>
<li class="select-time">
<label>录入时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_process:add">
@ -47,11 +47,6 @@
</div>
</div>
</div>
<style>
.in{
width: 200px;
}
</style>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:outsource_process:edit')}]];

Write Preview
Loading…
Cancel
Save