Browse Source

添加出库查询移动端页面

lwx_dev
erdanergou 3 years ago
parent
commit
e8458dc8a5
  1. 1
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 6
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 6
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java
  4. 3
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  5. 10
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  6. 252
      src/main/resources/templates/pages/depository/table-out_mobile.html
  7. 3
      target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

1
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -897,6 +897,7 @@ public class DepositoryRecordController {
outRecordP.setDepositoryName(depositoryName.toString());
outRecordP.setQuantity(sumQuantity);
outRecordP.setPrice(sumPrice);
}
return new RestResponse(list, countBy, 200);
}

6
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -941,6 +941,12 @@ public class PageController {
mv.addObject("display", "none");
}
mv.setViewName("pages/depository/table-out");
String userAgent = request.getHeader("user-agent");
// 判断当前使用的设备为移动端还是pc端
boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
if(b){
mv.setViewName("pages/depository/table-out_mobile");
}
return mv;
}

6
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java

@ -145,6 +145,12 @@ public class ApplicationOutRecord {
*/
private String mbrand;
/**
* 物料型号
*/
private String mversion;
/**
* 订单状态
*/

3
src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@ -111,6 +111,7 @@
<result column="aorstate" property="state" jdbcType="VARCHAR"/>
<result column="istransfer" property="istransfer" jdbcType="INTEGER"/>
<result column="mcode" property="mcode" jdbcType="VARCHAR"/>
<result column="mversion" property="mversion" jdbcType="VARCHAR"/>
<result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
@ -174,7 +175,7 @@
<sql id="ApplicationOutRecordInfo">
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion
</sql>
<sql id="ApplicationOutRecordMinInfo">

10
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@ -172,7 +172,6 @@ public class ApplicationOutRecordP {
private String outTime;
/**
* 部门名称
*/
@ -193,6 +192,11 @@ public class ApplicationOutRecordP {
*/
private String mbrand;
/**
* 物料型号
*/
private String mversion;
public ApplicationOutRecordP(ApplicationOutRecord aor) {
this.id = aor.getId();
this.mid = aor.getMid();
@ -229,6 +233,8 @@ public class ApplicationOutRecordP {
this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime()));
this.abstracts = aor.getAbstracts();
this.outType = aor.getOutType();
this.mbrand = aor.getMbrand() == null ? "":aor.getMbrand();
this.mbrand = aor.getMbrand() == null ? "" : aor.getMbrand();
this.mversion = aor.getMversion() == null ? "" : aor.getMversion();
}
}

252
src/main/resources/templates/pages/depository/table-out_mobile.html

@ -0,0 +1,252 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>layui</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
<link rel="stylesheet" href="/static/css/public.css" media="all">
</head>
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">申请时间</label>
<div class="layui-input-block">
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate"
autocomplete="off" placeholder="开始日期" class="layui-input">
-
<input type="text" style="display:inline;width: 101px;" id="endDate" name="endDate"
autocomplete="off" placeholder="结束日期" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">仓库</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository"
readonly/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">记录编码</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="code" name="code" autocomplete="off"
placeholder="请输入申请记录编码"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<input id="mname" name="mname" type="text" placeholder="请填写物料名称"
class="layui-input"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input"
placeholder="请填写物料编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">型号</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off"
placeholder="请填写物料型号"/>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div>
</form>
</div>
</fieldset>
<ul class="flow-default" id="LAY_applicationOut"></ul>
</div>
</div>
<a id="returnTop" style="display:none;" class="layui-return-top" href="#top"><i class="fa fa-level-up"></i></a>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/lib/jquery-3.4.1/jquery-3.4.1.min.js"></script>
<script src="/static/js/Customize/public.js"></script>
<script>
var data;
function showDetail() {
}
// 用于加载仓库菜单
function selectMaterialByName(obj) {
}
layui.use(['form', 'flow', 'laydate'], function () {
var $ = layui.jquery,
form = layui.form,
flow = layui.flow,
laydate = layui.laydate;
let takingPre = 0;
let size = 8;
flow.load({
elem: '#LAY_applicationOut' //流加载容器
, done: function (page, next) { //执行下一页的回调
let result;
let lis = [];
$.get('/depositoryRecord/applicationOutView?page=' + page + '&size=' + size, function (res) {
result = res.data;
lis.push("<div class='clearfix'>");
for (let i = 0; i < result.length; i++) {
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName+"的出库申请" + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mname + '</p>'
+'<p>' + result[i].mversion + '</p>'
+'<p>' + result[i].mbrand + '</p>'
+ '<p>' +result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>'
+ '</div></div></li>');
}
lis.push('</div>');
takingPre += result.length;
//执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
//pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
next(lis.join(''), takingPre < res.count);
});
}
});
$('#openSonByDepository').on('click', function () {
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move: '.layui-layer-title',
fixed: false,
content: '/selectDepository?type=2',
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
});
//用于实现物料名称搜索
selectMaterialByName = function (obj) {
// 输入code
var data = obj.value;
// 获取对应元素
var req = {};
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/getMaterialAll?type=1&mname=""',
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
};
//日期
laydate.render({
elem: '#startDate'
}); //日期
laydate.render({
elem: '#endDate'
});
// 监听搜索操作
form.on('submit(data-search-btn)', function (data) {
var req = {};
data = data.field;
if (data.mid !== '') {
req.mid = data.mid;
}
if (data.depositoryId !== '') {
req.depositoryId = data.depositoryId;
}
if (data.startDate !== '') {
req.startDate = data.startDate;
}
if (data.endDate !== '') {
req.endDate = data.endDate;
}
if (data.mcode !== '') {
req.mcode = data.mcode.trim();
}
if (data.code !== '') {
req.code = data.code.trim();
}
if (data.mname !== '') {
req.mname = data.mname.trim();
}
if (data.version !== '') {
req.version = data.version.trim();
}
//执行搜索重载
table.reload('currentTableId', {
url: '/depositoryRecord/applicationOutView',
page: {
curr: 1
}
, where: req
}, 'data');
return false;
});
showDetail = function(obj){
var index = layer.open({
title: '出库信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/ApplicationOutView?id=' + obj,
});
$(window).on("resize", function () {
layer.full(index);
});
}
});
</script>
</body>
</html>

3
target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@ -111,6 +111,7 @@
<result column="aorstate" property="state" jdbcType="VARCHAR"/>
<result column="istransfer" property="istransfer" jdbcType="INTEGER"/>
<result column="mcode" property="mcode" jdbcType="VARCHAR"/>
<result column="mversion" property="mversion" jdbcType="VARCHAR"/>
<result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
@ -174,7 +175,7 @@
<sql id="ApplicationOutRecordInfo">
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion
</sql>
<sql id="ApplicationOutRecordMinInfo">

Loading…
Cancel
Save